Skip to content

Commit 3eaf1f3

Browse files
authored
[release/6.0-preview2] Turn off LKG calculation (#49075)
This change moves the performance infrastructure to use the latest version of dotnet for building and running BDN. This does not change what bits are tested.
1 parent 2f69640 commit 3eaf1f3

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

eng/common/performance/performance-setup.ps1

-8
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ $CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumb
7979
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
8080

8181

82-
#This grabs the LKG version number of dotnet and passes it to our scripts
83-
$VersionJSON = Get-Content global.json | ConvertFrom-Json
84-
$DotNetVersion = $VersionJSON.tools.dotnet
85-
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
86-
# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
87-
$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments"
88-
89-
9082
if ($RunFromPerformanceRepo) {
9183
$SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"
9284

eng/common/performance/performance-setup.sh

-10
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,6 @@ fi
237237
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
238238
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
239239

240-
241-
if [[ "$use_latest_dotnet" = false ]]; then
242-
# Get the tools section from the global.json.
243-
# This grabs the LKG version number of dotnet and passes it to our scripts
244-
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
245-
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
246-
# setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
247-
setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments"
248-
fi
249-
250240
if [[ "$run_from_perf_repo" = true ]]; then
251241
payload_directory=
252242
workitem_directory=$source_directory

0 commit comments

Comments
 (0)