From ae34219a18d049bbca1c850d09b894f45943ba5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Nov 2025 02:08:56 +0000 Subject: [PATCH 1/3] Backflow from https://github.com/dotnet/dotnet / 77ee357 build 289869 [[ commit created by automation ]] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 797b191d642..6240667c287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 0 0 rc - 1 + 3 $(MajorVersion).$(MinorVersion).$(PatchVersion) 15.9.20 15.9.20 - 11.0.0-beta.25555.103 - 11.0.0-beta.25555.103 - 11.0.0-beta.25555.103 - 11.0.0-beta.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 - 10.0.0-rc.1.25555.103 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 - 10.0.0-rc.1.25552.1 + 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69a730f4c5b..32cd971cf5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - fbf3653d46ee940938937f6d8ad095e7aacbd921 + 6ae9d774864ecf3dde943c58647257f250505fd9 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 54c879632fdf0197d517d80e4b90861e2bd5d03e + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 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/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 272a919ffee..2f251e2a88a 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25555.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25556.111", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From aaf129bdce923f1f8dad8cbf527751bd7d3cf424 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Nov 2025 02:12:40 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/dotnet build 290335 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25556.111 -> 11.0.0-beta.25560.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.3.25556.111 -> 10.0.0-rc.3.25560.108) --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../job/publish-build-assets.yml | 6 +- .../core-templates/post-build/post-build.yml | 2 +- .../core-templates/steps/publish-logs.yml | 4 +- .../steps/source-index-stage1-publish.yml | 4 +- eng/common/native/install-dependencies.sh | 2 +- global.json | 4 +- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0650d8ac955..26a059a4094 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25556.111 - 11.0.0-beta.25556.111 - 11.0.0-beta.25556.111 - 11.0.0-beta.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 + 11.0.0-beta.25560.108 + 11.0.0-beta.25560.108 + 11.0.0-beta.25560.108 + 11.0.0-beta.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 - 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 + 10.0.0-rc.3.25560.108 10.0.0-rc.1.25513.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32cd971cf5d..c2923dcbfc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6ae9d774864ecf3dde943c58647257f250505fd9 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 77ee357638bcd8fa66a1c16fa588dcd5818068d2 + 02022b2fe7037ef7a4af4b899c6d2c2353f94196 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/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/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index f7bd4af0c8d..64b87d0bcc3 100755 --- 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 2f251e2a88a..7d5806bb891 100644 --- a/global.json +++ b/global.json @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25556.111", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25560.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25560.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {