diff --git a/NuGet.config b/NuGet.config
index 353a7af9ad1..362fbfa273d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,9 @@
-
+
+
+
@@ -19,7 +21,9 @@
-
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a7a0c5da62c..3fda69db9d8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -29,9 +29,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
dcf4a22cf8671c1abe880ebec4cfd906c99588bf
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
+ fce8ed90dc43047eabec2b32c04ee46b789ad5d1
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -41,36 +41,36 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
50c4cb9fc31c47f03eac865d7bc518af173b74b7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- dcf4a22cf8671c1abe880ebec4cfd906c99588bf
+ ef853a71052646a42abf17e888ec6d9a69614ad9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
+ fce8ed90dc43047eabec2b32c04ee46b789ad5d1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
+ fce8ed90dc43047eabec2b32c04ee46b789ad5d1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- efd5742bb5dd1677fbbbeb277bcfb5c9025548e5
+ fce8ed90dc43047eabec2b32c04ee46b789ad5d1
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
-
+
https://github.com/dotnet/arcade
- 20ab70a74d52b68f4271bd946884e24049b14f83
+ a5ec3fab69ac440afe6764b2e046af6e8fcafa74
diff --git a/eng/Versions.props b/eng/Versions.props
index ed0da3a15c7..c95fe88002d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
- 8.0.18
+ 8.0.20
servicing
@@ -24,16 +24,16 @@
8.0.1
8.0.1
8.0.2
- 8.0.16-servicing.25215.6
+ 8.0.19-servicing.25365.14
8.0.1
- 8.0.5
+ 8.0.6
8.0.2
- 8.0.16
- 8.0.16
- 8.0.16-servicing.25215.6
+ 8.0.19
+ 8.0.19
+ 8.0.19-servicing.25365.14
- 8.0.0-beta.25263.4
+ 8.0.0-beta.25407.1
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 98ccbd7a9c1..b98f6a6505d 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 e295031c098..2856f7de106 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 82b2798ba30..bb048ad125a 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 59a75ab3972..fc7459ffcb1 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "8.0.116",
+ "version": "8.0.119",
"allowPrerelease": true,
"rollForward": "latestMajor"
},
"tools": {
- "dotnet": "8.0.116",
+ "dotnet": "8.0.119",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -13,7 +13,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
}
}