diff --git a/NuGet.config b/NuGet.config index 8b998c370e05..e9a004a21c58 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 66ca1c010c2e..70ca8b7668b1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,13 +9,13 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 - 10.0.0-beta.25517.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 + 10.0.0-beta.25530.104 10.0.0 10.0.0 10.0.0 @@ -44,7 +44,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25517.104 + 10.0.0-rtm.25530.104 10.0.0 10.0.0 10.0.0 @@ -60,16 +60,16 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25517.104 + 10.0.0-rtm.25530.104 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25517.104 - 10.0.0-rtm.25517.104 - 3.2.0-preview.25517.104 - 7.0.0-rc.1804 - 7.0.0-rc.1804 - 7.0.0-rc.1804 + 10.0.0-rtm.25530.104 + 10.0.0-rtm.25530.104 + 3.2.0-preview.25530.104 + 7.0.0-rc.3104 + 7.0.0-rc.3104 + 7.0.0-rc.3104 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42274e0b36bd..7757a9384d45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + e50f95bd9940ada4c74fee327bb3e7146523db1c - + https://github.com/dotnet/dotnet - c737522b7d921a201ce217c756af7c0a7093a605 + 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 14bf740a0d39..619ef4791a15 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107" + "version": "10.0.100-rc.2.25502.107" }, "tools": { - "dotnet": "10.0.100-rc.1.25451.107", + "dotnet": "10.0.100-rc.2.25502.107", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25517.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25517.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25517.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25530.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25530.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25530.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"