From 6233e582a5633d75e34da806534ee4c25605c7e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 May 2025 02:03:23 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250521.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25255.5 -> To Version 9.0.0-beta.25271.1 --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 10 ++--- 4 files changed, 71 insertions(+), 63 deletions(-) diff --git a/NuGet.config b/NuGet.config index dc9b04397c0e58..99a10550f65456 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,14 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ebed22f624f53..e9ed0bf181237f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 5e21f691093804fcd40096109c51a96334ac38cc - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fb22d7fb23bacf..fd7b9c48253446 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.107 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 2.9.0-beta.25255.5 - 9.0.0-beta.25255.5 - 2.9.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 2.9.0-beta.25271.1 + 9.0.0-beta.25271.1 + 2.9.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 1.4.0 diff --git a/global.json b/global.json index c2eefc4a16603b..eb60db1efab773 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.105", + "version": "9.0.106", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.105" + "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25255.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25271.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 14f5b300f9faf317e3b00a6312da25a946798fbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Jun 2025 02:03:37 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20250602.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25255.5 -> To Version 9.0.0-beta.25302.2 --- NuGet.config | 9 -- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 32 +++---- .../core-templates/post-build/post-build.yml | 6 ++ eng/common/post-build/publish-using-darc.ps1 | 7 +- global.json | 6 +- 6 files changed, 73 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99a10550f65456..dca17c85f5856a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,15 +9,6 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9ed0bf181237f..df0d7fdc5fb899 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 5e21f691093804fcd40096109c51a96334ac38cc - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fd7b9c48253446..178443f2baf279 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.107 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 2.9.0-beta.25271.1 - 9.0.0-beta.25271.1 - 2.9.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 2.9.0-beta.25302.2 + 9.0.0-beta.25302.2 + 2.9.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 1.4.0 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 454fd75c7aff19..a8c0bd3b9214e5 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -44,6 +44,11 @@ parameters: displayName: Publish installers and checksums type: boolean default: true + + - name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false - name: SDLValidationParameters type: object @@ -312,5 +317,6 @@ stages: -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true + -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 90b58e32a87bfb..a261517ef90679 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,7 +5,8 @@ param( [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, + [Parameter(Mandatory=$false)][string] $RequireDefaultChannels ) try { @@ -33,6 +34,10 @@ try { if ("false" -eq $WaitPublishingFinish) { $optionalParams.Add("--no-wait") | Out-Null } + + if ("true" -eq $RequireDefaultChannels) { + $optionalParams.Add("--default-channels-required") | Out-Null + } & $darc add-build-to-channel ` --id $buildId ` diff --git a/global.json b/global.json index eb60db1efab773..e7a948a8c83a06 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25302.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"