From 58765de1d6a6058e5d19017ec287577127ce5f59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Oct 2021 12:34:55 -0500 Subject: [PATCH] [main] Update dependencies from dnceng/internal/dotnet-optimization dotnet/xharness dotnet/arcade dotnet/emsdk dotnet/roslyn-analyzers dotnet/msquic (#60954) * Update dependencies from https://github.com/dotnet/emsdk build 20211027.1 Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.0-alpha.1.21520.2 -> To Version 7.0.0-alpha.1.21527.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20211027.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.21525.1 -> To Version 1.0.0-prerelease.21527.1 * Update dependencies from https://github.com/dotnet/xharness build 20211027.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21527.1 -> To Version 1.0.0-prerelease.21527.2 * Update dependencies from https://github.com/dotnet/arcade build 20211027.5 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.1 -> To Version 7.0.0-beta.21527.5 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20211027.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 7.0.0-preview1.21526.1 -> To Version 7.0.0-preview1.21527.1 * Update dependencies from https://github.com/dotnet/msquic build 20211027.1 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21526.1 -> To Version 6.0.0-preview.7.21527.1 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 112 +++++++++++------------ eng/Versions.props | 48 +++++----- eng/common/templates/job/onelocbuild.yml | 3 + global.json | 8 +- 5 files changed, 88 insertions(+), 85 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 530b6de9f4f55..e359b53d13064 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21527.1", + "version": "1.0.0-prerelease.21527.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6b5d8bdd9dd1..df0da780c1c9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/icu 5146c6e78ad134305a4b3e857379bdd134db7ac0 - + https://github.com/dotnet/msquic - e84278e45cd502355605070bb89606cfcdcd1cb6 + 7328f528564fede6d6a5e763bd4da3117ca59567 - + https://github.com/dotnet/emsdk - 9f2345b3c5f43dbf34790e21657ae1f2445cd06a + efad634a7c316b67654b38690c56b3702363d6ae https://github.com/dotnet/wcf @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 https://github.com/microsoft/vstest @@ -202,33 +202,33 @@ https://github.com/dotnet/linker 0f1bca76ee6a360d67a624c12b5b8d427db66226 - + https://github.com/dotnet/xharness - 09775c67d4470afd26229cf19f5e651314e2ecb3 + 0b28b2c062b000f5115cd3ee70e4777dd025b263 - + https://github.com/dotnet/xharness - 09775c67d4470afd26229cf19f5e651314e2ecb3 + 0b28b2c062b000f5115cd3ee70e4777dd025b263 - + https://github.com/dotnet/arcade - 32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9 + acde984116ccca032c345b782667a9a3ed9ba877 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 858495292737c6b88227aa6a51230f62017e930f + fb436b5eaba891141a91e3d5772a26f8e29e0d33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 858495292737c6b88227aa6a51230f62017e930f + fb436b5eaba891141a91e3d5772a26f8e29e0d33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 858495292737c6b88227aa6a51230f62017e930f + fb436b5eaba891141a91e3d5772a26f8e29e0d33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 858495292737c6b88227aa6a51230f62017e930f + fb436b5eaba891141a91e3d5772a26f8e29e0d33 https://github.com/dotnet/hotreload-utils @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime-assets e444c9ce30e40a75994fe6b4fd5e87a7ef63355b - + https://github.com/dotnet/roslyn-analyzers - 736c86711d0381ce29ab7273df4a55bf2c0000bc + d5f910ba4c4aa62a3e9017aba3e5e745c905f865 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d05d5b438acd1..92440c6c7f1c3 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.21526.1 + 7.0.0-preview1.21527.1 4.0.0-5.21453.15 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 2.5.1-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 - 7.0.0-beta.21527.1 + 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 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.21525.1 - 1.0.0-prerelease.21525.1 - 1.0.0-prerelease.21525.1 - 1.0.0-prerelease.21525.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 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21527.1 - 1.0.0-prerelease.21527.1 + 1.0.0-prerelease.21527.2 + 1.0.0-prerelease.21527.2 1.0.2-alpha.0.21525.2 2.4.2-pre.9 2.4.2 @@ -174,7 +174,7 @@ 7.0.0-alpha.1.21525.1 - 6.0.0-preview.7.21526.1 + 6.0.0-preview.7.21527.1 11.1.0-alpha.1.21511.1 11.1.0-alpha.1.21511.1 @@ -185,7 +185,7 @@ 11.1.0-alpha.1.21511.1 11.1.0-alpha.1.21511.1 - 7.0.0-alpha.1.21520.2 + 7.0.0-alpha.1.21527.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index e8bc77d2ebbe3..a842886629bbd 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -12,6 +12,7 @@ parameters: SourcesDirectory: $(Build.SourcesDirectory) CreatePr: true AutoCompletePr: false + ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false LanguageSet: VS_Main_Languages @@ -64,6 +65,8 @@ jobs: ${{ if eq(parameters.CreatePr, true) }}: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: diff --git a/global.json b/global.json index 7fcd5f332c300..1b8445fa5414a 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.1", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21527.1", + "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.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21524.4"