From 94776de87a85315a63eefaef76eb21df1112d4c8 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 15 Feb 2023 23:36:25 -0500 Subject: [PATCH] [wasm] Use latest sdk 7.0 sdk for workload testing, and perf runs Fixes 7.0 perf runs: ``` Traceback (most recent call last): File "/mnt/vss/_work/1/s/Payload/performance/scripts/ci_setup.py", line 373, in __main(sys.argv[1:]) File "/mnt/vss/_work/1/s/Payload/performance/scripts/ci_setup.py", line 318, in __main dotnet_version = dotnet.get_dotnet_version(target_framework_moniker, args.cli) if args.dotnet_versions == [] else args.dotnet_versions[0] File "/mnt/vss/_work/1/s/Payload/performance/scripts/dotnet.py", line 549, in get_dotnet_version sdk_path = get_sdk_path(dotnet_path) if sdk_path is None else sdk_path File "/mnt/vss/_work/1/s/Payload/performance/scripts/dotnet.py", line 533, in get_sdk_path base_path = get_base_path(dotnet_path) File "/mnt/vss/_work/1/s/Payload/performance/scripts/dotnet.py", line 527, in get_base_path 'Did not find "Base Path:" entry on the `dotnet --info` command' RuntimeError: Did not find "Base Path:" entry on the `dotnet --info` command ``` --- eng/Versions.props | 4 ++-- eng/pipelines/coreclr/templates/run-scenarios-job.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab03b38e940e3..e00906ce4592e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,8 +168,8 @@ 4.12.0 2.14.3 - 7.0.100 - 7.0.1xx + + 7.0 1.1.2-beta1.22403.2 7.0.0-preview-20221010.1 diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index 3613dc5d37de4..6f32502a94e3a 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -107,6 +107,7 @@ jobs: - AdditionalHelixPreCommands: $(HelixPreCommandOSX) - AdditionalHelixPostCommands: $(HelixPostCommandOSX) + - ExtraSetupArguments: '' - ${{ if ne(parameters.runtimeType, 'wasm') }}: - ExtraSetupArguments: --install-dir $(PayloadDirectory)/dotnet - ${{ if and(eq(parameters.runtimeType, 'wasm'), in(variables['Build.Reason'], 'PullRequest')) }}: