From 1be117d8e7c0cd29ebc55cbcff2a7fa70604ed39 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 12 Feb 2021 07:27:42 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/runtime-assets
dotnet/llvm-project dotnet/icu dotnet/arcade dotnet/xharness (#48054)
[master] Update dependencies from dotnet/runtime-assets dotnet/llvm-project dotnet/icu dotnet/arcade dotnet/xharness
- Update arcade tfm package deps to netcoreapp3.1
---
.config/dotnet-tools.json | 2 +-
eng/Version.Details.xml | 144 ++++++++++----------
eng/Versions.props | 64 ++++-----
eng/common/tools.ps1 | 27 +++-
eng/common/tools.sh | 23 +++-
global.json | 8 +-
src/libraries/libraries-packages.proj | 2 +-
src/tests/Common/external/external.csproj | 2 +-
src/tests/Common/xunitconsolerunner.depproj | 2 +-
9 files changed, 150 insertions(+), 124 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index f58f04bc51844..7a9fd28da246d 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21108.1",
+ "version": "1.0.0-prerelease.21111.1",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9304837710b41..e4efbf239c4e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,74 +1,74 @@
-
+
https://github.com/dotnet/icu
- eab8f7314698b7e7306d62d3fc6ae08358050837
+ 39bb47494d90d7122d65d0a7894f8eb0a976b244
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
-
+
https://github.com/dotnet/arcade
- fc83e59329203724d4a63c4f6c843be62983a35e
+ 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe
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
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/runtime-assets
- f4b98c9c9d9afa7bc0576272d510fb19fa93b2a3
+ 97e545a94661bfd9a408cab1c186d5d28fe21932
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
-
+
https://github.com/dotnet/llvm-project
- 2da6edefbdcd22b06bcb317af46eb92b3fc8258e
+ 904460c12f46e4eafb963d9bffb5a136b2a09613
https://github.com/dotnet/runtime
@@ -198,13 +198,13 @@
https://github.com/mono/linker
57432e260642d3c76e8717f5d8d1399c593349b7
-
+
https://github.com/dotnet/xharness
- 31cac14f02c50bcd29162b3d0eff764ddfdbb6de
+ 66b9a52dfea930ff2cfb588e5f2636932a1f6868
-
+
https://github.com/dotnet/xharness
- 31cac14f02c50bcd29162b3d0eff764ddfdbb6de
+ 66b9a52dfea930ff2cfb588e5f2636932a1f6868
diff --git a/eng/Versions.props b/eng/Versions.props
index ee05ed36d3655..6274d87fad979 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,18 +48,18 @@
3.8.0-4.20503.2
3.8.0
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 2.5.1-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
- 6.0.0-beta.21105.5
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 2.5.1-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
+ 6.0.0-beta.21105.12
5.9.0-preview.2
@@ -105,15 +105,15 @@
4.3.0
6.0.0-preview.2.21108.2
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
- 5.0.0-beta.21102.1
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
+ 5.0.0-beta.21110.2
99.99.99-master-20200806.6
99.99.99-master-20200806.6
@@ -142,8 +142,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21108.1
- 1.0.0-prerelease.21108.1
+ 1.0.0-prerelease.21111.1
+ 1.0.0-prerelease.21111.1
2.4.1
2.4.2
1.3.0
@@ -156,16 +156,16 @@
6.0.0-alpha.1.21111.1
- 6.0.0-preview.2.21101.12
+ 6.0.0-preview.2.21108.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
- 9.0.1-alpha.1.21101.1
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
+ 9.0.1-alpha.1.21109.2
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 10e98593e0c81..572da3b9f12cc 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -508,7 +508,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
- $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' }
+ $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -644,13 +644,26 @@ function MSBuild() {
}
$toolsetBuildProject = InitializeToolset
- $path = Split-Path -parent $toolsetBuildProject
- $path = Join-Path $path (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')
- if (-not (Test-Path $path)) {
- $path = Split-Path -parent $toolsetBuildProject
- $path = Join-Path $path (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')
+ $basePath = Split-Path -parent $toolsetBuildProject
+ $possiblePaths = @(
+ # new scripts need to work with old packages, so we need to look for the old names/versions
+ (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
+ (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
+ (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
+ )
+ $selectedPath = $null
+ foreach ($path in $possiblePaths) {
+ if (Test-Path $path -PathType Leaf) {
+ $selectedPath = $path
+ break
+ }
+ }
+ if (-not $selectedPath) {
+ Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.'
+ ExitWithExitCode 1
}
- $args += "/logger:$path"
+ $args += "/logger:$selectedPath"
}
MSBuild-Core @args
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 0920f5965b697..9019b7f5cc910 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -307,7 +307,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
- _InitializeBuildToolFramework="netcoreapp2.1"
+ _InitializeBuildToolFramework="netcoreapp3.1"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
@@ -414,11 +414,24 @@ function MSBuild {
fi
local toolset_dir="${_InitializeToolset%/*}"
- local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll"
- if [[ ! -f $logger_path ]]; then
- logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
+ # new scripts need to work with old packages, so we need to look for the old names/versions
+ local selectedPath=
+ local possiblePaths=()
+ possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
+ possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
+ for path in "${possiblePaths[@]}"; do
+ if [[ -f $path ]]; then
+ selectedPath=$path
+ break
+ fi
+ done
+ if [[ -z "$selectedPath" ]]; then
+ Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly."
+ ExitWithExitCode 1
fi
- args=( "${args[@]}" "-logger:$logger_path" )
+ args+=( "-logger:$selectedPath" )
fi
MSBuild-Core ${args[@]}
diff --git a/global.json b/global.json
index b03fe4c2578e1..1d1ce4385d2ae 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.21105.5",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.5",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.5",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21105.12",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.12",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.12",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.12",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21108.2",
"Microsoft.Build.NoTargets": "2.0.17",
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index cfbf75d8a4e02..b8fde0c0adb1c 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -7,7 +7,7 @@
$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\
- $(PackagingTaskAssembly)netcoreapp2.1\
+ $(PackagingTaskAssembly)netcoreapp3.1\
$(PackagingTaskAssembly)net472\
$(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll
diff --git a/src/tests/Common/external/external.csproj b/src/tests/Common/external/external.csproj
index 268bb4ec88f69..019455bbd1c43 100644
--- a/src/tests/Common/external/external.csproj
+++ b/src/tests/Common/external/external.csproj
@@ -14,7 +14,7 @@
$(TargetingPackPath)
$(NetCoreAppToolCurrent)
win7-x86;win7-x64
- netcoreapp2.1
+ netcoreapp3.1
SharedLibrary
false
false
diff --git a/src/tests/Common/xunitconsolerunner.depproj b/src/tests/Common/xunitconsolerunner.depproj
index 73db22f392f79..529957694b38c 100644
--- a/src/tests/Common/xunitconsolerunner.depproj
+++ b/src/tests/Common/xunitconsolerunner.depproj
@@ -1,6 +1,6 @@
- netcoreapp2.1
+ netcoreapp3.1