From 7bf7fe2cafe8284a4be618d2dee853fe6ddefb15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Oct 2025 02:02:03 +0000 Subject: [PATCH 01/18] Update dependencies from https://github.com/dotnet/arcade build 20251030.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25530.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 9 +++++---- global.json | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d404509b66..d6e8d2e3eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - d78e0e9d17ca041656652ef10b8f5cb4f1f42475 + 12b7438f565ef480ec77fd3f1ee80521dcafdc2b - + https://github.com/dotnet/arcade - d78e0e9d17ca041656652ef10b8f5cb4f1f42475 + 12b7438f565ef480ec77fd3f1ee80521dcafdc2b - + https://github.com/dotnet/arcade - d78e0e9d17ca041656652ef10b8f5cb4f1f42475 + 12b7438f565ef480ec77fd3f1ee80521dcafdc2b - + https://github.com/dotnet/arcade - d78e0e9d17ca041656652ef10b8f5cb4f1f42475 + 12b7438f565ef480ec77fd3f1ee80521dcafdc2b diff --git a/eng/Versions.props b/eng/Versions.props index 8d3932fb0ca..6a30bc92717 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,8 @@ true - + + @@ -22,9 +23,9 @@ - 11.0.0-beta.25528.1 - 11.0.0-beta.25528.1 - 11.0.0-beta.25528.1 + 11.0.0-beta.25530.1 + 11.0.0-beta.25530.1 + 11.0.0-beta.25530.1 diff --git a/global.json b/global.json index b0808ec03c1..4725bdbb33b 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25530.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 2f1748ffffb64e57ce1e4c78dc2c5fa179bdfe17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Nov 2025 02:02:53 +0000 Subject: [PATCH 02/18] Update dependencies from https://github.com/dotnet/arcade build 20251031.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25531.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- eng/common/core-templates/steps/publish-logs.yml | 2 ++ eng/common/post-build/redact-logs.ps1 | 4 +++- global.json | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6e8d2e3eab..7a8c4447e5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 12b7438f565ef480ec77fd3f1ee80521dcafdc2b + d8816877a6b0e6cb39cb57d92557ad4952715a2e - + https://github.com/dotnet/arcade - 12b7438f565ef480ec77fd3f1ee80521dcafdc2b + d8816877a6b0e6cb39cb57d92557ad4952715a2e - + https://github.com/dotnet/arcade - 12b7438f565ef480ec77fd3f1ee80521dcafdc2b + d8816877a6b0e6cb39cb57d92557ad4952715a2e - + https://github.com/dotnet/arcade - 12b7438f565ef480ec77fd3f1ee80521dcafdc2b + d8816877a6b0e6cb39cb57d92557ad4952715a2e diff --git a/eng/Versions.props b/eng/Versions.props index 6a30bc92717..dab72a64119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25530.1 - 11.0.0-beta.25530.1 - 11.0.0-beta.25530.1 + 11.0.0-beta.25531.1 + 11.0.0-beta.25531.1 + 11.0.0-beta.25531.1 diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a..0664c343b2a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -28,6 +28,8 @@ steps: arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc1959150..fc0218a013d 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/global.json b/global.json index 4725bdbb33b..5a00524b28d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25530.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From fe2986df28ea6662c406b132903cceaa32d5dc5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Nov 2025 02:02:08 +0000 Subject: [PATCH 03/18] Update dependencies from https://github.com/dotnet/arcade build 20251103.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25553.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a8c4447e5c..2177c619a02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - d8816877a6b0e6cb39cb57d92557ad4952715a2e + 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 - + https://github.com/dotnet/arcade - d8816877a6b0e6cb39cb57d92557ad4952715a2e + 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 - + https://github.com/dotnet/arcade - d8816877a6b0e6cb39cb57d92557ad4952715a2e + 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 - + https://github.com/dotnet/arcade - d8816877a6b0e6cb39cb57d92557ad4952715a2e + 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 diff --git a/eng/Versions.props b/eng/Versions.props index dab72a64119..98056450fb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25531.1 - 11.0.0-beta.25531.1 - 11.0.0-beta.25531.1 + 11.0.0-beta.25553.1 + 11.0.0-beta.25553.1 + 11.0.0-beta.25553.1 diff --git a/global.json b/global.json index 5a00524b28d..ce766b71317 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 5c074d6ecbcf9c2b39eec89689caf329714387c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Nov 2025 02:02:05 +0000 Subject: [PATCH 04/18] Update dependencies from https://github.com/dotnet/arcade build 20251104.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25554.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../core-templates/job/publish-build-assets.yml | 5 +++++ .../core-templates/post-build/post-build.yml | 4 ++++ .../steps/install-microbuild-impl.yml | 6 +++--- global.json | 2 +- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2177c619a02..436ba34bf25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 + 9b521bdb03239f91830fb39a6ee2bf23bba07989 - + https://github.com/dotnet/arcade - 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 + 9b521bdb03239f91830fb39a6ee2bf23bba07989 - + https://github.com/dotnet/arcade - 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 + 9b521bdb03239f91830fb39a6ee2bf23bba07989 - + https://github.com/dotnet/arcade - 6247a683b6e52f9c24e9c7b8832bb4cd3537e7f7 + 9b521bdb03239f91830fb39a6ee2bf23bba07989 diff --git a/eng/Versions.props b/eng/Versions.props index 98056450fb5..06bfc46d02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25553.1 - 11.0.0-beta.25553.1 - 11.0.0-beta.25553.1 + 11.0.0-beta.25554.2 + 11.0.0-beta.25554.2 + 11.0.0-beta.25554.2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 721a5566699..4d282377c18 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -189,6 +189,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x - task: AzureCLI@2 displayName: Publish Using Darc diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0cea81c74f2..0af41fe5f9f 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -313,6 +313,10 @@ stages: - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index 9fdf3a11677..b9e0143ee92 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -20,15 +20,15 @@ parameters: steps: - ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: - task: MicroBuildSigningPluginPreview@4 - displayName: Install Preview MicroBuild plugin (Windows) + displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} condition: ${{ parameters.condition }} - ${{ else }}: - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) + displayName: Install MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/global.json b/global.json index ce766b71317..e36547199a8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25554.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 9bd73fd6eda2972c103224aae46adcb6cbaa956d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 02:03:01 +0000 Subject: [PATCH 05/18] Update dependencies from https://github.com/dotnet/arcade build 20251105.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25555.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../core-templates/steps/install-microbuild.yml | 15 ++++++++------- global.json | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 436ba34bf25..3b95b63ac37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 9b521bdb03239f91830fb39a6ee2bf23bba07989 + 86c3a198a81e697e2bfa713cae2c4bea4b0df085 - + https://github.com/dotnet/arcade - 9b521bdb03239f91830fb39a6ee2bf23bba07989 + 86c3a198a81e697e2bfa713cae2c4bea4b0df085 - + https://github.com/dotnet/arcade - 9b521bdb03239f91830fb39a6ee2bf23bba07989 + 86c3a198a81e697e2bfa713cae2c4bea4b0df085 - + https://github.com/dotnet/arcade - 9b521bdb03239f91830fb39a6ee2bf23bba07989 + 86c3a198a81e697e2bfa713cae2c4bea4b0df085 diff --git a/eng/Versions.props b/eng/Versions.props index 06bfc46d02f..145e98dd2a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25554.2 - 11.0.0-beta.25554.2 - 11.0.0-beta.25554.2 + 11.0.0-beta.25555.5 + 11.0.0-beta.25555.5 + 11.0.0-beta.25555.5 diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 3d42d9a5661..bdebec0eaa9 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,6 +13,9 @@ 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)' # Microbuild version microbuildPluginVersion: 'latest' @@ -21,16 +24,14 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # 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 + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -70,7 +71,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -92,7 +93,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} 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 e36547199a8..299aacb9f71 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25554.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.5", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 7dbcfeebc2b7249f7a625e7ffafa3151f188e170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Nov 2025 02:02:20 +0000 Subject: [PATCH 06/18] Update dependencies from https://github.com/dotnet/arcade build 20251106.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25556.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../core-templates/job/publish-build-assets.yml | 6 +++--- .../core-templates/post-build/post-build.yml | 2 +- eng/common/core-templates/steps/publish-logs.yml | 4 ++-- global.json | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b95b63ac37..8ddb9ae6a07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 86c3a198a81e697e2bfa713cae2c4bea4b0df085 + 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 - + https://github.com/dotnet/arcade - 86c3a198a81e697e2bfa713cae2c4bea4b0df085 + 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 - + https://github.com/dotnet/arcade - 86c3a198a81e697e2bfa713cae2c4bea4b0df085 + 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 - + https://github.com/dotnet/arcade - 86c3a198a81e697e2bfa713cae2c4bea4b0df085 + 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 diff --git a/eng/Versions.props b/eng/Versions.props index 145e98dd2a4..90b5fb6ec2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25555.5 - 11.0.0-beta.25555.5 - 11.0.0-beta.25555.5 + 11.0.0-beta.25556.3 + 11.0.0-beta.25556.3 + 11.0.0-beta.25556.3 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 4d282377c18..4a417e003c7 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -140,7 +140,7 @@ jobs: /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -210,8 +210,8 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' - -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0af41fe5f9f..27763a825b9 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -334,4 +334,4 @@ stages: -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 0664c343b2a..5a927b4c7bc 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,10 +26,10 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/global.json b/global.json index 299aacb9f71..b10aedfbad0 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.5", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.3", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 98795319da5dc71089093914cefa83c6a52dd2df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Nov 2025 02:01:33 +0000 Subject: [PATCH 07/18] Update dependencies from https://github.com/dotnet/arcade build 20251107.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25557.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../steps/source-index-stage1-publish.yml | 4 ++-- eng/common/cross/x64/tizen/tizen.patch | 9 +++++++++ eng/common/cross/x86/tizen/tizen.patch | 9 +++++++++ eng/common/native/install-dependencies.sh | 2 +- global.json | 2 +- 7 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 eng/common/cross/x64/tizen/tizen.patch create mode 100644 eng/common/cross/x86/tizen/tizen.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ddb9ae6a07..f18d975b0c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 + 7d717a49d570577936361c14de38bf61271aa274 - + https://github.com/dotnet/arcade - 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 + 7d717a49d570577936361c14de38bf61271aa274 - + https://github.com/dotnet/arcade - 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 + 7d717a49d570577936361c14de38bf61271aa274 - + https://github.com/dotnet/arcade - 36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9 + 7d717a49d570577936361c14de38bf61271aa274 diff --git a/eng/Versions.props b/eng/Versions.props index 90b5fb6ec2b..9cc80295f14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25556.3 - 11.0.0-beta.25556.3 - 11.0.0-beta.25556.3 + 11.0.0-beta.25557.2 + 11.0.0-beta.25557.2 + 11.0.0-beta.25557.2 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index eff4573c6e5..ac019e2d033 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/cross/x64/tizen/tizen.patch b/eng/common/cross/x64/tizen/tizen.patch new file mode 100644 index 00000000000..56fbc881095 --- /dev/null +++ b/eng/common/cross/x64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-x86-64) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) ) diff --git a/eng/common/cross/x86/tizen/tizen.patch b/eng/common/cross/x86/tizen/tizen.patch new file mode 100644 index 00000000000..f4fe8838ad6 --- /dev/null +++ b/eng/common/cross/x86/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf32-i386) +-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) ) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index f7bd4af0c8d..64b87d0bcc3 100644 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/global.json b/global.json index b10aedfbad0..f574fb6fe9a 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.3", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25557.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From a5d676b5150adad834e100e0d2bcace60fb14db7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Nov 2025 13:24:58 +0000 Subject: [PATCH 08/18] Update dependencies from https://github.com/dotnet/arcade build 20251110.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25560.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f18d975b0c6..b79308ae317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 7d717a49d570577936361c14de38bf61271aa274 + 3a7f017be1c42a4ecc516446977cf55d429cf390 - + https://github.com/dotnet/arcade - 7d717a49d570577936361c14de38bf61271aa274 + 3a7f017be1c42a4ecc516446977cf55d429cf390 - + https://github.com/dotnet/arcade - 7d717a49d570577936361c14de38bf61271aa274 + 3a7f017be1c42a4ecc516446977cf55d429cf390 - + https://github.com/dotnet/arcade - 7d717a49d570577936361c14de38bf61271aa274 + 3a7f017be1c42a4ecc516446977cf55d429cf390 diff --git a/eng/Versions.props b/eng/Versions.props index 9cc80295f14..1e208c12c46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25557.2 - 11.0.0-beta.25557.2 - 11.0.0-beta.25557.2 + 11.0.0-beta.25560.1 + 11.0.0-beta.25560.1 + 11.0.0-beta.25560.1 diff --git a/global.json b/global.json index f574fb6fe9a..783c89ead89 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25557.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From b675f58d7d93688b6e69149066321e44d03a020f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Nov 2025 02:01:59 +0000 Subject: [PATCH 09/18] Update dependencies from https://github.com/dotnet/arcade build 20251112.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25562.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b79308ae317..123503212c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 3a7f017be1c42a4ecc516446977cf55d429cf390 + 4bb60deca10193c27f5bdf0a6afc5878ef558455 - + https://github.com/dotnet/arcade - 3a7f017be1c42a4ecc516446977cf55d429cf390 + 4bb60deca10193c27f5bdf0a6afc5878ef558455 - + https://github.com/dotnet/arcade - 3a7f017be1c42a4ecc516446977cf55d429cf390 + 4bb60deca10193c27f5bdf0a6afc5878ef558455 - + https://github.com/dotnet/arcade - 3a7f017be1c42a4ecc516446977cf55d429cf390 + 4bb60deca10193c27f5bdf0a6afc5878ef558455 diff --git a/eng/Versions.props b/eng/Versions.props index 1e208c12c46..f4f98e2f563 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25560.1 - 11.0.0-beta.25560.1 - 11.0.0-beta.25560.1 + 11.0.0-beta.25562.6 + 11.0.0-beta.25562.6 + 11.0.0-beta.25562.6 diff --git a/global.json b/global.json index 783c89ead89..b5cb2951191 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 053b7bb5d10763cd61880e0fc0d9187d10ab5581 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Nov 2025 02:02:57 +0000 Subject: [PATCH 10/18] Update dependencies from https://github.com/dotnet/arcade build 20251118.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25568.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 123503212c0..70feb573178 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 4bb60deca10193c27f5bdf0a6afc5878ef558455 + 73fa8a8e61a28b103613e06c1692b44f7bc89947 - + https://github.com/dotnet/arcade - 4bb60deca10193c27f5bdf0a6afc5878ef558455 + 73fa8a8e61a28b103613e06c1692b44f7bc89947 - + https://github.com/dotnet/arcade - 4bb60deca10193c27f5bdf0a6afc5878ef558455 + 73fa8a8e61a28b103613e06c1692b44f7bc89947 - + https://github.com/dotnet/arcade - 4bb60deca10193c27f5bdf0a6afc5878ef558455 + 73fa8a8e61a28b103613e06c1692b44f7bc89947 diff --git a/eng/Versions.props b/eng/Versions.props index f4f98e2f563..ca314fb34cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25562.6 - 11.0.0-beta.25562.6 - 11.0.0-beta.25562.6 + 11.0.0-beta.25568.1 + 11.0.0-beta.25568.1 + 11.0.0-beta.25568.1 diff --git a/global.json b/global.json index b5cb2951191..511c9c279d9 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.6", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25568.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 1dd0dd892f87e202e5af18844211302f7d45910c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Nov 2025 02:00:56 +0000 Subject: [PATCH 11/18] Update dependencies from https://github.com/dotnet/arcade build 20251119.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25569.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../core-templates/job/publish-build-assets.yml | 5 +++-- eng/common/core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 3 ++- global.json | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70feb573178..0837efaab15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 73fa8a8e61a28b103613e06c1692b44f7bc89947 + d0dd6fd98074a55efc1bfe63297467c706058a56 - + https://github.com/dotnet/arcade - 73fa8a8e61a28b103613e06c1692b44f7bc89947 + d0dd6fd98074a55efc1bfe63297467c706058a56 - + https://github.com/dotnet/arcade - 73fa8a8e61a28b103613e06c1692b44f7bc89947 + d0dd6fd98074a55efc1bfe63297467c706058a56 - + https://github.com/dotnet/arcade - 73fa8a8e61a28b103613e06c1692b44f7bc89947 + d0dd6fd98074a55efc1bfe63297467c706058a56 diff --git a/eng/Versions.props b/eng/Versions.props index ca314fb34cc..ef2f8d026f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25568.1 - 11.0.0-beta.25568.1 - 11.0.0-beta.25568.1 + 11.0.0-beta.25569.5 + 11.0.0-beta.25569.5 + 11.0.0-beta.25569.5 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 4a417e003c7..8b5c635fe80 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -122,8 +122,9 @@ jobs: # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml - parameters: - legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - template: /eng/common/templates/steps/enable-internal-runtimes.yml diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb9..9f6b3ee9e46 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,7 +60,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] image: 1es-mariner-2 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 27763a825b9..6f0929c039b 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -305,8 +305,9 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: NuGetAuthenticate@1 # Populate internal runtime variables. + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml parameters: legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/global.json b/global.json index 511c9c279d9..90dfc1218e9 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25568.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.5", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 10f8abfbe50d5d231716edee2089175a56ca8a6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Nov 2025 02:00:54 +0000 Subject: [PATCH 12/18] Update dependencies from https://github.com/dotnet/arcade build 20251120.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25570.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- eng/common/core-templates/job/source-build.yml | 2 +- global.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0837efaab15..2d011f0f028 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - d0dd6fd98074a55efc1bfe63297467c706058a56 + c1926cf647dd684194c2914f47f61ff534f030ac - + https://github.com/dotnet/arcade - d0dd6fd98074a55efc1bfe63297467c706058a56 + c1926cf647dd684194c2914f47f61ff534f030ac - + https://github.com/dotnet/arcade - d0dd6fd98074a55efc1bfe63297467c706058a56 + c1926cf647dd684194c2914f47f61ff534f030ac - + https://github.com/dotnet/arcade - d0dd6fd98074a55efc1bfe63297467c706058a56 + c1926cf647dd684194c2914f47f61ff534f030ac diff --git a/eng/Versions.props b/eng/Versions.props index ef2f8d026f0..d36018c2d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25569.5 - 11.0.0-beta.25569.5 - 11.0.0-beta.25569.5 + 11.0.0-beta.25570.6 + 11.0.0-beta.25570.6 + 11.0.0-beta.25570.6 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 9f6b3ee9e46..9d820f97421 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index 90dfc1218e9..126160b64ec 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.5", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From d1af20e98ebb0cd4cd0dd39a9422ec149a93ddf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Nov 2025 02:01:07 +0000 Subject: [PATCH 13/18] Update dependencies from https://github.com/dotnet/arcade build 20251121.7 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25571.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d011f0f028..cf7adc345bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - c1926cf647dd684194c2914f47f61ff534f030ac + 23d431613e20b20517334c1acbc7a04a6edb6ad9 - + https://github.com/dotnet/arcade - c1926cf647dd684194c2914f47f61ff534f030ac + 23d431613e20b20517334c1acbc7a04a6edb6ad9 - + https://github.com/dotnet/arcade - c1926cf647dd684194c2914f47f61ff534f030ac + 23d431613e20b20517334c1acbc7a04a6edb6ad9 - + https://github.com/dotnet/arcade - c1926cf647dd684194c2914f47f61ff534f030ac + 23d431613e20b20517334c1acbc7a04a6edb6ad9 diff --git a/eng/Versions.props b/eng/Versions.props index d36018c2d12..505e5175015 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25570.6 - 11.0.0-beta.25570.6 - 11.0.0-beta.25570.6 + 11.0.0-beta.25571.7 + 11.0.0-beta.25571.7 + 11.0.0-beta.25571.7 diff --git a/global.json b/global.json index 126160b64ec..87a39244c21 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25570.6", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.7", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 2229dd2d4fa41e19ebdf1898612efac5ab4d8c97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Nov 2025 02:01:22 +0000 Subject: [PATCH 14/18] Update dependencies from https://github.com/dotnet/arcade build 20251121.8 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25571.8 --- eng/Version.Details.xml | 16 +++++----- eng/Versions.props | 6 ++-- .../steps/install-microbuild.yml | 29 +++++++++++++++---- global.json | 2 +- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf7adc345bd..2447f3baf8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 23d431613e20b20517334c1acbc7a04a6edb6ad9 + a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 - + https://github.com/dotnet/arcade - 23d431613e20b20517334c1acbc7a04a6edb6ad9 + a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 - + https://github.com/dotnet/arcade - 23d431613e20b20517334c1acbc7a04a6edb6ad9 + a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 - + https://github.com/dotnet/arcade - 23d431613e20b20517334c1acbc7a04a6edb6ad9 + a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 diff --git a/eng/Versions.props b/eng/Versions.props index 505e5175015..e7f3b9788a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25571.7 - 11.0.0-beta.25571.7 - 11.0.0-beta.25571.7 + 11.0.0-beta.25571.8 + 11.0.0-beta.25571.8 + 11.0.0-beta.25571.8 diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index bdebec0eaa9..4f4b56ed2a6 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,9 +13,8 @@ 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)' + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild # Microbuild version microbuildPluginVersion: 'latest' @@ -30,8 +29,27 @@ steps: inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -85,6 +103,7 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json version: ${{ parameters.microbuildPluginVersion }} + workingDirectory: ${{ parameters.microBuildOutputFolder }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: diff --git a/global.json b/global.json index 87a39244c21..69a251c831c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.7", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.8", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 77e8b8fe410c90c9ae8d1dbceb2b59c205ef0ffe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Nov 2025 02:01:34 +0000 Subject: [PATCH 15/18] Update dependencies from https://github.com/dotnet/arcade build 20251124.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25574.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2447f3baf8e..130ad33bef4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a diff --git a/eng/Versions.props b/eng/Versions.props index e7f3b9788a7..6c0d399e652 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25571.8 - 11.0.0-beta.25571.8 - 11.0.0-beta.25571.8 + 11.0.0-beta.25574.6 + 11.0.0-beta.25574.6 + 11.0.0-beta.25574.6 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36..b64b66a6275 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4bc50bd568c..578705ee4db 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 69a251c831c..7689874087f 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.8", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.6", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From eaae66b590767aad93e32f9d0b54400fa071b839 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Nov 2025 02:01:42 +0000 Subject: [PATCH 16/18] Update dependencies from https://github.com/dotnet/arcade build 20251125.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25575.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../core-templates/job/source-index-stage1.yml | 4 ++-- .../core-templates/post-build/post-build.yml | 8 ++++---- global.json | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 130ad33bef4..bfa9e0a1bdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - 9a99542f9b72dbcd0e07baec5166909ab756788a + e29f11a331730bd4f51024ba83fa067d2ab80ca9 - + https://github.com/dotnet/arcade - 9a99542f9b72dbcd0e07baec5166909ab756788a + e29f11a331730bd4f51024ba83fa067d2ab80ca9 - + https://github.com/dotnet/arcade - 9a99542f9b72dbcd0e07baec5166909ab756788a + e29f11a331730bd4f51024ba83fa067d2ab80ca9 - + https://github.com/dotnet/arcade - 9a99542f9b72dbcd0e07baec5166909ab756788a + e29f11a331730bd4f51024ba83fa067d2ab80ca9 diff --git a/eng/Versions.props b/eng/Versions.props index 6c0d399e652..69307f5d4ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25574.6 - 11.0.0-beta.25574.6 - 11.0.0-beta.25574.6 + 11.0.0-beta.25575.1 + 11.0.0-beta.25575.1 + 11.0.0-beta.25575.1 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d..58b7a76814e 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 6f0929c039b..06864cd1feb 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/global.json b/global.json index 7689874087f..6aaa698bb48 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.6", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25575.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From 31eb700eff7e5b381eba9be295092fd458e1a682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Nov 2025 02:01:10 +0000 Subject: [PATCH 17/18] Update dependencies from https://github.com/dotnet/arcade build 20251128.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25578.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfa9e0a1bdb..e1603d9ca98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ - + https://github.com/dotnet/arcade - e29f11a331730bd4f51024ba83fa067d2ab80ca9 + 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade - e29f11a331730bd4f51024ba83fa067d2ab80ca9 + 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade - e29f11a331730bd4f51024ba83fa067d2ab80ca9 + 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade - e29f11a331730bd4f51024ba83fa067d2ab80ca9 + 846929727a388f2b1fd3ccf21f67694f44b91b4d diff --git a/eng/Versions.props b/eng/Versions.props index 69307f5d4ee..d430cfbb4c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25575.1 - 11.0.0-beta.25575.1 - 11.0.0-beta.25575.1 + 11.0.0-beta.25578.1 + 11.0.0-beta.25578.1 + 11.0.0-beta.25578.1 diff --git a/global.json b/global.json index 6aaa698bb48..3182b2733a6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25575.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25578.1", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } } From bb88bf574f6efd1a3a1636d6074dd653dff9e333 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Dec 2025 02:01:20 +0000 Subject: [PATCH 18/18] Update dependencies from https://github.com/dotnet/arcade build 20251201.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.25528.1 -> To Version 11.0.0-beta.25601.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1603d9ca98..40d33a4b0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,19 +4,19 @@ - + https://github.com/dotnet/arcade 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade 846929727a388f2b1fd3ccf21f67694f44b91b4d - + https://github.com/dotnet/arcade 846929727a388f2b1fd3ccf21f67694f44b91b4d diff --git a/eng/Versions.props b/eng/Versions.props index d430cfbb4c9..300967d1170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,9 +23,9 @@ - 11.0.0-beta.25578.1 - 11.0.0-beta.25578.1 - 11.0.0-beta.25578.1 + 11.0.0-beta.25601.2 + 11.0.0-beta.25601.2 + 11.0.0-beta.25601.2 diff --git a/global.json b/global.json index 3182b2733a6..17dde949c24 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "version": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25578.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25601.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5" } }