diff --git a/eng/Versions.props b/eng/Versions.props index 50990a1d54d485..0fa57c54d4dfaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,8 @@ 2.0.4 4.12.0 2.14.3 - 7.0.100-preview.3.22151.18 + + 1.1.2-beta1.22122.4 7.0.0-preview-20220331.1 diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index ca2429b7f94d10..c0b07b9e9e42ca 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -10,9 +10,13 @@ Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))"> - - + + @@ -28,9 +32,13 @@ - - + + @@ -42,6 +50,20 @@ <_DotNetInstallScriptPath>$(ArtifactsObjDir)$(_DotNetInstallScriptName) + + <_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))" + >$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting) + <_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))" + >$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting) + + + + <_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))" + >$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v latest -q daily --channel 7.0 + <_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))" + >$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Quality daily -Channel 7.0 + + + Command="chmod +x $(_DotNetInstallScriptPath); $(_DotNetInstallCommand)" /> + Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' />