diff --git a/NuGet.config b/NuGet.config
index d5dbd101f043e1..086ee6ef505994 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 28a727df861587..be61afe4daac46 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
-
+
https://github.com/dotnet/icu
- 20dc231264fa75c9860b66f295a9ae279fe91df8
+ 183f41cd63abd8dcba7389c22d19ebad7df65bfa
https://github.com/dotnet/msquic
98129287d56a5e0348c291ce4260e630b4aa510d
-
+
https://github.com/dotnet/emsdk
- 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a
+ ee0a97a0009c0e048789126253fea7994db676ac
https://github.com/dotnet/wcf
@@ -18,77 +18,77 @@
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
https://github.com/microsoft/vstest
@@ -210,9 +210,9 @@
https://github.com/dotnet/xharness
e9669dc84ecd668d3bbb748758103e23b394ffef
-
+
https://github.com/dotnet/arcade
- 35cb0d91130a309154a03a7efa39fa6d389c43ec
+ fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index d1688892d5131d..7244bb149bd4f8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,21 +37,21 @@
1.0.0-rc.2.21511.46
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 2.5.1-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
- 6.0.0-beta.22104.4
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 2.5.1-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
+ 6.0.0-beta.22107.2
6.0.0-preview.1.102
@@ -152,7 +152,7 @@
6.0.100-1.21459.1
$(MicrosoftNETILLinkTasksVersion)
- 6.0.0-rtm.21519.1
+ 6.0.0-rtm.22108.1
6.0.0-preview.7.21417.1
@@ -165,7 +165,7 @@
11.1.0-alpha.1.21416.1
11.1.0-alpha.1.21416.1
- 6.0.0
+ 6.0.2
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
1.1.87-gba258badda
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index 5023d36dcb3c5b..5cd5325d7b4e6b 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -31,11 +31,6 @@ parameters:
# container and pool.
platform: {}
- # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
- # source-build builds run in Docker, including the default managed platform.
- defaultContainerHostPool:
- vmImage: ubuntu-20.04
-
jobs:
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
container: ${{ parameters.platform.container }}
${{ if eq(parameters.platform.pool, '') }}:
- pool: ${{ parameters.defaultContainerHostPool }}
+ # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+ # source-build builds run in Docker, including the default managed platform.
+ pool:
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ name: NetCore1ESPool-Public
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+ ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/global.json b/global.json
index 42af5aab34b3e2..c80ef24ae46481 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22104.4",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22104.4",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22104.4",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22104.4",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22107.2",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22107.2",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"