diff --git a/NuGet.config b/NuGet.config index 868daeb0446f..45022caf7cc9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,13 @@ + + + + @@ -30,9 +34,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a40c616c5bb..7bb5362ce2f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 0bf8bd7f79ed..1579c647b67d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09..8947ea3f0593 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,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 56b35b9f8b78..ae875b2ea090 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2" } }