diff --git a/NuGet.config b/NuGet.config
index 02506c2fe5754d..616f3743d8d613 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c769a1f4836efc..74b2f899151c5c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,9 +111,9 @@
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
@@ -121,69 +121,69 @@
73f0850939d96131c28cf6ea6ee5aacb4da0083a
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
https://github.com/dotnet/runtime-assets
@@ -334,9 +334,9 @@
https://github.com/dotnet/xharness
c3f3d30ca6a7630b38e061043d4489559c06d4cc
-
+
https://github.com/dotnet/arcade
- 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 1c1e1719bbf3f6..7af2e977792a7d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,21 +87,21 @@
8.0.100
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 2.5.1-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
- 8.0.0-beta.25310.3
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 2.5.1-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
+ 8.0.0-beta.25407.1
6.0.0-preview.1.102
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 98ccbd7a9c16ec..b98f6a6505d399 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -21,6 +21,7 @@ parameters:
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
artifacts: ''
enableMicrobuild: false
+ microbuildUseESRP: true
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
@@ -135,6 +136,11 @@ jobs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+ ${{ if eq(parameters.microbuildUseESRP, true) }}:
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+ ${{ else }}:
+ ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index e295031c0985e9..2856f7de106127 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -134,6 +134,10 @@ jobs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+ ${{ else }}:
+ ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 82b2798ba307d5..bb048ad125a8cf 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# Locate Visual Studio installation or download x-copy msbuild.
$vsInfo = LocateVisualStudio $vsRequirements
- if ($vsInfo -ne $null) {
+ if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
# Ensure vsInstallDir has a trailing slash
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
diff --git a/global.json b/global.json
index fef3993456c853..e0ea181812af93 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "8.0.117",
+ "version": "8.0.119",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "8.0.117"
+ "dotnet": "8.0.119"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3",
- "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25310.3",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1",
+ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25407.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"