Skip to content

Commit e3e7521

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents cceab9c + 3d345e0 commit e3e7521

File tree

5 files changed

+73
-69
lines changed

5 files changed

+73
-69
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-ee0a97a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-emsdk -->
1314
<!-- Begin: Package sources from dotnet-wcf -->
1415
<!-- End: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.21519.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.22108.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>20dc231264fa75c9860b66f295a9ae279fe91df8</Sha>
5+
<Sha>183f41cd63abd8dcba7389c22d19ebad7df65bfa</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21417.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.2">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a</Sha>
13+
<Sha>ee0a97a0009c0e048789126253fea7994db676ac</Sha>
1414
</Dependency>
1515
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
1616
<Uri>https://github.com/dotnet/wcf</Uri>
1717
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22104.4">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
23+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22104.4">
25+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
27+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22104.4">
29+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22107.2">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
31+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22104.4">
33+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22107.2">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
35+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22104.4">
37+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22107.2">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
39+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22104.4">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22107.2">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
43+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22104.4">
45+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22107.2">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
47+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22104.4">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22107.2">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
51+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22104.4">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22107.2">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
55+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22104.4">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
59+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22104.4">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
63+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22104.4">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22107.2">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
67+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22104.4">
69+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22107.2">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
71+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22104.4">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22107.2">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
75+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22104.4">
77+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22107.2">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
79+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22104.4">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22107.2">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
83+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22104.4">
85+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22107.2">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
87+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22104.4">
89+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22107.2">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
91+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
9494
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -210,9 +210,9 @@
210210
<Uri>https://github.com/dotnet/xharness</Uri>
211211
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22104.4">
213+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22107.2">
214214
<Uri>https://github.com/dotnet/arcade</Uri>
215-
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
215+
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
216216
</Dependency>
217217
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@
4141
<!-- SDK dependencies -->
4242
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
4343
<!-- Arcade dependencies -->
44-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22104.4</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22104.4</MicrosoftDotNetCodeAnalysisVersion>
47-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenAPIVersion>
48-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenFacadesVersion>
49-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22104.4</MicrosoftDotNetXUnitExtensionsVersion>
50-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22104.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
51-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksInstallersVersion>
53-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksPackagingVersion>
54-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksTemplatingVersion>
55-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22104.4</MicrosoftDotNetRemoteExecutorVersion>
57-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22104.4</MicrosoftDotNetVersionToolsTasksVersion>
58-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22104.4</MicrosoftDotNetPackageTestingVersion>
44+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22107.2</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22107.2</MicrosoftDotNetCodeAnalysisVersion>
47+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenAPIVersion>
48+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenFacadesVersion>
49+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
50+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22107.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
53+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksPackagingVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22107.2</MicrosoftDotNetRemoteExecutorVersion>
57+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22107.2</MicrosoftDotNetVersionToolsTasksVersion>
58+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22107.2</MicrosoftDotNetPackageTestingVersion>
5959
<!-- NuGet dependencies -->
6060
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6161
<!-- Installer dependencies -->
@@ -156,7 +156,7 @@
156156
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
157157
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
158158
<!-- ICU -->
159-
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.21519.1</MicrosoftNETCoreRuntimeICUTransportVersion>
159+
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.22108.1</MicrosoftNETCoreRuntimeICUTransportVersion>
160160
<!-- MsQuic -->
161161
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21417.1</SystemNetMsQuicTransportVersion>
162162
<!-- Mono LLVM -->
@@ -169,7 +169,7 @@
169169
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
170170
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
171171
<!-- emscripten / Node -->
172-
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.0</MicrosoftNETWorkloadEmscriptenManifest60100Version>
172+
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60100Version>
173173
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
174174
<!-- workloads -->
175175
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎eng/common/templates/job/source-build.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34-
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
35-
# source-build builds run in Docker, including the default managed platform.
36-
defaultContainerHostPool:
37-
vmImage: ubuntu-20.04
38-
3934
jobs:
4035
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
4136
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
4742
container: ${{ parameters.platform.container }}
4843

4944
${{ if eq(parameters.platform.pool, '') }}:
50-
pool: ${{ parameters.defaultContainerHostPool }}
45+
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
46+
# source-build builds run in Docker, including the default managed platform.
47+
pool:
48+
${{ if eq(variables['System.TeamProject'], 'public') }}:
49+
name: NetCore1ESPool-Public
50+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
51+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52+
name: NetCore1ESPool-Internal
53+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5154
${{ if ne(parameters.platform.pool, '') }}:
5255
pool: ${{ parameters.platform.pool }}
5356

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22104.4",
16-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22104.4",
17-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22104.4",
18-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22104.4",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22107.2",
16+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
17+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2",
18+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22107.2",
1919
"Microsoft.Build.NoTargets": "3.1.0",
2020
"Microsoft.Build.Traversal": "3.0.23",
2121
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"

0 commit comments

Comments
 (0)