Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
7511628b
R
runtime
项目概览
dotNET Platform
/
runtime
大约 1 年 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7511628b
编写于
1月 28, 2020
作者:
D
Davis Goodin
提交者:
GitHub
1月 28, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add build skip functionality for servicing builds (#2291)
上级
110af6e0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
46 addition
and
5 deletion
+46
-5
eng/Versions.props
eng/Versions.props
+27
-0
src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
...taller/pkg/projects/netstandard/pkg/Directory.Build.props
+3
-3
src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
...icrosoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
+8
-1
src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
...soft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
+8
-1
未找到文件。
eng/Versions.props
浏览文件 @
7511628b
...
...
@@ -30,7 +30,34 @@
<NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>netcoreapp$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<!--
The NETStandard.Library targeting pack uses this patch version, which does not match the
runtime's. After publishing a new version of the NETStandard targeting pack in a servicing
release, increase this number by one.
-->
<NETStandardPatchVersion>0</NETStandardPatchVersion>
</PropertyGroup>
<!--
Servicing build settings for Setup/Installer packages. Instructions:
* To enable a package build for the current patch release, set PatchVersion to match the current
patch version of that package. ("major.minor.patch".) This is normally the same as
PatchVersion above, but not always. Notably, NETStandard has its own patch version.
* When the PatchVersion property above is incremented at the beginning of the next servicing
release, all packages listed below automatically stop building because the property no longer
matches the metadata. (Do not delete the items!)
If the PatchVersion below is never changed from '0', the package will build in the 'master'
branch, and during a forked RTM release ("X.Y.0"). It will stop building for "X.Y.1" unless
manually enabled by updating the metadata.
-->
<ItemGroup>
<!-- Targeting packs are only patched in extreme cases. -->
<ProjectServicingConfiguration Include="Microsoft.NETCore.App.Ref" PatchVersion="0" />
<ProjectServicingConfiguration Include="NETStandard.Library.Ref" PatchVersion="0" />
</ItemGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20071.3</MicrosoftDotNetApiCompatVersion>
...
...
src/installer/pkg/projects/netstandard/pkg/Directory.Build.props
浏览文件 @
7511628b
...
...
@@ -3,14 +3,14 @@
<IsFrameworkPackage>true</IsFrameworkPackage>
<ShortFrameworkName>netstandard</ShortFrameworkName>
<ProductBrandPrefix>Microsoft .NET Standard</ProductBrandPrefix>
<ProductBandVersion>2.1</ProductBandVersion>
<ProductionVersion>$(ProductBandVersion).0</ProductionVersion>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
<PropertyGroup>
<ProductBandVersion>2.1</ProductBandVersion>
<PatchVersion>$(NETStandardPatchVersion)</PatchVersion>
<FrameworkListName>.NET Standard 2.1</FrameworkListName>
<FrameworkListTargetFrameworkIdentifier>.NETStandard</FrameworkListTargetFrameworkIdentifier>
<FrameworkListTargetFrameworkVersion>2.1</FrameworkListTargetFrameworkVersion>
...
...
src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETCoreTests.cs
浏览文件 @
7511628b
...
...
@@ -14,10 +14,17 @@ public class NETCoreTests
[
Fact
]
public
void
NETCoreTargetingPackIsValid
()
{
using
(
var
tester
=
NuGetArtifactTester
.
Open
(
using
(
var
tester
=
NuGetArtifactTester
.
Open
OrNull
(
dirs
,
"Microsoft.NETCore.App.Ref"
))
{
// Allow no targeting pack in case this is a servicing build.
// This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
if
(
tester
==
null
)
{
return
;
}
tester
.
IsTargetingPackForPlatform
();
tester
.
HasOnlyTheseDataFiles
(
"data/FrameworkList.xml"
,
...
...
src/installer/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NETStandardTests.cs
浏览文件 @
7511628b
...
...
@@ -14,10 +14,17 @@ public class NETStandardTests
[
Fact
]
public
void
NETStandardTargetingPackIsValid
()
{
using
(
var
tester
=
NuGetArtifactTester
.
Open
(
using
(
var
tester
=
NuGetArtifactTester
.
Open
OrNull
(
dirs
,
"NETStandard.Library.Ref"
))
{
// Allow no targeting pack in case this is a servicing build.
// This condition should be tightened: https://github.com/dotnet/core-setup/issues/8830
if
(
tester
==
null
)
{
return
;
}
tester
.
HasOnlyTheseDataFiles
(
"data/FrameworkList.xml"
,
"data/PackageOverrides.txt"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录