From 27b82f60a76f1b3692d628838d42a786fe40b70f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 12:30:20 +0530 Subject: [PATCH 01/33] [release/10.0] Source code updates from dotnet/dotnet (#11052) * Update dependencies from https://github.com/dotnet/dotnet build 279432 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25411.109 -> 10.0.0-beta.25414.111) 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.25411.109 -> 10.0.0-rc.1.25414.111) * Backflow from https://github.com/dotnet/dotnet / a01724d build 279606 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 279606 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25414.111 -> 10.0.0-beta.25416.105) 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.25414.111 -> 10.0.0-rc.2.25416.105) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- eng/Versions.props | 2 +- global.json | 8 ++-- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2c23d8cc4c5..f1d74bfb0ed 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-beta.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 + 10.0.0-beta.25416.105 + 10.0.0-beta.25416.105 + 10.0.0-beta.25416.105 + 10.0.0-beta.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 - 10.0.0-rc.1.25411.109 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.105 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93c897a685f..33446084584 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,100 @@ - + - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + a01724db6d16445177cb31c6f300d38b0af06290 diff --git a/eng/Versions.props b/eng/Versions.props index b4e81997d15..fb43dbd7c82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 0 0 rc - 1 + 2 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 10.0.0-beta.25416.105 - 10.0.0-beta.25416.105 - 10.0.0-beta.25416.105 - 10.0.0-beta.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 - 10.0.0-rc.2.25416.105 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33446084584..e10f8c523c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,100 @@ - + - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index da30e67bc34..f614d1440ed 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -53,10 +53,8 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b..fa1cdc2b300 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d4cfd9ccd80..4920464cc4a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -544,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -552,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host 'Downloading vswhere $vswhereVersion' + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) diff --git a/global.json b/global.json index 40728c6c2a9..8e1ec97bdbf 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 11a70b5cff23a19454ec694e7bd0e55a8c702161 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:35:11 +0530 Subject: [PATCH 03/33] Update dependencies from https://github.com/dotnet/dotnet build 280198 (#11067) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.109 -> 10.0.0-beta.25420.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.2.25416.109 -> 10.0.0-rc.2.25420.109) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 6 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 10 ++- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild.yml | 41 ++++++--- .../core-templates/steps/publish-logs.yml | 14 +-- .../steps/source-index-stage1-publish.yml | 2 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 4 +- 21 files changed, 140 insertions(+), 123 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6ff1c154d4b..39907f0bc1e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-beta.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-beta.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 - 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25420.109 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e10f8c523c7..4990994bf73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,100 @@ - + - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + 619d5633513d1b31c528db4360833fce52f51829 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2..792b60b49d4 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b032..facb415ca6f 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index d9013251542..5ce51840619 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -163,7 +163,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -174,7 +174,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -218,7 +218,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8bf7d23355b..c5788829a87 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: CopyFiles@2 displayName: Copy LocProject.json inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' Contents: 'LocProject.json' TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d5303229c97..348cd16376f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -38,6 +38,8 @@ parameters: # Optional: A minimatch pattern for the asset manifests to publish to BAR assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -78,7 +80,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -117,7 +119,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} @@ -137,7 +139,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -177,7 +179,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 693b00b3704..dbc14ac580a 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -24,7 +24,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 2f992b2c6ec..b637cb6e948 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -114,3 +115,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a151fd811e3..f6f87fe5c67 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -154,7 +154,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -208,7 +208,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -258,7 +258,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -313,7 +313,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe..a7abd58c4bb 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3..4085512b690 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 44a9636cdff..c05f6502797 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 10.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f614d1440ed..d6b9878f54d 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -12,6 +12,7 @@ parameters: # 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 @@ -46,8 +47,12 @@ steps: displayName: 'Validate ESRP usage (Non-Windows)' condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + # Two different MB install steps. This is due to not being able to use the agent OS during + # 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 + displayName: Install MicroBuild plugin (Windows) inputs: signType: $(_SignType) zipSources: false @@ -63,16 +68,24 @@ steps: MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - 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) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-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: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + 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/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index de24d0087c5..10f825e270a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # 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 '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -44,7 +44,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() 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 c2917c1efc1..75600735f17 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -20,7 +20,7 @@ steps: # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: "Source Index: Process Binlog into indexable sln" - ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0b..4bf4cf41bd7 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a8a94328745..92a0664f564 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b..f1311bbb1b3 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7cbf668c22b..238fa0818f7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -77,7 +77,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index 8e1ec97bdbf..913b46af543 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From e26cd3e6156ae061dc5e076fcdce3a4caab3beb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:09:24 +0530 Subject: [PATCH 04/33] [release/10.0] Source code updates from dotnet/dotnet (#11076) * Update dependencies from https://github.com/dotnet/dotnet build 281059 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25420.109 -> 10.0.0-beta.25426.115) 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.2.25420.109 -> 10.0.0-rc.2.25426.115) * Update dependencies from https://github.com/dotnet/dotnet build 281128 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25426.115 -> 10.0.0-beta.25427.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.2.25426.115 -> 10.0.0-rc.2.25427.104) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 45 +++++----- eng/Version.Details.xml | 90 +++++++++---------- .../steps/source-index-stage1-publish.yml | 4 +- eng/common/sdk-task.ps1 | 3 +- eng/common/sdk-task.sh | 7 +- eng/common/tools.ps1 | 2 +- global.json | 8 +- 7 files changed, 82 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 39907f0bc1e..c2b20eb0307 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.0-beta.25420.109 - 10.0.0-beta.25420.109 - 10.0.0-beta.25420.109 - 10.0.0-beta.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 + 10.0.0-beta.25427.104 + 10.0.0-beta.25427.104 + 10.0.0-beta.25427.104 + 10.0.0-beta.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 - 10.0.0-rc.2.25420.109 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25427.104 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4990994bf73..65cfb6b8cf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,100 @@ - + - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 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 75600735f17..e9a694afa58 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 + sourceIndexUploadPackageVersion: 2.0.0-20250818.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index a9d2a2d2699..b62e132d32a 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -7,13 +7,14 @@ Param( [switch] $restore, [switch] $prepareMachine, [switch][Alias('nobl')]$excludeCIBinaryLog, + [switch]$noWarnAsError, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) $ci = $true $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } -$warnAsError = $true +$warnAsError = if ($noWarnAsError) { $false } else { $true } . $PSScriptRoot\tools.ps1 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 2f83adc0269..0c92f81d74f 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,6 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --noWarnAsError Do not warn as error echo "" echo "Command line arguments not listed above are passed thru to msbuild." } @@ -52,6 +53,7 @@ exclude_ci_binary_log=false restore=false help=false properties='' +warnAsError=true while (($# > 0)); do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" @@ -73,6 +75,10 @@ while (($# > 0)); do exclude_ci_binary_log=true shift 1 ;; + --noWarnAsError) + warnAsError=false + shift 1 + ;; --help) help=true shift 1 @@ -85,7 +91,6 @@ while (($# > 0)); do done ci=true -warnAsError=true if $help; then show_usage diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4920464cc4a..06b44de7870 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere $vswhereVersion' + Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe diff --git a/global.json b/global.json index 913b46af543..86697d21eb3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25411.109", + "version": "10.0.100-rc.1.25420.111", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25411.109", + "dotnet": "10.0.100-rc.1.25420.111", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 2d0963f7069d49711f98d1ac43dc6e529c5ec3bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 14:34:15 +0530 Subject: [PATCH 05/33] [release/10.0] Source code updates from dotnet/dotnet (#11089) * Backflow from https://github.com/dotnet/dotnet / 9eb0ecd build 282024 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 282024 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25427.104 -> 10.0.0-beta.25454.105) 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.2.25427.104 -> 10.0.0-rc.2.25454.105) Added Dependencies: Microsoft.Build.Framework, Microsoft.Build.Utilities.Core (Version 15.9.20) --------- Co-authored-by: dotnet-maestro[bot] --- build.sh | 2 +- eng/Build.props | 9 ++ eng/Tools.props | 2 +- eng/Version.Details.props | 48 ++++----- eng/Version.Details.xml | 98 ++++++++++--------- eng/Versions.props | 2 - eng/WpfArcadeSdk/tools/ApiCompat.targets | 1 + eng/common/sdk-task.sh | 2 +- global.json | 4 +- ....NET.Sdk.WindowsDesktop.ArchNeutral.csproj | 4 + .../PresentationBuildTasks.csproj | 9 +- 11 files changed, 103 insertions(+), 78 deletions(-) create mode 100644 eng/Build.props diff --git a/build.sh b/build.sh index 8477d5af881..84a7478bfa5 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --build --restore $@ +"$scriptroot/eng/common/build.sh" --restore --build $@ diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 00000000000..25dd1f9d38b --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/eng/Tools.props b/eng/Tools.props index 6d65666f935..e8cd72a378c 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -6,7 +6,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c2b20eb0307..c5f5e2770d8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,36 +6,40 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 + 15.9.20 + 15.9.20 + 10.0.0-beta.25454.105 + 10.0.0-beta.25454.105 + 10.0.0-beta.25454.105 + 10.0.0-beta.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25454.105 10.0.0-preview.7.25317.2 + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetCodeAnalysisPackageVersion) $(MicrosoftDotNetGenAPIPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65cfb6b8cf8..601155c2241 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,100 +1,108 @@ - + - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad diff --git a/eng/Versions.props b/eng/Versions.props index fb43dbd7c82..867daa06058 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,6 @@ - 15.9.20 - 15.9.20 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 0feda021e68..dd20b37919b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,7 @@  net472;net10.0 + false true @@ -121,11 +122,11 @@ WindowsBase\MS\Internal\IO\Packaging\CompoundFile\ContainerUtilities.cs - - PresentationCore\MS\Internal\Media\XamlSerializationHelper.cs + + PresentationCore\MS\internal\Media\XamlSerializationHelper.cs - - PresentationCore\MS\Internal\Media\ParserStreamGeometryContext.cs + + PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs PresentationCore\System\Windows\Media\StreamGeometryContext.cs From c6201c924f0909e851e267d9560fade1d29750ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 11:06:29 +0530 Subject: [PATCH 06/33] [release/10.0] Source code updates from dotnet/dotnet (#11092) * Update dependencies from https://github.com/dotnet/dotnet build 282086 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25454.105 -> 10.0.0-beta.25454.107) 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.2.25454.105 -> 10.0.0-rc.2.25454.107) * Update dependencies from https://github.com/dotnet/dotnet build 282207 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25454.107 -> 10.0.0-beta.25456.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.2.25454.107 -> 10.0.0-rc.2.25456.101) * Update dependencies from https://github.com/dotnet/dotnet build 282240 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25456.101 -> 10.0.0-beta.25457.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.2.25456.101 -> 10.0.0-rc.2.25457.102) --------- Co-authored-by: dotnet-maestro[bot] --- 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 c5f5e2770d8..19cb80f028c 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 - 10.0.0-beta.25454.105 - 10.0.0-beta.25454.105 - 10.0.0-beta.25454.105 - 10.0.0-beta.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 - 10.0.0-rc.2.25454.105 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 601155c2241..b59eceb3a05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 8ea69c337be69385ff7eb44b2a54db78010110d8 diff --git a/global.json b/global.json index 22a25420041..4e08eab1858 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25454.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25457.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 5cec7da1d2cbe77b9178eb41f8d07f60f6b35def Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:56:52 +0530 Subject: [PATCH 07/33] [release/10.0] Source code updates from dotnet/dotnet (#11098) * Update dependencies from https://github.com/dotnet/dotnet build 282379 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25457.102 -> 10.0.0-beta.25458.103) 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.2.25457.102 -> 10.0.0-rc.2.25458.103) * Update dependencies from https://github.com/dotnet/dotnet build 282477 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25458.103 -> 10.0.0-beta.25459.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.2.25458.103 -> 10.0.0-rc.2.25459.101) --------- Co-authored-by: dotnet-maestro[bot] --- 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 19cb80f028c..552503cada3 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 - 10.0.0-beta.25457.102 - 10.0.0-beta.25457.102 - 10.0.0-beta.25457.102 - 10.0.0-beta.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 + 10.0.0-beta.25459.101 + 10.0.0-beta.25459.101 + 10.0.0-beta.25459.101 + 10.0.0-beta.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 - 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25459.101 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b59eceb3a05..896624bb45c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 diff --git a/global.json b/global.json index 4e08eab1858..e90a147cb51 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25457.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25459.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25459.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 6c0be5f4e0a608208d242ded4f8496d6fede506d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:36:42 +0530 Subject: [PATCH 08/33] Update dependencies from https://github.com/dotnet/dotnet build 282708 (#11104) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25459.101 -> 10.0.0-beta.25460.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.2.25459.101 -> 10.0.0-rc.2.25460.104) Co-authored-by: dotnet-maestro[bot] --- 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 552503cada3..901df74b4ca 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 - 10.0.0-beta.25459.101 - 10.0.0-beta.25459.101 - 10.0.0-beta.25459.101 - 10.0.0-beta.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 + 10.0.0-beta.25460.104 + 10.0.0-beta.25460.104 + 10.0.0-beta.25460.104 + 10.0.0-beta.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 - 10.0.0-rc.2.25459.101 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25460.104 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 896624bb45c..10fb9af6fc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 diff --git a/global.json b/global.json index e90a147cb51..29063d51a32 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25459.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25459.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25460.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 1072f8c41a89b6bc4f4b602139b335131d165d6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 10:46:52 +0530 Subject: [PATCH 09/33] [release/10.0] Source code updates from dotnet/dotnet (#11114) * Update dependencies from https://github.com/dotnet/dotnet build 282973 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25460.104 -> 10.0.0-beta.25462.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.2.25460.104 -> 10.0.0-rc.2.25462.101) * Update dependencies from https://github.com/dotnet/dotnet build 283077 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25462.101 -> 10.0.0-beta.25462.117) 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.2.25462.101 -> 10.0.0-rc.2.25462.117) * Update dependencies from https://github.com/dotnet/dotnet build 283152 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25462.117 -> 10.0.0-beta.25464.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.2.25462.117 -> 10.0.0-rc.2.25464.104) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++++++-------- eng/Version.Details.xml | 90 ++++++++++++++++---------------- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 8 +-- 5 files changed, 73 insertions(+), 73 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 901df74b4ca..5bdd0806ba1 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 - 10.0.0-beta.25460.104 - 10.0.0-beta.25460.104 - 10.0.0-beta.25460.104 - 10.0.0-beta.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 + 10.0.0-beta.25464.104 + 10.0.0-beta.25464.104 + 10.0.0-beta.25464.104 + 10.0.0-beta.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 - 10.0.0-rc.2.25460.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25464.104 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10fb9af6fc7..e65a190e19d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 792b60b49d4..9445c314325 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) { 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 } -$dotnetVersions = @('5','6','7','8','9') +$dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index facb415ca6f..ddf4efc81a4 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8' '9') +DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index 29063d51a32..3b613e4be06 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25420.111", + "version": "10.0.100-rc.1.25451.107", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25420.111", + "dotnet": "10.0.100-rc.1.25451.107", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25460.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25464.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25464.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From ddf37e2d1b4feafade883a282989889310fa3fdf Mon Sep 17 00:00:00 2001 From: Harshit <62823486+harshit7962@users.noreply.github.com> Date: Thu, 18 Sep 2025 18:02:56 +0530 Subject: [PATCH 10/33] Bump up lang version to 14 (#11128) --- eng/WpfArcadeSdk/Sdk/Sdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index 44eefc48a09..7a6cf353782 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -15,7 +15,7 @@ $(WpfArcadeSdkToolsDir)GenXmlStringTable.pl preview - 12 + 14 true true From 5f7badbf99ee5bc487c8dc792679617755e47903 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 16:41:34 +0530 Subject: [PATCH 11/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250919.1 (#11131) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-preview.7.25317.2 -> To Version 10.0.0-rc.2.25469.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5bdd0806ba1..06bff3f444e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.2.25464.104 10.0.0-rc.2.25464.104 - 10.0.0-preview.7.25317.2 + 10.0.0-rc.2.25469.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e65a190e19d..47e6c005b83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 8a6c1d81657ef04c040f598cafacf8f5a33abda2 + 151a7f34cfb8040d28ffff62993bbc18dc56eea4 https://github.com/dotnet/dotnet From 1b3f72bf264a22509cee5143855e728897334bb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 10:49:58 +0530 Subject: [PATCH 12/33] [release/10.0] Source code updates from dotnet/dotnet (#11120) * Update dependencies from https://github.com/dotnet/dotnet build 283422 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25464.104 -> 10.0.0-beta.25466.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.2.25464.104 -> 10.0.0-rc.2.25466.101) * Update dependencies from https://github.com/dotnet/dotnet build 283666 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25466.101 -> 10.0.0-beta.25467.107) 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.2.25466.101 -> 10.0.0-rc.2.25467.107) * Update dependencies from https://github.com/dotnet/dotnet build 283828 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25467.107 -> 10.0.0-beta.25468.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.2.25467.107 -> 10.0.0-rc.2.25468.104) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++----- eng/Version.Details.xml | 90 +++++++++---------- .../job/publish-build-assets.yml | 9 +- eng/common/core-templates/jobs/jobs.yml | 2 + global.json | 4 +- 5 files changed, 79 insertions(+), 70 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 06bff3f444e..70eed811b96 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 - 10.0.0-beta.25464.104 - 10.0.0-beta.25464.104 - 10.0.0-beta.25464.104 - 10.0.0-beta.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 - 10.0.0-rc.2.25464.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 10.0.0-rc.2.25469.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47e6c005b83..19227e9bcab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 151a7f34cfb8040d28ffff62993bbc18dc56eea4 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 348cd16376f..37dff559fc1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -40,6 +40,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -62,6 +64,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -124,7 +131,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index b637cb6e948..01ada747665 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -116,3 +117,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index 3b613e4be06..3a41d697d9d 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25464.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25464.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From f74ad8648cada953c13403d3801203c30ea33bac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 14:51:00 +0530 Subject: [PATCH 13/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250922.2 (#11137) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.2.25469.1 -> To Version 10.0.0-rc.2.25472.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 70eed811b96..db8f175285b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.2.25468.104 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25469.1 + 10.0.0-rc.2.25472.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19227e9bcab..a5ee83dbc51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 151a7f34cfb8040d28ffff62993bbc18dc56eea4 + c27a59da6dc6255fb7552386dfde3eaf78636d7c https://github.com/dotnet/dotnet From a94c8eb81ba1e5ea9f6e282a717cd52270548589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:41:53 +0530 Subject: [PATCH 14/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250924.1 (#11143) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.2.25472.2 -> To Version 10.0.0-rc.2.25474.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index db8f175285b..f1cbccb6327 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.2.25468.104 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25472.2 + 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5ee83dbc51..8c0e20b87bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c27a59da6dc6255fb7552386dfde3eaf78636d7c + 544137fb099e0aa4864a49fcea9700e44897ab46 https://github.com/dotnet/dotnet From 5a022144926c9f81818ebd409b1e1f6a4a17209c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 10:41:19 +0530 Subject: [PATCH 15/33] [release/10.0] Source code updates from dotnet/dotnet (#11144) * Backflow from https://github.com/dotnet/dotnet / 537ecf8 build 284571 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284571 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) 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.2.25468.104 -> 10.0.0-rc.2.25473.111) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- eng/Versions.props | 2 +- global.json | 4 +- 5 files changed, 71 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 627e2878975..f70711a2ac0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f1cbccb6327..49dde91349c 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 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c0e20b87bc..5c7f7cc1f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd diff --git a/eng/Versions.props b/eng/Versions.props index 867daa06058..b69efb40745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 9.0.0-preview-20241010.1 + 10.0.0-preview-20250912.1 diff --git a/global.json b/global.json index 3a41d697d9d..cfb7e01f19e 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 4de53404a8f934447a8bdbbcc0f53e63e5a4f30c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 10:39:10 +0530 Subject: [PATCH 16/33] [release/10.0] Source code updates from dotnet/dotnet (#11153) * Backflow from https://github.com/dotnet/dotnet / 8aba88f build 285155 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 285155 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25473.111 -> 10.0.0-beta.25479.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.2.25473.111 -> 10.0.0-rtm.25479.109) * Update dependencies from https://github.com/dotnet/dotnet build 285185 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25479.109 -> 10.0.0-beta.25479.115) 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-rtm.25479.109 -> 10.0.0-rtm.25479.115) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++----- eng/Version.Details.xml | 90 ++++++++++---------- eng/Versions.props | 4 +- eng/common/post-build/nuget-verification.ps1 | 2 +- es-metadata.yml | 8 ++ global.json | 4 +- 6 files changed, 80 insertions(+), 72 deletions(-) create mode 100644 es-metadata.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 49dde91349c..9c35a9fe321 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 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c7f7cc1f51..c5e135a4008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 diff --git a/eng/Versions.props b/eng/Versions.props index b69efb40745..8a6e7ffea3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 10 0 0 - rc - 2 + rtm + $(MajorVersion).$(MinorVersion).$(PatchVersion) 15.9.20 15.9.20 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5e135a4008..8bfa0595329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 diff --git a/global.json b/global.json index 5727cb3b844..8f5e37d4c72 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0f94a4d9b5cd76521f2419d5cb52c43e17c2a60a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:29:10 +0530 Subject: [PATCH 18/33] [release/10.0] Source code updates from dotnet/dotnet (#11169) * Update dependencies from https://github.com/dotnet/dotnet build 286402 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25507.103 -> 10.0.0-beta.25509.106) 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-rtm.25507.103 -> 10.0.0-rtm.25509.106) * Update dependencies from https://github.com/dotnet/dotnet build 286525 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25509.106 -> 10.0.0-beta.25510.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-rtm.25509.106 -> 10.0.0-rtm.25510.102) * Update dependencies from https://github.com/dotnet/dotnet build 286611 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25510.102 -> 10.0.0-beta.25510.110) 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-rtm.25510.102 -> 10.0.0-rtm.25510.110) * Update dependencies from https://github.com/dotnet/dotnet build 286686 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25510.110 -> 10.0.0-beta.25512.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-rtm.25510.110 -> 10.0.0-rtm.25512.102) --------- Co-authored-by: dotnet-maestro[bot] --- 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 7fed837f27b..0068ab7bb5f 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 - 10.0.0-beta.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bfa0595329..418ddb064c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 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 8f5e37d4c72..6968ab7e58a 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25512.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0b4e4849644a0daa3fd2f167941ad29aed77463f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:50:52 +0530 Subject: [PATCH 19/33] Update dependencies from https://github.com/dotnet/dotnet build 286841 (#11172) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25512.102 -> 10.0.0-beta.25513.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-rtm.25512.102 -> 10.0.0-rtm.25513.102) Co-authored-by: dotnet-maestro[bot] --- 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 0068ab7bb5f..a601b08f1c1 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 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 418ddb064c4..dba107c74c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 diff --git a/global.json b/global.json index 6968ab7e58a..7d0d11b6c07 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 47f516ce923572c330977c6f6d38fc3935617646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:59:17 +0530 Subject: [PATCH 20/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251013.4 (#11175) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.2.25474.1 -> To Version 10.0.0-rtm.25513.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a601b08f1c1..e7912178d5b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rtm.25513.102 10.0.0-rtm.25513.102 - 10.0.0-rc.2.25474.1 + 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba107c74c4..fe4aceda477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 544137fb099e0aa4864a49fcea9700e44897ab46 + bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c https://github.com/dotnet/dotnet From 8409237906c778eeb16662b444a24b46a07a0976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 11:02:47 +0530 Subject: [PATCH 21/33] [release/10.0] Source code updates from dotnet/dotnet (#11189) * Update dependencies from https://github.com/dotnet/dotnet build 287070 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25513.102 -> 10.0.0-beta.25514.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25513.102 -> 10.0.0-rtm.25514.103) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25513.102 -> 10.0.0) * Backflow from https://github.com/dotnet/dotnet / 03ebd38 build 287340 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 287340 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25514.103 -> 10.0.0-beta.25515.107) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25514.103 -> 10.0.0-rtm.25515.107) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 ++ eng/Version.Details.props | 44 ++++++++-------- eng/Version.Details.xml | 90 ++++++++++++++++----------------- eng/Versions.props | 2 +- eng/common/SetupNugetSources.sh | 6 +-- global.json | 4 +- 6 files changed, 77 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index f70711a2ac0..41ae1d0f573 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,11 @@ + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e7912178d5b..e338109fb12 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 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-rtm.25515.107 + 10.0.0 + 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.107 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25515.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe4aceda477..3679aed3250 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e diff --git a/eng/Versions.props b/eng/Versions.props index 8a6e7ffea3e..13b5b13739e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 10.0.0-preview-20250912.1 + 10.0.0-preview-20251006.1 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef01..b97cc536379 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { 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" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/global.json b/global.json index 7d0d11b6c07..208f9327e6a 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 72ca82c7a0f57eb8d0168246468b9cc1a6c14a5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:54:37 +0530 Subject: [PATCH 22/33] Update dependencies from https://github.com/dotnet/dotnet build 287426 (#11197) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25515.107 -> 10.0.0-beta.25515.111) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25515.107 -> 10.0.0-rtm.25515.111) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41ae1d0f573..14630ed504a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e338109fb12..c7c6ecf631c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-rtm.25515.107 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-rtm.25515.111 10.0.0 - 10.0.0-rtm.25515.107 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 + 10.0.0-rtm.25515.111 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3679aed3250..acc1eb010e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 diff --git a/global.json b/global.json index 208f9327e6a..c80ba78e476 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 220d249248947f86cbc2728ab6ecb51efe7fe03d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 11:03:49 +0530 Subject: [PATCH 23/33] Update dependencies from https://github.com/dotnet/dotnet build 287966 (#11202) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25515.111 -> 10.0.0-beta.25520.117) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25515.111 -> 10.0.0-rtm.25520.117) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 8 ++--- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 14630ed504a..a694c0c0556 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c7c6ecf631c..583afddf162 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-beta.25515.111 - 10.0.0-rtm.25515.111 + 10.0.0-beta.25520.117 + 10.0.0-beta.25520.117 + 10.0.0-beta.25520.117 + 10.0.0-beta.25520.117 + 10.0.0-rtm.25520.117 10.0.0 - 10.0.0-rtm.25515.111 - 10.0.0-rtm.25515.111 + 10.0.0-rtm.25520.117 + 10.0.0-rtm.25520.117 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.111 + 10.0.0-rtm.25520.117 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acc1eb010e9..d98d369f9c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc - + https://github.com/dotnet/dotnet - 79c85d969a02abd06c2202949318fd4c21e5e7a0 + 50d79701f2d748e965fefb4ba42580368598b9cc diff --git a/global.json b/global.json index c80ba78e476..6bc254b899f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25451.107", + "version": "10.0.100-rc.2.25502.107", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25451.107", + "dotnet": "10.0.100-rc.2.25502.107", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.117", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.117", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 590ad3e85eacfcc82407ba51c709b4d75ccea1d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 10:41:19 +0530 Subject: [PATCH 24/33] [release/10.0] Source code updates from dotnet/dotnet (#11206) * Update dependencies from https://github.com/dotnet/dotnet build 288391 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25520.117 -> 10.0.0-beta.25523.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25520.117 -> 10.0.0-rtm.25523.108) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) * Update dependencies from https://github.com/dotnet/dotnet build 288435 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25523.108 -> 10.0.0-beta.25523.113) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25523.108 -> 10.0.0-rtm.25523.113) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index a694c0c0556..5fe5c106643 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 583afddf162..158917f2f1f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-beta.25520.117 - 10.0.0-rtm.25520.117 + 10.0.0-beta.25523.113 + 10.0.0-beta.25523.113 + 10.0.0-beta.25523.113 + 10.0.0-beta.25523.113 + 10.0.0-rtm.25523.113 10.0.0 - 10.0.0-rtm.25520.117 - 10.0.0-rtm.25520.117 + 10.0.0-rtm.25523.113 + 10.0.0-rtm.25523.113 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25520.117 + 10.0.0-rtm.25523.113 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d98d369f9c8..491b6e68cf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 - + https://github.com/dotnet/dotnet - 50d79701f2d748e965fefb4ba42580368598b9cc + 7b29526f2107416f68578bcb9deaca74fcfcf7f0 diff --git a/global.json b/global.json index 6bc254b899f..9284da383b3 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.117", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25520.117", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25523.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25523.113", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From a25aa3a76669d934ef77d7d9bfd257dcf093c0c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:14:17 +0530 Subject: [PATCH 25/33] Update dependencies from https://github.com/dotnet/dotnet build 288919 (#11217) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25523.113 -> 10.0.0-beta.25528.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25523.113 -> 10.0.0-rtm.25528.106) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0 -> 10.0.0) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5fe5c106643..fab67891b9b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 158917f2f1f..d683b147568 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25523.113 - 10.0.0-beta.25523.113 - 10.0.0-beta.25523.113 - 10.0.0-beta.25523.113 - 10.0.0-rtm.25523.113 + 10.0.0-beta.25528.106 + 10.0.0-beta.25528.106 + 10.0.0-beta.25528.106 + 10.0.0-beta.25528.106 + 10.0.0-rtm.25528.106 10.0.0 - 10.0.0-rtm.25523.113 - 10.0.0-rtm.25523.113 + 10.0.0-rtm.25528.106 + 10.0.0-rtm.25528.106 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25523.113 + 10.0.0-rtm.25528.106 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 491b6e68cf8..3bad8f963c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 - + https://github.com/dotnet/dotnet - 7b29526f2107416f68578bcb9deaca74fcfcf7f0 + bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 diff --git a/global.json b/global.json index 9284da383b3..864852ec757 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25523.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25523.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 3daa2ad9fdba14b14e2e7e4afa053b66e4d021da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 05:29:16 +0000 Subject: [PATCH 26/33] [release/10.0] Source code updates from dotnet/dotnet (#11219) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 16 ++--- eng/Version.Details.xml | 62 +++++++++---------- .../steps/install-microbuild.yml | 15 +++-- global.json | 4 +- 5 files changed, 49 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index fab67891b9b..60f6df8d9e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d683b147568..5f2809e1e16 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25528.106 - 10.0.0-beta.25528.106 - 10.0.0-beta.25528.106 - 10.0.0-beta.25528.106 - 10.0.0-rtm.25528.106 + 10.0.0-beta.25531.102 + 10.0.0-beta.25531.102 + 10.0.0-beta.25531.102 + 10.0.0-beta.25531.102 + 10.0.0-rtm.25531.102 10.0.0 - 10.0.0-rtm.25528.106 - 10.0.0-rtm.25528.106 + 10.0.0-rtm.25531.102 + 10.0.0-rtm.25531.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25528.106 + 10.0.0-rtm.25531.102 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bad8f963c4..240516014c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf - + https://github.com/dotnet/dotnet - bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05 + ba86126261026d26f7c30cd3434680d3965a88cf diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d6b9878f54d..f2248ebfd73 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 864852ec757..44742486f38 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25528.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 199a64ebeb98ce2249f9da8e2d5c41ee0e02e835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Nov 2025 02:03:51 +0000 Subject: [PATCH 27/33] Backflow from https://github.com/dotnet/dotnet / 8ee0cc0 build 289521 [[ commit created by automation ]] --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 13b5b13739e..fce8c20b774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 10 0 - 0 - rtm + 1 + servicing $(MajorVersion).$(MinorVersion).$(PatchVersion) - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5f2809e1e16..323b04871a2 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 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-rtm.25531.102 - 10.0.0 - 10.0.0-rtm.25531.102 - 10.0.0-rtm.25531.102 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.1-servicing.25554.104 + 10.0.1 + 10.0.1-servicing.25554.104 + 10.0.1-servicing.25554.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25531.102 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25554.104 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240516014c8..44c35591573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e..65ed3a8adef 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 b97cc536379..b2163abbe71 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 44742486f38..45e360802dd 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25554.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0b7181a78155201bf79f77f2fa804aa4d8093f2a Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 4 Nov 2025 20:34:11 -0800 Subject: [PATCH 29/33] Update branding to 10.0.1 (#11230) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 13b5b13739e..faf2531306e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ 10 0 - 0 + 1 rtm $(MajorVersion).$(MinorVersion).$(PatchVersion) From 31f3f9083b4aa233e6e2201b829ac5aeec732078 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 02:03:54 +0000 Subject: [PATCH 30/33] Update dependencies from https://github.com/dotnet/dotnet build 289695 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25554.104 -> 10.0.0-beta.25555.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.1-servicing.25554.104 -> 10.0.1-servicing.25555.106) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.1 -> 10.0.1) --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ae2a661548..a05f5acc818 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 323b04871a2..4c7447f0cf0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.1-servicing.25554.104 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.1-servicing.25555.106 10.0.1 - 10.0.1-servicing.25554.104 - 10.0.1-servicing.25554.104 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.1 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 10.0.1 - 10.0.1-servicing.25554.104 + 10.0.1-servicing.25555.106 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44c35591573..65bf4c4f81a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c diff --git a/global.json b/global.json index 45e360802dd..2cb053155eb 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25554.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0e03d81f7e3107763bf890e315f1e1d286143ba2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Nov 2025 10:41:42 +0530 Subject: [PATCH 31/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251105.1 (#11233) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rtm.25513.4 -> To Version 10.0.1-servicing.25555.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5f2809e1e16..7f0d5d80364 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 - 10.0.0-rtm.25513.4 + 10.0.1-servicing.25555.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240516014c8..cd1b888c016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet ba86126261026d26f7c30cd3434680d3965a88cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c + 9202df6550bd39e2af8d530a635d96ce070cd744 https://github.com/dotnet/dotnet From 756c6890f1118f2826c6d99a70da8f0d745d8cd2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Nov 2025 10:32:02 +0530 Subject: [PATCH 32/33] Remove auditSources from NuGet.config (#11243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The api.nuget.org source will clash with the CFSClean network isolation policy Co-authored-by: Alexander Köplinger --- NuGet.config | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60f6df8d9e2..ba7b1ea2962 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,9 +21,5 @@ - - - - From 40f5d516fc562e24365d8443f8e3394d008b2164 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 16 Nov 2025 20:55:40 +0530 Subject: [PATCH 33/33] [release/10.0] Source code updates from dotnet/dotnet (#11252) * Backflow from https://github.com/dotnet/dotnet / f4701e0 build 290631 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 290631 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25555.106 -> 10.0.0-beta.25562.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.1-servicing.25555.106 -> 10.0.1-servicing.25562.108) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.1 -> 10.0.1) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 16 ++--- eng/Version.Details.xml | 62 +++++++++---------- .../job/publish-build-assets.yml | 5 ++ .../core-templates/post-build/post-build.yml | 5 ++ global.json | 4 +- 6 files changed, 52 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40b8b4a67d7..3a15472df85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5ceddefda23..37789c36b87 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.0-beta.25555.106 - 10.0.1-servicing.25555.106 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.0-beta.25562.108 + 10.0.1-servicing.25562.108 10.0.1 - 10.0.1-servicing.25555.106 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25562.108 + 10.0.1-servicing.25562.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.1 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 10.0.1 - 10.0.1-servicing.25555.106 + 10.0.1-servicing.25562.108 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 442119f5472..fd6c9d18e11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d - + https://github.com/dotnet/dotnet - e17b0d08def649f30aed9c09cf4a2c5741a3c76c + f4701e048e6a684237a4b52b745e21b1d857278d diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1..e7daa6d2faf 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -180,6 +180,11 @@ jobs: 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 inputs: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c67..55361908c2e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,6 +307,11 @@ stages: - task: NuGetAuthenticate@1 + # 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 inputs: diff --git a/global.json b/global.json index 2cb053155eb..dd5d7927e1e 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25562.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25562.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {