From 7144c2f806788667a6810e87bbdb8748d0593968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Oct 2021 19:10:02 +0200 Subject: [PATCH] [main] Update dependencies from dnceng/internal/dotnet-optimization dotnet/arcade dotnet/roslyn-analyzers (#61004) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20211028.1 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21527.1 -> To Version 1.0.0-prerelease.21528.1 * Update dependencies from https://github.com/dotnet/arcade build 20211028.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 7.0.0-beta.21527.5 -> To Version 7.0.0-beta.21528.3 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211028.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21527.1 -> To Version 7.0.0-preview1.21528.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 96 ++++++++++++------------ eng/Versions.props | 40 +++++----- eng/common/templates/job/execute-sdl.yml | 6 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-index-stage1.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 +- global.json | 8 +- 7 files changed, 77 insertions(+), 81 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27b362f..9ff37b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd https://github.com/microsoft/vstest @@ -210,25 +210,25 @@ https://github.com/dotnet/xharness 0b28b2c062b000f5115cd3ee70e4777dd025b263 - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb436b5eaba891141a91e3d5772a26f8e29e0d33 + 192b56427754dc9ff4f34b7fc7039dfe6f37a4f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb436b5eaba891141a91e3d5772a26f8e29e0d33 + 192b56427754dc9ff4f34b7fc7039dfe6f37a4f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb436b5eaba891141a91e3d5772a26f8e29e0d33 + 192b56427754dc9ff4f34b7fc7039dfe6f37a4f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb436b5eaba891141a91e3d5772a26f8e29e0d33 + 192b56427754dc9ff4f34b7fc7039dfe6f37a4f4 https://github.com/dotnet/hotreload-utils @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets e444c9ce30e40a75994fe6b4fd5e87a7ef63355b - + https://github.com/dotnet/roslyn-analyzers - d5f910ba4c4aa62a3e9017aba3e5e745c905f865 + 3541eb2b9c85dd1416ba7571f49c0e44019756b7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 4f444cf..030cbac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,27 +51,27 @@ 3.3.2 4.0.0-4.final 4.0.0-4.final - 7.0.0-preview1.21527.1 + 7.0.0-preview1.21528.1 4.0.0-5.21453.15 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 2.5.1-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 2.5.1-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 6.0.0-preview.1.102 @@ -133,10 +133,10 @@ 7.0.0-beta.21520.1 7.0.0-beta.21520.1 - 1.0.0-prerelease.21527.1 - 1.0.0-prerelease.21527.1 - 1.0.0-prerelease.21527.1 - 1.0.0-prerelease.21527.1 + 1.0.0-prerelease.21528.1 + 1.0.0-prerelease.21528.1 + 1.0.0-prerelease.21528.1 + 1.0.0-prerelease.21528.1 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb678..3aafc82 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -60,11 +60,7 @@ jobs: - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: - # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. - ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - vmImage: windows-2019 + vmImage: windows-2019 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index a842886..c4fc18b 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29..ae85a99 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce..8dd1fdb 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' diff --git a/global.json b/global.json index 1b8445f..0b1d27c 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21527.5", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.5", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21527.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21528.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21524.4" -- 2.7.4