diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-05-24 14:34:46 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-06-06 12:13:34 -0700 |
| commit | 029a54431d17569b6656ed644de426d3f4f8d346 (patch) | |
| tree | fb6fc79ab6ee5e154a9516ab3ae063b335c0116b /tests/runtest.proj | |
| parent | 794eca076a882fcd2639fa692ca457150940231b (diff) | |
| download | coreclr-029a54431d17569b6656ed644de426d3f4f8d346.tar.gz coreclr-029a54431d17569b6656ed644de426d3f4f8d346.tar.bz2 coreclr-029a54431d17569b6656ed644de426d3f4f8d346.zip | |
Test packages from current build in pipeline
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index 18b3304fa9..15734cedf4 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -323,7 +323,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <ItemGroup> <AllRunnableTestPaths Include="$(XunitTestBinBase)\**\*.cmd" /> </ItemGroup> - </Target> + </Target> + + <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in bin/obj --> + <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" /> + + <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'"> + <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore> + <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)</VersionToRestore> + <DesiredPackageVersionArg>$(VersionToRestore)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</DesiredPackageVersionArg> + </PropertyGroup> <Import Project="tests.targets" /> <Import Project="publishdependency.targets" /> @@ -331,6 +340,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <PropertyGroup> <TargetRid Condition="'$(RuntimeId)' != ''">$(RuntimeId)</TargetRid> <TargetRid Condition="'$(RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid> + <DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(CoreClrPackageVersion)</DesiredPackageVersionArg> </PropertyGroup> <Target Name="CreateTestOverlay"> |