From 89702985e40f945931375afc98a7e04a46309d14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 19:52:26 -0800 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 (#96779) Microsoft.DotNet.ApiCompat , 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.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.24059.5 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 + eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 32 ++++---- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- .../post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- .../post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 4 +- .../templates/post-build/common-variables.yml | 2 +- .../templates/post-build/post-build.yml | 4 +- global.json | 10 +-- 13 files changed, 72 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a702182748cb9..74e7c1411d8a85 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,8 @@ + + 7.0.100-rc.1.22402.1 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 2.5.1-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 - 7.0.0-beta.23564.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 2.5.1-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 + 7.0.0-beta.24059.5 6.0.0-preview.1.102 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e7641341b16..8fda30bdce2b09 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2e75ac..c305ae6bd771ef 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d957922a653..49938f0c89f768 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d77640e..1e779fec4dd1ea 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518ac5850..ac9a95778fcd9e 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac55ecf4..11c345c581c3f4 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f70ce6d..4ff83a5362bad3 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd97001734b..b504fe55cb8076 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65e9cd1..7b989985b0e0a2 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index 48c66d9338e0a0..223f57447ef3e0 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.113", + "version": "7.0.115", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.113" + "dotnet": "7.0.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23564.5", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24059.5", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6" From b04063ac114b7c15a774a1441fa2bf96945765fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 19:52:59 -0800 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/xharness build 20240104.3 (#96782) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 7.0.0-prerelease.23455.3 -> To Version 7.0.0-prerelease.24054.3 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index abd16ce0b962df..4e9bf50bac04a7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "7.0.0-prerelease.23455.3", + "version": "7.0.0-prerelease.24054.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18b60598348613..f3527efef6b90c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,17 +246,17 @@ https://github.com/dotnet/linker 53b3303c57b3fe659500fb362a0eef12991c1197 - + https://github.com/dotnet/xharness - dc8fda8988583416f2c76a75d19ad35c583c9eb6 + d4bda077bfbe30e25c4569591e8c5c6221e24cc0 - + https://github.com/dotnet/xharness - dc8fda8988583416f2c76a75d19ad35c583c9eb6 + d4bda077bfbe30e25c4569591e8c5c6221e24cc0 - + https://github.com/dotnet/xharness - dc8fda8988583416f2c76a75d19ad35c583c9eb6 + d4bda077bfbe30e25c4569591e8c5c6221e24cc0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1fdf59ce817e05..0d9e28a90a17b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,9 +154,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 7.0.0-prerelease.23455.3 - 7.0.0-prerelease.23455.3 - 7.0.0-prerelease.23455.3 + 7.0.0-prerelease.24054.3 + 7.0.0-prerelease.24054.3 + 7.0.0-prerelease.24054.3 7.0.0-alpha.0.23566.1 2.4.2 1.0.0 From 01387a5edb56147c6098d91f93874e1a46e4ae42 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:26:40 -0800 Subject: [PATCH 3/3] Update branding to 7.0.17 (#98057) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 625e7058506c9e..ce588cb6a1cf9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.16 + 7.0.17 7 0 - 16 + 17 7.0.100 6.0.$([MSBuild]::Add($(PatchVersion), 11)) servicing