From bbe185f58bf8bfc60ad3bd60e7fa3876decdea0f Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 3 Jan 2024 16:06:37 +0100 Subject: [PATCH] [automated] Merge branch 'vs17.9' => 'main' (#9577) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840417 (#9566) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8840161 * Update dependencies from https://github.com/dotnet/arcade build 20231220.2 (#9574) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23580.1 -> To Version 8.0.0-beta.23620.2 Co-authored-by: dotnet-maestro[bot] * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9575) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 NuGet.Build.Tasks From Version 6.9.0-preview.1.64 -> To Version 6.9.0-preview.1.67 * Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23615.7 -> To Version 4.9.0-3.23621.4 --------- Co-authored-by: dotnet-maestro[bot] * [vs17.9] Update dependencies from nuget/nuget.client dotnet/roslyn (#9580) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 NuGet.Build.Tasks From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.70 * Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23629.3 --------- Co-authored-by: dotnet-maestro[bot] --------- Co-authored-by: dotnet bot Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jan Krivanek --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 2 +- src/MSBuild/Resources/xlf/Strings.tr.xlf | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f5ec2009c7..66639e77bcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,9 +66,9 @@ - + https://github.com/dotnet/arcade - efc3da96e5ac110513e92ebd9ef87c73f44d8540 + 84129325171e65373edef24019e1171feeb19cbc @@ -76,18 +76,18 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/arcade - efc3da96e5ac110513e92ebd9ef87c73f44d8540 + 84129325171e65373edef24019e1171feeb19cbc diff --git a/eng/Versions.props b/eng/Versions.props index 2d1deca4e31..2a566e3b801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,11 +49,11 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.23580.1 + 8.0.0-beta.23620.2 7.0.0 6.0.0 - 4.9.0-3.23615.7 - 6.9.0-preview.1.64 + 4.9.0-3.23629.3 + 6.9.0-preview.1.70 6.0.0 8.0.0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a983c..e24ca2f46f9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,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 and(ne(parameters.artifacts.download, 'false'), 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 bb0d9f8b0f1..fa5446c093d 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: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d781..3f74abf7ce0 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' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,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 c4a5905f89c..7a891ce770e 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.1-2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23580.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2" } } diff --git a/src/MSBuild/Resources/xlf/Strings.tr.xlf b/src/MSBuild/Resources/xlf/Strings.tr.xlf index ac8963bfc96..b4b0d3b414f 100644 --- a/src/MSBuild/Resources/xlf/Strings.tr.xlf +++ b/src/MSBuild/Resources/xlf/Strings.tr.xlf @@ -79,7 +79,7 @@ ({0:F1}s) - ({0:F1}s) + ({0:F1} sn) {0}: duration in seconds with 1 decimal point