From 5b8028b8f468d74fa6a61f5b7f01c90c6e93f4b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Sep 2025 02:11:29 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/dotnet build 285151 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25476.103 -> 11.0.0-beta.25479.108) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25476.103 -> 10.0.0-rc.1.25479.108) --- 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 86cd2e84427..d1365306ec5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 11.0.0-beta.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 + 11.0.0-beta.25479.108 + 11.0.0-beta.25479.108 + 11.0.0-beta.25479.108 + 11.0.0-beta.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 - 10.0.0-rc.1.25476.103 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25479.108 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c576955de..9ad4e403322 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - f4b7bd12733f53a99cb8dd2564c77e2e6f10a05d + 6befeceeaece5c9cb9730878aeaf4667f7c29b70 diff --git a/global.json b/global.json index 0f18677b8bb..78e0caa3476 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25476.103", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25476.103", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25479.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25479.108", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 769ac306be27a1ea48a89c3f5d0ca110f199103d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Oct 2025 02:13:35 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 285219 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25479.108 -> 11.0.0-beta.25480.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.25479.108 -> 10.0.0-rc.1.25480.105) --- eng/Version.Details.props | 44 +++++----- eng/Version.Details.xml | 90 ++++++++++---------- eng/common/build.sh | 2 +- eng/common/darc-init.sh | 2 +- eng/common/dotnet-install.sh | 2 +- eng/common/dotnet.sh | 2 +- eng/common/internal-feed-operations.sh | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 +- global.json | 4 +- 11 files changed, 78 insertions(+), 78 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d1365306ec5..6f9449eeb4d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25479.108 - 11.0.0-beta.25479.108 - 11.0.0-beta.25479.108 - 11.0.0-beta.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 11.0.0-beta.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 - 10.0.0-rc.1.25479.108 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 + 10.0.0-rc.1.25480.105 10.0.0-rc.1.25466.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ad4e403322..eba3b824709 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 3567f4b428acc1a49fda38d150415482cc916dd8 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 6befeceeaece5c9cb9730878aeaf4667f7c29b70 + 1be39deac0ebffe1635a70f2b24f454e850f7638 diff --git a/eng/common/build.sh b/eng/common/build.sh index 9767bb411a4..ec3e80d189e 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -92,7 +92,7 @@ runtime_source_feed='' runtime_source_feed_key='' properties=() -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in -help|-h) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index e889f439b8d..9f5ad6b763b 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -5,7 +5,7 @@ darcVersion='' versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --darcversion) diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7b9d97e3bd4..61f302bb677 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -18,7 +18,7 @@ architecture='' runtime='dotnet' runtimeSourceFeed='' runtimeSourceFeedKey='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in -version|-v) diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh index 2ef68235675..f6d24871c1d 100755 --- a/eng/common/dotnet.sh +++ b/eng/common/dotnet.sh @@ -19,7 +19,7 @@ source $scriptroot/tools.sh InitializeDotNetCli true # install # Invoke acquired SDK with args if they are provided -if [[ $# > 0 ]]; then +if [[ $# -gt 0 ]]; then __dotnetDir=${_InitializeDotNetCli} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9378223ba09..6299e7effd4 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -100,7 +100,7 @@ operation='' authToken='' repoName='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --operation) diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a938..ac5c69ffcac 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b62e132d32a..4655af7a2d8 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -68,7 +68,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 06b44de7870..4bc50bd568c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 + $defaultXCopyMSBuildVersion = '17.14.16' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 78e0caa3476..d4676d4736b 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25479.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25479.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25480.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25480.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {