From 95bce2ef0f22ae85b2126dbda3d00b6f4ea955f0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 22:41:48 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade dotnet/xharness
dotnet/runtime-assets (#50231)
[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/runtime-assets
- Re-introduce publishing workaround
Required while https://github.com/dotnet/arcade/issues/6987 is resolved
---
.config/dotnet-tools.json | 2 +-
eng/Version.Details.xml | 112 ++++++++++----------
eng/Versions.props | 48 ++++-----
eng/common/generate-locproject.ps1 | 4 +-
eng/common/templates/steps/source-build.yml | 2 +-
global.json | 8 +-
6 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index dc8c2b505c354..d64902048b60d 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21173.1",
+ "version": "1.0.0-prerelease.21175.2",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 182409aa3de7d..3dc5e6869fbcd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,69 +6,69 @@
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 91c8909b64fc346c7a44384a10ee9a45a7e3455d
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -94,41 +94,41 @@
https://github.com/microsoft/vstest
140434f7109d357d0158ade9e5164a4861513965
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
-
+
https://github.com/dotnet/runtime-assets
- f01b1fca0c9157a16ade2629eb7d49a220b7e9ba
+ 055ed026132a7070e41629cfb5e410f0fcbdf948
https://github.com/dotnet/llvm-project
@@ -198,17 +198,17 @@
https://github.com/mono/linker
2f5594e95e1a5227103b9b7d6b92f4b2250be2d7
-
+
https://github.com/dotnet/xharness
- bb960200cb1f171f11ecd8cf9e45d97218e2241e
+ f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e
-
+
https://github.com/dotnet/xharness
- bb960200cb1f171f11ecd8cf9e45d97218e2241e
+ f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e
-
+
https://github.com/dotnet/arcade
- 0ca849f0b71866b007fedaaa938cee63f8d056a6
+ 12a2bc501ce756c9522588d88583c0256297bd70
diff --git a/eng/Versions.props b/eng/Versions.props
index bdb9ffcb33dbe..0f463d20019ad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,19 +49,19 @@
3.9.0-5.final
3.9.0-5.final
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 2.5.1-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21173.2
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
- 6.0.0-beta.21167.3
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 2.5.1-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
+ 6.0.0-beta.21175.1
5.9.0-preview.2
@@ -107,15 +107,15 @@
4.3.0
6.0.0-preview.3.21169.6
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
- 6.0.0-beta.21162.1
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
+ 6.0.0-beta.21174.2
99.99.99-master-20210317.2
99.99.99-master-20210317.2
@@ -148,8 +148,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21173.1
- 1.0.0-prerelease.21173.1
+ 1.0.0-prerelease.21175.2
+ 1.0.0-prerelease.21175.2
2.4.1
2.4.2
1.3.0
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 9e2f7ad98bf0b..ad3e80651fe39 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -79,7 +79,7 @@ $locJson = @{
}
$json = ConvertTo-Json $locJson -Depth 5
-Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
+Write-Host "LocProject.json generated:`n`n$json`n`n"
Pop-Location
if (!$UseCheckedInLocProjectJson) {
@@ -91,7 +91,7 @@ else {
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
- Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
+ Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
exit 1
}
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 8e336b7d16b34..65ee5992bf460 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -36,7 +36,7 @@ steps:
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
- --restore --build --pack --publish \
+ --restore --build --pack --publish -bl \
$officialBuildArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
diff --git a/global.json b/global.json
index 4e815806088a7..d085b22585ab9 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.21167.3",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21167.3",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21175.1",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21175.1",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21175.1",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21175.1",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21169.6"