From 220b01a58697eeae580d97cc47879217efd6628f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 00:58:37 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/runtime-assets (#49359) [main] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/runtime-assets - re-introduce publishing workaround --- eng/Version.Details.xml | 132 ++++++++++++++--------------- eng/Versions.props | 58 ++++++------- eng/common/native/install-tool.ps1 | 2 +- global.json | 8 +- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a064479ce7d931..c53b634d45cbcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 - + https://github.com/dotnet/arcade - f95dc73e2028d630d67b782c9dcccbe464cf9677 + 287fba3cbedce004fbd9823c268327960a69ca88 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -94,73 +94,73 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/runtime-assets - ad3e62eb902b7ab02a12ea40d35e0d35e067afe3 + c7c14818023404ed900360565f8289b8e14d9aa4 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 - + https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + 121a29ab0b411db38efa6659307d86fe04aefcb8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f6905d2916f0b8..03a12faeac6d4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ 3.9.0-5.final 3.9.0-5.final - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 2.5.1-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 - 6.0.0-beta.21152.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 2.5.1-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 + 6.0.0-beta.21155.1 5.9.0-preview.2 @@ -106,15 +106,15 @@ 4.3.0 6.0.0-preview.3.21157.6 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 - 5.0.0-beta.21151.2 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 + 5.0.0-beta.21159.1 99.99.99-master-20200806.6 99.99.99-master-20200806.6 @@ -159,14 +159,14 @@ 6.0.0-preview.3.21151.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 + 9.0.1-alpha.1.21158.1 diff --git a/eng/common/native/install-tool.ps1 b/eng/common/native/install-tool.ps1 index f397e1c75d411e..78f2d84a4e4b11 100644 --- a/eng/common/native/install-tool.ps1 +++ b/eng/common/native/install-tool.ps1 @@ -105,7 +105,7 @@ try { Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))" exit 1 } elseif (@($ToolFilePath).Length -Lt 1) { - Write-Host "$ToolName was not found in $ToolFilePath." + Write-Host "$ToolName was not found in $ToolInstallDirectory." exit 1 } diff --git a/global.json b/global.json index 28d854b09b7342..9935b33b7d66db 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21152.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21152.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21152.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21152.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21155.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21155.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21155.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21155.1", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21157.6"