From c9829d073f68764a168ab21091fd2df81e3edc2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2020 20:45:46 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20200112.1 (#18312) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20062.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20062.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20062.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/performance/performance-setup.ps1 | 3 ++- eng/common/performance/performance-setup.sh | 2 +- global.json | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5e9f2cc17..9c81744f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -417,17 +417,17 @@ https://github.com/dotnet/extensions d0ae16ea86aa6bd6c533e2a6fe8b5bdd38607f91 - + https://github.com/dotnet/arcade - 48bae09d7d8ec0e6879fe2b8d08872cd87f084ca + 250782df013aa8586e21bb225f8efd715372dcf1 - + https://github.com/dotnet/arcade - 48bae09d7d8ec0e6879fe2b8d08872cd87f084ca + 250782df013aa8586e21bb225f8efd715372dcf1 - + https://github.com/dotnet/arcade - 48bae09d7d8ec0e6879fe2b8d08872cd87f084ca + 250782df013aa8586e21bb225f8efd715372dcf1 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 2250b638f4..331bb3cfd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ --> - 5.0.0-beta.20058.1 + 5.0.0-beta.20062.1 3.5.0-beta1-19606-04 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index ec41965fc8..f6e878297d 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -49,7 +49,8 @@ if ($Internal) { $HelixSourcePrefix = "official" } -$CommonSetupArguments="--frameworks $Framework --queue $Queue --build-number $BuildNumber --build-configs $Configurations" +# 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" $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 2f2092166e..7ef15514e5 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -164,7 +164,7 @@ if [[ "$internal" == true ]]; then fi fi -common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations" +common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations" 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 72dfaa34b3..dfbf922da1 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20058.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20058.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20062.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20062.1" } }