From 512bd5fbb11020a001f4fac3bffc28069569194a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Oct 2025 02:04:57 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20251020.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25513.2 -> To Version 10.0.0-beta.25520.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2c5ef89f26..5a5c21bc53 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -18,7 +18,7 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 - 10.0.0-beta.25513.2 + 10.0.0-beta.25520.2 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c1cb3c0db..bd2948c4a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,9 +44,9 @@ - + https://github.com/dotnet/arcade - e8ca69398033dd1eea35e9667bf857234465de2b + aa655f2234364a19ff75d99cbe0da4506eff7624 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/global.json b/global.json index fcfaa76410..123ce2143a 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From bdade7b9c8cb18e531c1702db785831c2b06ff6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Oct 2025 02:06:03 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20251022.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25513.2 -> To Version 10.0.0-beta.25522.2 --- eng/Version.Details.props | 20 ++++++++++++++++++- eng/Version.Details.xml | 4 ++-- .../steps/install-microbuild.yml | 15 +++++++------- global.json | 2 +- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5a5c21bc53..3fca21427b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -17,8 +17,17 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 9.0.0 + + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 + 5.0.0-2.25480.7 - 10.0.0-beta.25520.2 + 10.0.0-beta.25522.2 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 @@ -40,6 +49,15 @@ This file should be imported by eng/Versions.props $(SystemDiagnosticsDiagnosticSourcePackageVersion) $(SystemReflectionMetadataPackageVersion) $(SystemThreadingTasksDataflowPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisCompilersPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisEditorFeaturesPackageVersion) + $(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion) + $(MicrosoftCodeAnalysisFeaturesPackageVersion) + $(MicrosoftVisualStudioLanguageServicesPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f53cb92ce..7694581fb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - aa655f2234364a19ff75d99cbe0da4506eff7624 + 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d6b9878f54..f2248ebfd7 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -11,23 +11,22 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true - # Location of the MicroBuild output folder - # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. - microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. + # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj + # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. + installationPath: $(Agent.TempDirectory)/.dotnet-microbuild condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -65,7 +64,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -85,7 +84,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc env: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/global.json b/global.json index 123ce2143a..96b0d41e31 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25522.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 8bd5fa37766a1bf13262bcc409d3a8532fd7d656 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Nov 2025 02:04:53 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20251031.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25513.2 -> To Version 10.0.0-beta.25531.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- eng/common/SetupNugetSources.ps1 | 17 +++++++++++++++-- eng/common/SetupNugetSources.sh | 17 +++++++++++++++-- global.json | 2 +- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3fca21427b..f1a32c8016 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props 5.0.0-2.25480.7 5.0.0-2.25480.7 - 10.0.0-beta.25522.2 + 10.0.0-beta.25531.2 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7694581fb2..e37de8842d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 63eed293471985f6fc4a60fd8b6f8f5ce3d03f38 + fb1799f60d1cbae6ef22fa0bcd694d9e16f7767a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014..65ed3a8ade 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,6 +1,7 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) { } } +# Check for dotnet-eng and add dotnet-eng-internal if present +$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']") +if ($dotnetEngSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + +# Check for dotnet-tools and add dotnet-tools-internal if present +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b97cc53637..b2163abbe7 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do fi done +# Check for dotnet-eng and add dotnet-eng-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix" +fi + +# Check for dotnet-tools and add dotnet-tools-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix" +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index 96b0d41e31..bd82bcfa5b 100644 --- a/global.json +++ b/global.json @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25522.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } }