From 57c630e3f8bdcd6ecd36b4f1f7438e77a43f7f3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Oct 2025 02:22:28 +0000 Subject: [PATCH 1/5] Backflow from https://github.com/dotnet/dotnet / 3065a08 build 286257 [[ 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 f812c5598ba..797b191d642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 10.0.0-preview-20250930.1 + 10.0.0-preview-20251006.1 From c3ebdb7331f1aa99167358ec0790ff8f3f40a2b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Oct 2025 02:22:29 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/dotnet build 286257 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25507.102 -> 11.0.0-beta.25508.102) 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.1.25507.102 -> 10.0.0-rc.1.25508.102) --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- eng/common/core-templates/job/job.yml | 6 ++ .../steps/install-microbuild-impl.yml | 34 +++++++ .../steps/install-microbuild.yml | 62 +++++++------ eng/common/native/install-dependencies.sh | 2 + global.json | 4 +- 7 files changed, 146 insertions(+), 96 deletions(-) create mode 100644 eng/common/core-templates/steps/install-microbuild-impl.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f6e9e04dd95..18d09e29b3f 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.25507.102 - 11.0.0-beta.25507.102 - 11.0.0-beta.25507.102 - 11.0.0-beta.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 + 11.0.0-beta.25508.102 + 11.0.0-beta.25508.102 + 11.0.0-beta.25508.102 + 11.0.0-beta.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 - 10.0.0-rc.1.25507.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.102 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cef0e442bd0..b25ff420b68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d4a0a6c13e5c5b2faf06685125331de90a37943a + 3065a088c5e2cde99f1de2d208b8974927b54f2a diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 5ce51840619..cb4ccc023a3 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,8 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enablePreviewMicrobuild: false + microbuildPluginVersion: 'latest' enableMicrobuildForMacAndLinux: false microbuildUseESRP: true enablePublishBuildArtifacts: false @@ -128,6 +130,8 @@ jobs: - template: /eng/common/core-templates/steps/install-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} @@ -153,6 +157,8 @@ jobs: - template: /eng/common/core-templates/steps/cleanup-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml new file mode 100644 index 00000000000..9fdf3a11677 --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -0,0 +1,34 @@ +parameters: + - name: microbuildTaskInputs + type: object + default: {} + + - name: microbuildEnv + type: object + default: {} + + - name: enablePreviewMicrobuild + type: boolean + default: false + + - name: condition + type: string + + - name: continueOnError + type: boolean + +steps: +- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: + - task: MicroBuildSigningPluginPreview@4 + displayName: Install Preview MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} +- ${{ else }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (Windows) + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d6b9878f54d..bdebec0eaa9 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,6 +4,8 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Enable preview version of MB signing plugin + enablePreviewMicrobuild: false # Determines whether the ESRP service connection information should be passed to the signing plugin. # This overlaps with _SignType to some degree. We only need the service connection for real signing. # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. @@ -14,6 +16,8 @@ parameters: # 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' continueOnError: false @@ -51,41 +55,45 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (non-Windows) - inputs: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: - ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc - env: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + microbuildEnv: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + microbuildEnv: + TeamName: $(_TeamName) + 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/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 477a44f335b..f7bd4af0c8d 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -30,6 +30,8 @@ case "$os" in elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; 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 + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio else diff --git a/global.json b/global.json index 22a98c65976..6456cccf42b 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25507.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25507.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25508.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 58bcf255a95d6333b188f129266893b50a39aef2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Oct 2025 02:18:07 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/dotnet build 286279 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25508.102 -> 11.0.0-beta.25508.109) 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.1.25508.102 -> 10.0.0-rc.1.25508.109) --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 18d09e29b3f..0322122b3b8 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.25508.102 - 11.0.0-beta.25508.102 - 11.0.0-beta.25508.102 - 11.0.0-beta.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 + 11.0.0-beta.25508.109 + 11.0.0-beta.25508.109 + 11.0.0-beta.25508.109 + 11.0.0-beta.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 - 10.0.0-rc.1.25508.102 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25508.109 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b25ff420b68..54f4c7e6d3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 3065a088c5e2cde99f1de2d208b8974927b54f2a + 64d877a07af8c020fe9da6e721bc2258894f31ee diff --git a/global.json b/global.json index 6456cccf42b..80b0fd07a20 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.102", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25508.102", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.109", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25508.109", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From a8424c7bc8e25b1223d177c74a2c416d33798419 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Oct 2025 02:10:08 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/dotnet build 286548 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25508.109 -> 11.0.0-beta.25510.104) 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.1.25508.109 -> 10.0.0-rc.1.25510.104) --- eng/Version.Details.props | 44 ++++---- eng/Version.Details.xml | 90 ++++++++-------- eng/common/SetupNugetSources.ps1 | 71 +++++++------ eng/common/SetupNugetSources.sh | 175 ++++++++++++++++++------------- global.json | 4 +- 5 files changed, 210 insertions(+), 174 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0322122b3b8..b12a2915767 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.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 11.0.0-beta.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 11.0.0-beta.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 - 10.0.0-rc.1.25508.109 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25510.104 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54f4c7e6d3e..7744c7bdf7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 64d877a07af8c020fe9da6e721bc2258894f31ee + d40fabf069b5e6cecdd09e392788560f08137de1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 9445c314325..fc8d618014e 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +# Adds or enables the package source with the given name +function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { + AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password + } +} + # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { + Write-Host "Adding package source $SourceName" + $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) { return; } + Write-Host "Inserting credential for feed: " $source + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd +# Enable all darc-int package sources. +function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. +function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { + $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") + if ($DisabledPackageSource) { + Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) + + AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password + return $true } + return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 } $creds = $null +$feedSuffix = "v3/index.json" if ($Password) { + $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -138,33 +154,22 @@ if ($Password) { } } +$userName = "dn-bot" + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ddf4efc81a4..dd2564aef01 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,78 +52,126 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. +EnableInternalPackageSource() { + local PackageSourceName="$1" + + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return 1 # No disabled sources section + fi + + # Check if this source name is disabled + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Enabling internal source '$PackageSourceName'." + # Remove the disabled entry + local OldDisableValue="" + local NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + + # Add the source name to PackageSources for credential handling + PackageSources+=("$PackageSourceName") + return 0 # Found and enabled + fi + + return 1 # Not found in disabled sources +} + +# Add source entry to PackageSources +AddPackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Check if source already exists + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Package source $SourceName already present and enabled." + PackageSources+=("$SourceName") + return + fi + + echo "Adding package source $SourceName" + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" + PackageSources+=("$SourceName") +} + +# Adds or enables the package source with the given name +AddOrEnablePackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Try to enable if disabled, if not found then add new source + EnableInternalPackageSource "$SourceName" + if [ "$?" != "0" ]; then + AddPackageSource "$SourceName" "$SourceEndPoint" + fi +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi +# Enable all darc-int package sources +EnableMaestroInternalPackageSources() { + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return # No disabled sources section + fi + + # Find all darc-int disabled sources + local DisabledDarcIntSources=() + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') + + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]]; then + EnableInternalPackageSource "$DisabledSourceName" + fi + done +} -# Ensure there is a ... section. -grep -i "" $ConfigFile +# Ensure there is a ... section. +grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') +fi + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +grep -i "" $ConfigFile > /dev/null +if [ "$?" == "0" ]; then + echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnableMaestroInternalPackageSources fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" fi done @@ -139,29 +187,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/global.json b/global.json index 80b0fd07a20..03fe52ca2ec 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.109", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25508.109", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25510.104", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25510.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 5fedef770c0f40a96241a4d0f2d350fae99e6756 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Oct 2025 02:09:21 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/dotnet build 286642 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25510.104 -> 11.0.0-beta.25511.101) 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.1.25510.104 -> 10.0.0-rc.1.25511.101) --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b12a2915767..4c556233691 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.25510.104 - 11.0.0-beta.25510.104 - 11.0.0-beta.25510.104 - 11.0.0-beta.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 11.0.0-beta.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 - 10.0.0-rc.1.25510.104 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 + 10.0.0-rc.1.25511.101 10.0.0-rc.1.25507.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7744c7bdf7b..e776f59148e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 429bc7133c19cfc7bca6dc56320bb1fe764d7a62 - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d40fabf069b5e6cecdd09e392788560f08137de1 + d83adcf8c5e53bf0efddf55db66e2b5a04f3d8de diff --git a/global.json b/global.json index 03fe52ca2ec..9714d896ce5 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25510.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25510.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25511.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25511.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {