From 535544a3c6666945bf58eb81debce587a1fb8ac3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 9 Feb 2020 14:48:28 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/arcade (#41515)
* Update dependencies from https://github.com/dotnet/arcade build 20200207.14
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20107.14
* Update dependencies from https://github.com/dotnet/arcade build 20200208.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20108.2
---
eng/Version.Details.xml | 4 ++--
eng/common/performance/performance-setup.ps1 | 4 ++--
eng/common/performance/performance-setup.sh | 4 ++--
global.json | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8007e0fdf8c..a2642421efc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- f7185ec14965fac5f22ed6102871c9b1c90cbbca
+ 490732cf6dcb77631fee038da1af0df1518c2fb0
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index a6916d25f00..e3376699294 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -2,7 +2,7 @@ Param(
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
[string] $CoreRootDirectory,
[string] $BaselineCoreRootDirectory,
- [string] $Architecture=$env:archType,
+ [string] $Architecture="x64",
[string] $Framework="netcoreapp5.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
@@ -50,7 +50,7 @@ if ($Internal) {
}
# FIX ME: This is a workaround until we get this from the actual pipeline
-$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations"
+$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
if ($RunFromPerformanceRepo) {
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index ba8bfc13dd7..94a04e0fe55 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -3,7 +3,7 @@
source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
baseline_core_root_directory=
-architecture=$archType
+architecture=x64
framework=netcoreapp5.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
@@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then
fi
fi
-common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations"
+common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
if [[ "$run_from_perf_repo" = true ]]; then
diff --git a/global.json b/global.json
index 5082cd09758..da651e539f6 100644
--- a/global.json
+++ b/global.json
@@ -7,6 +7,6 @@
"xcopy-msbuild": "16.4.0-alpha"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20107.3"
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20108.2"
}
}
--
GitLab