diff --git a/NuGet.config b/NuGet.config
index 29f6dfb08d4..646019bc8a8 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index e7ca1ac3a2d..575371f261a 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
- 10.0.0-beta.25528.106
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
+ 10.0.0-beta.25531.102
10.0.0
10.0.0
10.0.0
10.0.0
- 10.0.0-rtm.25528.106
+ 10.0.0-rtm.25531.102
10.0.0
10.0.0
10.0.0
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fc40b7e6f2d..e8c74e9780b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
And you can check these with "darc get-dependencies target-repo "winforms"
-->
-
+
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
-
+
https://github.com/dotnet/dotnet
- bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05
+ ba86126261026d26f7c30cd3434680d3965a88cf
diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml
index d6b9878f54d..f2248ebfd73 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 df78c6f2d16..eb230628387 100644
--- a/global.json
+++ b/global.json
@@ -21,9 +21,9 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106",
- "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25528.106",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
+ "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25531.102",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0"
},