diff --git a/NuGet.config b/NuGet.config
index 37fc8bfd62dc..1a5141b5553c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,7 +10,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 220862c699f9..8d3a2cf12178 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 0.11.5-alpha.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-rtm.25528.106
+ 10.0.0-beta.25530.104
+ 10.0.0-beta.25530.104
+ 0.11.5-alpha.25530.104
+ 10.0.0-beta.25530.104
+ 10.0.0-rtm.25530.104
10.0.0
10.0.0
- 10.0.100-rtm.25528.106
+ 10.0.100-rtm.25530.104
10.0.0
10.0.100
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 512d0f4eb056..c550c51f808c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,29 +1,29 @@
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
@@ -78,25 +78,25 @@
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
https://github.com/dotnet/xharness
cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ e50f95bd9940ada4c74fee327bb3e7146523db1c
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index d6b9878f54db..f2248ebfd730 100644
--- a/eng/common/core-templates/steps/install-microbuild.yml
+++ b/eng/common/core-templates/steps/install-microbuild.yml
@@ -11,23 +11,22 @@ parameters:
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
- # Location of the MicroBuild output folder
- # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
- microBuildOutputFolder: '$(Build.SourcesDirectory)'
continueOnError: false
steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
- # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
+ # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
- installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
- workingDirectory: ${{ parameters.microBuildOutputFolder }}
+ # Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
+ # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+ # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
+ installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
- script: |
@@ -65,7 +64,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
env:
TeamName: $(_TeamName)
- MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+ MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
env:
TeamName: $(_TeamName)
- MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
+ MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
diff --git a/global.json b/global.json
index a7be75b4d60c..e0108823083d 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "10.0.100-rtm.25528.106",
+ "version": "10.0.100-rtm.25530.104",
"paths": [
"builds/downloads/dotnet",
"$host$"
@@ -8,9 +8,9 @@
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
- "dotnet": "10.0.100-rtm.25528.106"
+ "dotnet": "10.0.100-rtm.25530.104"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25530.104"
}
}