|
10 | 10 | Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))">
|
11 | 11 |
|
12 | 12 | <Error Text="%24(SdkWithWorkloadForTestingPath) is not set" Condition="'$(SdkWithWorkloadForTestingPath)' == ''" />
|
13 |
| - <Error Text="%24(SdkVersionForWorkloadTesting) is not set" Condition="'$(SdkVersionForWorkloadTesting)' == ''" /> |
14 | 13 |
|
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" /> |
16 | 20 |
|
17 | 21 | <RemoveDir Directories="$(SdkWithWorkloadForTestingPath)" />
|
18 | 22 | <MakeDir Directories="$(SdkWithWorkloadForTestingPath)" />
|
|
28 | 32 |
|
29 | 33 | <Target Name="_ProvisionSdkWithNoWorkload" Condition="!Exists($(SdkWithNoWorkloadStampPath))">
|
30 | 34 | <Error Text="%24(SdkWithNoWorkloadForTestingPath) is not set" Condition="'$(SdkWithNoWorkloadForTestingPath)' == ''" />
|
31 |
| - <Error Text="%24(SdkVersionForWorkloadTesting) is not set" Condition="'$(SdkVersionForWorkloadTesting)' == ''" /> |
32 | 35 |
|
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" /> |
34 | 42 |
|
35 | 43 | <RemoveDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
|
36 | 44 | <MakeDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
|
|
42 | 50 | <_DotNetInstallScriptPath>$(ArtifactsObjDir)$(_DotNetInstallScriptName)</_DotNetInstallScriptPath>
|
43 | 51 | </PropertyGroup>
|
44 | 52 |
|
| 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 | + |
45 | 67 | <DownloadFile SourceUrl="https://dot.net/v1/$(_DotNetInstallScriptName)"
|
46 | 68 | DestinationFolder="$(ArtifactsObjDir)"
|
47 | 69 | Retries="3"
|
48 | 70 | Condition="!Exists($(_DotNetInstallScriptPath))"/>
|
49 | 71 |
|
50 | 72 | <Exec Condition="!$([MSBuild]::IsOSPlatform('windows'))"
|
51 | 73 | IgnoreStandardErrorWarningFormat="true"
|
52 |
| - Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting)" /> |
| 74 | + Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallCommand)" /> |
53 | 75 |
|
54 | 76 | <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
|
55 |
| - Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)"' /> |
| 77 | + Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' /> |
56 | 78 |
|
57 | 79 | <WriteLinesToFile File="$(SdkWithNoWorkloadStampPath)" Lines="" Overwrite="true" />
|
58 | 80 | </Target>
|
|
0 commit comments