diff options
| author | Davis Goodin <dagood@users.noreply.github.com> | 2018-01-03 15:47:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 15:47:58 -0600 |
| commit | 247d60deec8fae0dd81c3864921ca46d3f6d2283 (patch) | |
| tree | bdc92888cac979467f09681773528488e5fe1b06 /src/publish.proj | |
| parent | 55f9cc3af46fdca20b08e7d0cf9c19fe833a8679 (diff) | |
| download | coreclr-247d60deec8fae0dd81c3864921ca46d3f6d2283.tar.gz coreclr-247d60deec8fae0dd81c3864921ca46d3f6d2283.tar.bz2 coreclr-247d60deec8fae0dd81c3864921ca46d3f6d2283.zip | |
Pass manifest details to PushToBlobFeed (#15705)
Diffstat (limited to 'src/publish.proj')
| -rw-r--r-- | src/publish.proj | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/publish.proj b/src/publish.proj index 9a83ee70f4..76965ac767 100644 --- a/src/publish.proj +++ b/src/publish.proj @@ -8,9 +8,11 @@ <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/> <PropertyGroup> - <PackagesPattern Condition="'$(PackagesPattern)' == ''">$(PackagesBinDir)pkg\*.nupkg</PackagesPattern> + <PackagesPatternDir Condition="'$(PackagesPatternDir)' == ''">$(PackagesBinDir)</PackagesPatternDir> + <PackagesPattern Condition="'$(PackagesPattern)' == ''">$(PackagesPatternDir)pkg\*.nupkg</PackagesPattern> + <TransportPackagesPattern Condition="'$(TransportPackagesPattern)' == ''">$(PackagesPatternDir)pkg\transport.*.nupkg</TransportPackagesPattern> <TestNativeBinariesPattern Condition="'$(TestNativeBinariesPattern)' == ''">$(OutputPath)\bin\**</TestNativeBinariesPattern> - <SymbolsPackagesPattern Condition="'$(SymbolPackagesPattern)' == ''">$(PackagesBinDir)symbolpkg\*.nupkg</SymbolsPackagesPattern> + <SymbolsPackagesPattern Condition="'$(SymbolPackagesPattern)' == ''">$(PackagesPatternDir)symbolpkg\*.nupkg</SymbolsPackagesPattern> <PublishFlatContainer Condition="'$(PublishFlatContainer)' == ''">true</PublishFlatContainer> <RelativePathWithSlash>$(RelativePath)</RelativePathWithSlash> <RelativePathWithSlash Condition="'$(RelativePathWithSlash)' != '' and !HasTrailingSlash('$(RelativePathWithSlash)')">$(RelativePathWithSlash)/</RelativePathWithSlash> @@ -28,7 +30,10 @@ </PropertyGroup> <ItemGroup> <ItemsToPush Remove="*.nupkg" /> - <ItemsToPush Include="$(PackagesPattern)" Exclude="$(SymbolsPackagesPattern)"/> + <ItemsToPush Include="$(TransportPackagesPattern)"> + <ManifestArtifactData>NonShipping=true</ManifestArtifactData> + </ItemsToPush> + <ItemsToPush Include="$(PackagesPattern)" Exclude="@(ItemsToPush);$(SymbolsPackagesPattern)" /> <ItemsToPush> <RelativeBlobPath>$(RelativePathWithSlash)$([System.String]::Copy('%(RecursiveDir)%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath> </ItemsToPush> @@ -44,7 +49,11 @@ ExpectedFeedUrl="$(ExpectedFeedUrl)" AccountKey="$(AccountKey)" ItemsToPush="@(ItemsToPush)" - Overwrite="$(OverwriteOnPublish)" /> + Overwrite="$(OverwriteOnPublish)" + ManifestName="$(GitHubRepositoryName)" + ManifestBuildId="$(ManifestBuildId)" + ManifestBranch="$(ManifestBranch)" + ManifestCommit="$(ManifestCommit)" /> <!-- now upload the items --> <UploadToAzure Condition="'$(PublishFlatContainer)' == 'true'" @@ -77,7 +86,11 @@ ExpectedFeedUrl="$(ExpectedFeedUrl)" AccountKey="$(AccountKey)" ItemsToPush="@(ItemsToPush)" - Overwrite="$(OverwriteOnPublish)" /> + Overwrite="$(OverwriteOnPublish)" + ManifestName="$(GitHubRepositoryName)" + ManifestBuildId="$(ManifestBuildId)" + ManifestBranch="$(ManifestBranch)" + ManifestCommit="$(ManifestCommit)" /> <!-- now upload the items --> <UploadToAzure Condition="'$(PublishFlatContainer)' == 'true'" |