From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:46:23 +0000 (+0000)
Subject: Update dependencies from https://github.com/dotnet/arcade build 20201123.2 (#1775)
X-Git-Tag: submit/tizen/20210909.063632~17^2~296
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1676fcf7c9585aa531bb558435a2a17d95e7ae75;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git
Update dependencies from https://github.com/dotnet/arcade build 20201123.2 (#1775)
[master] Update dependencies from dotnet/arcade
---
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4a9d2dfc0..da545bda2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,9 +4,9 @@
https://github.com/dotnet/command-line-api
166610c56ff732093f0145a2911d4f6c40b786da
-
+
https://github.com/dotnet/arcade
- a9a80fb35d2e7da21509441d665a40022ce8f1b4
+ 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
https://github.com/dotnet/symstore
@@ -26,9 +26,9 @@
-
+
https://github.com/dotnet/arcade
- a9a80fb35d2e7da21509441d665a40022ce8f1b4
+ 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
https://github.com/dotnet/aspnetcore
diff --git a/eng/Versions.props b/eng/Versions.props
index cbb5bc1ab..d47503701 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,7 +63,7 @@
4.7.0
2.4.1
2.0.3
- 6.0.0-beta.20567.7
+ 6.0.0-beta.20573.2
10.0.18362
diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj
index cf09e4057..eb8bdd9c4 100644
--- a/eng/common/performance/crossgen_perf.proj
+++ b/eng/common/performance/crossgen_perf.proj
@@ -19,7 +19,7 @@
python3
- $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update
+ $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk
$HELIX_CORRELATION_PAYLOAD/Core_Root
$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/
$(ScenarioDirectory)crossgen/
@@ -69,7 +69,7 @@
$(WorkItemDirectory)
$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity)
- $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/
+ $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen.out/
$(Python) $(CrossgenDirectory)post.py
@@ -78,7 +78,7 @@
$(WorkItemDirectory)
$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity)
- $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/
+ $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen.out/
$(Python) $(Crossgen2Directory)post.py
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 315815a96..c8e211bcb 100644
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
else
queue=Ubuntu.1804.Amd64.Tiger.Perf
fi
+else
+ if [[ "$architecture" = "arm64" ]]; then
+ queue=ubuntu.1804.armarch.open
+ else
+ queue=Ubuntu.1804.Amd64.Open
+ fi
fi
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 1728b742b..1c46f7b63 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -164,7 +164,7 @@ function CheckJobResult(
[ref]$ValidationFailures,
[switch]$logErrors) {
if ($result -ne '0') {
- if ($logError) {
+ if ($logErrors) {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
}
$ValidationFailures.Value++
diff --git a/global.json b/global.json
index ce13ba0bb..3026b1bd0 100644
--- a/global.json
+++ b/global.json
@@ -15,6 +15,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "2.0.1",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
}
}