Skip to content

Commit b89638c

Browse files
authored
[wasm] Add support for installing latest sdk for workload testing
`$(SdkVersionForWorkloadTesting)` can be set to use a specific version. This is used with workload testing for Wasm.Build.Tests, and with perf pipeline.
1 parent 07d8b82 commit b89638c

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

eng/Versions.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@
164164
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
165165
<MoqVersion>4.12.0</MoqVersion>
166166
<FsCheckVersion>2.14.3</FsCheckVersion>
167-
<SdkVersionForWorkloadTesting>7.0.100-preview.3.22151.18</SdkVersionForWorkloadTesting>
167+
<!-- Uncomment to set a fixed version, else the latest is used -->
168+
<!--<SdkVersionForWorkloadTesting>7.0.100-preview.3.22151.18</SdkVersionForWorkloadTesting>-->
168169
<CompilerPlatformTestingVersion>1.1.2-beta1.22122.4</CompilerPlatformTestingVersion>
169170
<!-- Docs -->
170171
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20220331.1</MicrosoftPrivateIntellisenseVersion>

eng/testing/workloads-testing.targets

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))">
1111

1212
<Error Text="%24(SdkWithWorkloadForTestingPath) is not set" Condition="'$(SdkWithWorkloadForTestingPath)' == ''" />
13-
<Error Text="%24(SdkVersionForWorkloadTesting) is not set" Condition="'$(SdkVersionForWorkloadTesting)' == ''" />
1413

15-
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithWorkloadForTestingPath)" Importance="High" />
14+
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithWorkloadForTestingPath)"
15+
Condition="'$(SdkVersionForWorkloadTesting)' != ''"
16+
Importance="High" />
17+
<Message Text="** Installing latest sdk for workload based tests into $(SdkWithWorkloadForTestingPath)"
18+
Condition="'$(SdkVersionForWorkloadTesting)' == ''"
19+
Importance="High" />
1620

1721
<RemoveDir Directories="$(SdkWithWorkloadForTestingPath)" />
1822
<MakeDir Directories="$(SdkWithWorkloadForTestingPath)" />
@@ -28,9 +32,13 @@
2832

2933
<Target Name="_ProvisionSdkWithNoWorkload" Condition="!Exists($(SdkWithNoWorkloadStampPath))">
3034
<Error Text="%24(SdkWithNoWorkloadForTestingPath) is not set" Condition="'$(SdkWithNoWorkloadForTestingPath)' == ''" />
31-
<Error Text="%24(SdkVersionForWorkloadTesting) is not set" Condition="'$(SdkVersionForWorkloadTesting)' == ''" />
3235

33-
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithNoWorkloadForTestingPath)" Importance="High" />
36+
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithNoWorkloadForTestingPath)"
37+
Condition="'$(SdkVersionForWorkloadTesting)' != ''"
38+
Importance="High" />
39+
<Message Text="** Installing latest sdk for workload based tests into $(SdkWithNoWorkloadForTestingPath)"
40+
Condition="'$(SdkVersionForWorkloadTesting)' == ''"
41+
Importance="High" />
3442

3543
<RemoveDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
3644
<MakeDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
@@ -42,17 +50,31 @@
4250
<_DotNetInstallScriptPath>$(ArtifactsObjDir)$(_DotNetInstallScriptName)</_DotNetInstallScriptPath>
4351
</PropertyGroup>
4452

53+
<PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' != ''">
54+
<_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))"
55+
>$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
56+
<_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))"
57+
>$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
58+
</PropertyGroup>
59+
60+
<PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' == ''">
61+
<_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))"
62+
>$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v latest -q daily --channel 7.0</_DotNetInstallCommand>
63+
<_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))"
64+
>$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Quality daily -Channel 7.0</_DotNetInstallCommand>
65+
</PropertyGroup>
66+
4567
<DownloadFile SourceUrl="https://dot.net/v1/$(_DotNetInstallScriptName)"
4668
DestinationFolder="$(ArtifactsObjDir)"
4769
Retries="3"
4870
Condition="!Exists($(_DotNetInstallScriptPath))"/>
4971

5072
<Exec Condition="!$([MSBuild]::IsOSPlatform('windows'))"
5173
IgnoreStandardErrorWarningFormat="true"
52-
Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting)" />
74+
Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallCommand)" />
5375

5476
<Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
55-
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)"' />
77+
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
5678

5779
<WriteLinesToFile File="$(SdkWithNoWorkloadStampPath)" Lines="" Overwrite="true" />
5880
</Target>

0 commit comments

Comments
 (0)