diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2016-09-06 15:17:04 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2016-10-17 11:25:49 -0700 |
| commit | 69ab16ac55d423935dd40c12237903b0c3a0c170 (patch) | |
| tree | f59bccc958e9166b867dfcbabf5d2d92cebac32d /src/publish.proj | |
| parent | 27c00018be793ad5cb9d7b2d2d4fcae497963ccc (diff) | |
| download | coreclr-69ab16ac55d423935dd40c12237903b0c3a0c170.tar.gz coreclr-69ab16ac55d423935dd40c12237903b0c3a0c170.tar.bz2 coreclr-69ab16ac55d423935dd40c12237903b0c3a0c170.zip | |
Build tests against packages & produce Core_Root for arbitrary OS
Diffstat (limited to 'src/publish.proj')
| -rw-r--r-- | src/publish.proj | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/publish.proj b/src/publish.proj index 66aeb7e5e1..d4e4a7f24b 100644 --- a/src/publish.proj +++ b/src/publish.proj @@ -13,21 +13,26 @@ <!-- add relative blob path metadata --> <ItemGroup> <ForPublishing> - <RelativeBlobPath>$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> + <RelativeBlobPath Condition="'$(PublishTestNativeBins)' != 'true'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> + <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__DistroRid)-$(__BuildArch)/$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath> </ForPublishing> </ItemGroup> <Error Condition="'@(ForPublishing)' == ''" Text="No items were found matching pattern '$(PublishPattern)'." /> </Target> <PropertyGroup> - <PublishPattern Condition="'$(PublishPattern)' == ''">$(PackagesBinDir)**\*.nupkg</PublishPattern> + <PublishPattern Condition="'$(PublishPattern)' == '' and '$(PublishTestNativeBins)' != 'true'">$(PackagesBinDir)**\*.nupkg</PublishPattern> + <PublishPattern Condition="'$(PublishPattern)' == '' and '$(PublishTestNativeBins)' == 'true'">$(OutputPath)\tests\src\**</PublishPattern> </PropertyGroup> <Target Name="CreateContainerName" DependsOnTargets="CreateVersionFileDuringBuild" - Condition="'$(ContainerName)' == ''"> + Condition="'$(ContainerName)' == '' or '$(PublishTestNativeBins)' == 'true'"> <PropertyGroup> - <ContainerName>coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName> + <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' != 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName> + <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-test-native-bins</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName> + <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName> </PropertyGroup> </Target> |