Skip to content

Commit 7e2fd3c

Browse files
author
Jason Zhai
committed
Merge branch 'release/6.0.4xx' of https://github.com/dotnet/sdk into merge/release/6.0.1xx-to-release/6.0.4xx
2 parents 4583d51 + c887c13 commit 7e2fd3c

File tree

874 files changed

+36370
-7643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

874 files changed

+36370
-7643
lines changed

‎.vsts-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,18 @@ extends:
165165
image: 1es-ubuntu-2004
166166
os: linux
167167
${{ if eq(variables['System.TeamProject'], 'public') }}:
168-
helixTargetQueue: Ubuntu.1804.Amd64.Open
168+
helixTargetQueue: Ubuntu.2004.Amd64.Open
169169
${{ if ne(variables['System.TeamProject'], 'public') }}:
170-
helixTargetQueue: Ubuntu.1804.Amd64
170+
helixTargetQueue: Ubuntu.2004.Amd64
171171
variables:
172172
- name: _BuildConfig
173173
value: Release
174174
- name: _PublishArgs
175175
value: ''
176176
- name: _SignType
177+
value: test
178+
- name: _Test
179+
value: -test
177180

178181
- template: /eng/build.yml@self
179182
parameters:
@@ -193,6 +196,8 @@ extends:
193196
value: ''
194197
- name: _SignType
195198
value: test
199+
- name: _Test
200+
value: -test
196201

197202
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
198203
- template: /eng/common/templates-official/job/publish-build-assets.yml@self

‎.vsts-pr.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,21 @@ stages:
126126
pool:
127127
${{ if eq(variables['System.TeamProject'], 'public') }}:
128128
name: NetCore-Svc-Public
129-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
129+
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.open
130130
${{ if ne(variables['System.TeamProject'], 'public') }}:
131131
name: NetCore1ESPool-Svc-Internal
132132
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
133133
${{ if eq(variables['System.TeamProject'], 'public') }}:
134-
helixTargetQueue: Ubuntu.1804.Amd64.Open
134+
helixTargetQueue: Ubuntu.2004.Amd64.Open
135135
${{ if ne(variables['System.TeamProject'], 'public') }}:
136-
helixTargetQueue: Ubuntu.1804.Amd64
136+
helixTargetQueue: Ubuntu.2004.Amd64
137137
strategy:
138138
matrix:
139139
Build_Release:
140140
_BuildConfig: Release
141141
_PublishArgs: ''
142142
_SignType: test
143+
_Test: -test
143144

144145
- template: /eng/build-pr.yml
145146
parameters:
@@ -156,6 +157,7 @@ stages:
156157
_BuildConfig: Release
157158
_PublishArgs: ''
158159
_SignType: test
160+
_Test: -test
159161

160162
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
161163
- template: /eng/common/templates/job/publish-build-assets.yml

‎NuGet.config

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
<add key="darc-int-dotnet-aspnetcore-fedc545-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fedc545c-2/nuget/v3/index.json" />
1111
<add key="darc-int-dotnet-aspnetcore-fedc545-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fedc545c-1/nuget/v3/index.json" />
1212
<!-- End: Package sources from dotnet-aspnetcore -->
13+
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
14+
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
15+
<!-- End: Package sources from DotNet-msbuild-Trusted -->
16+
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
17+
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1318
<!-- Begin: Package sources from dotnet-runtime -->
1419
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
1520
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
1621
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
1722
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
1823
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
19-
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
20-
<add key="darc-pub-DotNet-msbuild-Trusted-d679d20" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d679d209/nuget/v3/index.json" />
21-
<!-- End: Package sources from DotNet-msbuild-Trusted -->
22-
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
23-
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2424
<!-- End: Package sources from dotnet-runtime -->
2525
<!-- Begin: Package sources from dotnet-templating -->
26-
<add key="darc-int-dotnet-templating-c86b755" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-templating-c86b755-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-5/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-templating-c86b755-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-3/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-templating-c86b755-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-2/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-templating-c86b755-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-c86b7556-1/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-templating-89f5155" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-templating-89f5155-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b-5/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-templating-89f5155-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b-3/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-templating-89f5155-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b-2/nuget/v3/index.json" />
30+
<add key="darc-int-dotnet-templating-89f5155-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-89f5155b-1/nuget/v3/index.json" />
3131
<!-- End: Package sources from dotnet-templating -->
3232
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3333
<add key="darc-int-dotnet-windowsdesktop-ef2ca68" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ef2ca68f/nuget/v3/index.json" />
@@ -44,35 +44,36 @@
4444
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
4545
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
4646
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
47+
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
4748
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
4849
<!-- Used for Rich Navigation indexing task -->
4950
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
5051
</packageSources>
5152
<disabledPackageSources>
5253
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
54+
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
55+
<!-- End: Package sources from DotNet-msbuild-Trusted -->
56+
<!-- Begin: Package sources from dotnet-templating -->
57+
<add key="darc-int-dotnet-templating-89f5155-1" value="true" />
58+
<add key="darc-int-dotnet-templating-89f5155-2" value="true" />
59+
<add key="darc-int-dotnet-templating-89f5155-3" value="true" />
60+
<add key="darc-int-dotnet-templating-89f5155-5" value="true" />
61+
<add key="darc-int-dotnet-templating-89f5155" value="true" />
62+
<!-- End: Package sources from dotnet-templating -->
5363
<!-- Begin: Package sources from dotnet-aspnetcore -->
5464
<add key="darc-int-dotnet-aspnetcore-fedc545-1" value="true" />
5565
<add key="darc-int-dotnet-aspnetcore-fedc545-2" value="true" />
5666
<add key="darc-int-dotnet-aspnetcore-fedc545-3" value="true" />
5767
<add key="darc-int-dotnet-aspnetcore-fedc545-5" value="true" />
5868
<add key="darc-int-dotnet-aspnetcore-fedc545" value="true" />
5969
<!-- End: Package sources from dotnet-aspnetcore -->
60-
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
61-
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6270
<!-- Begin: Package sources from dotnet-runtime -->
6371
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
6472
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
6573
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
6674
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
6775
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
6876
<!-- End: Package sources from dotnet-runtime -->
69-
<!-- Begin: Package sources from dotnet-templating -->
70-
<add key="darc-int-dotnet-templating-c86b755-1" value="true" />
71-
<add key="darc-int-dotnet-templating-c86b755-2" value="true" />
72-
<add key="darc-int-dotnet-templating-c86b755-3" value="true" />
73-
<add key="darc-int-dotnet-templating-c86b755-5" value="true" />
74-
<add key="darc-int-dotnet-templating-c86b755" value="true" />
75-
<!-- End: Package sources from dotnet-templating -->
7677
<!-- Begin: Package sources from dotnet-windowsdesktop -->
7778
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-1" value="true" />
7879
<add key="darc-int-dotnet-windowsdesktop-ef2ca68-2" value="true" />

‎eng/BuildConfiguration/build-configuration.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"RetryCountLimit":1,
2+
"RetryCountLimit":0,
33
"RetryByPipeline":{
44
"RetryStages":[
55
{
66
"StageName":"build"
77
}
88
]
99
}
10-
}
10+
}

‎eng/Publishing.props

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,26 @@
5959
</CreateProperty>
6060
</Target>
6161

62+
<!-- FSharp needs to push different packages to nuget.org depending on whether the SDK is preview or not,
63+
To achieve this, we find the FSharp compiler package, then the stable or non-stable FSharp.Core and Compiler service
64+
package contained within, depending on the stability switch of the SDK. The SDK then treats these packages as its own outputs,
65+
whch means they get automatically pushed on release day. -->
66+
<PropertyGroup>
67+
<PublishDependsOnTargets>$(PublishDependsOnTargets);_ResolvePublishFSharpNuGetPackages</PublishDependsOnTargets>
68+
</PropertyGroup>
69+
70+
<Target Name="_ResolvePublishFSharpNuGetPackages">
71+
<PropertyGroup>
72+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'!='release'">Shipping</FSharpCorePath>
73+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='release'">Release</FSharpCorePath>
74+
</PropertyGroup>
75+
<ItemGroup>
76+
<FSharpPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.FSharp.Compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Core.*.nupkg"/>
77+
<FSharpPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.FSharp.Compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Compiler.Service.*.nupkg" />
78+
<ItemsToPushToBlobFeed Include="@(FSharpPackagesToPush)" />
79+
</ItemGroup>
80+
</Target>
81+
6282
<!-- We use a separate target to publish this to blob storage so that we can push this to
6383
a relative path inside the blob storage. -->
6484
<Target Name="PublishToolsetAssets" DependsOnTargets="ReadToolsetVersion" BeforeTargets="Publish">
@@ -73,6 +93,12 @@
7393
<ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />
7494
<ItemsToSignPostBuild Include="@(ToolsetAssetsToPublish->'%(Filename)%(Extension)')" />
7595
</ItemGroup>
96+
97+
<PropertyGroup>
98+
<IsStableBuild>false</IsStableBuild>
99+
<IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
100+
</PropertyGroup>
101+
76102

77103
<MakeDir Directories="$(TempWorkingDirectory)"/>
78104

@@ -94,7 +120,8 @@
94120
PublishFlatContainer="true"
95121
AssetManifestPath="$(SdkAssetsManifestFilePath)"
96122
AssetsTemporaryDirectory="$(TempWorkingDirectory)"
97-
PublishingVersion="3"/>
123+
PublishingVersion="3"
124+
IsStableBuild="$(IsStableBuild)" />
98125

99126
<Copy
100127
SourceFiles="$(SdkAssetsManifestFilePath)"

0 commit comments

Comments
 (0)