diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2f4bfc5338a..a75a23a3024 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -71,14 +71,14 @@
-
+
https://github.com/dotnet/arcade
- a73c08ec0de5a6e5e2a8668837df67edecb3a3da
+ 8dca4f8ae100b102230287f8cc1b75264c9f1a6f
-
+
https://github.com/dotnet/arcade
- a73c08ec0de5a6e5e2a8668837df67edecb3a3da
+ 8dca4f8ae100b102230287f8cc1b75264c9f1a6f
@@ -100,9 +100,9 @@
0b8371953e61f6179f39f1d62ebbd6a251f335e0
-
+
https://github.com/dotnet/arcade
- a73c08ec0de5a6e5e2a8668837df67edecb3a3da
+ 8dca4f8ae100b102230287f8cc1b75264c9f1a6f
diff --git a/eng/Versions.props b/eng/Versions.props
index 3be2a727f13..68110460e36 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
- 17.11.39
+ 17.11.40
release
17.10.4
15.1.0.0
@@ -51,7 +51,7 @@
Otherwise, this version of dotnet will not be installed and the build will error out. -->
$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))
4.2.0-1.22102.8
- 8.0.0-beta.25366.2
+ 8.0.0-beta.25378.1
7.0.0
6.0.1
4.11.0-3.24313.9
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 9713e93c84c..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,10 +136,11 @@ 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
+ ${{ 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/global.json b/global.json
index cedb5989439..2560f8fe7e1 100644
--- a/global.json
+++ b/global.json
@@ -10,6 +10,6 @@
"xcopy-msbuild": "17.8.5"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1"
}
}