Include metadata when publishing to blob (#804)
* Include metadata when publishing to blob
This commit is contained in:
parent
4e1876ac00
commit
6ba5e8cadf
|
|
@ -54,7 +54,7 @@
|
||||||
Value="$(PackageVersion)" />
|
Value="$(PackageVersion)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="GetFilesToPublish" DependsOnTargets="GeneratePublishFiles">
|
<Target Name="GetFilesToPublish" DependsOnTargets="ResolveRepoInfo;GeneratePublishFiles">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<BlobBasePath>Runtime/$(PackageVersion)/</BlobBasePath>
|
<BlobBasePath>Runtime/$(PackageVersion)/</BlobBasePath>
|
||||||
<AliasBlobBasePath>Runtime/$(SharedFxCliBlobChannel)/</AliasBlobBasePath>
|
<AliasBlobBasePath>Runtime/$(SharedFxCliBlobChannel)/</AliasBlobBasePath>
|
||||||
|
|
@ -112,16 +112,25 @@
|
||||||
<Overwrite>true</Overwrite>
|
<Overwrite>true</Overwrite>
|
||||||
</FilesToPublish>
|
</FilesToPublish>
|
||||||
|
|
||||||
<PackagesToPublish Include="$(DependencyPackagesDir)*.nupkg" Exclude="$(DependencyPackagesDir)*.symbols.nupkg" />
|
<_Artifact
|
||||||
<PackagesToPublish Include="$(DependencyPackagesDir)*.symbols.nupkg" Exclude="@(PackagesToPublish)" IsSymbolsPackage="true" />
|
Include="@(ArtifactInfo)"
|
||||||
|
ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).nupkg"
|
||||||
|
Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<RepoTasks.JoinItems
|
||||||
|
Left="@(_Artifact)" LeftKey="PackageId" LeftMetadata="*" LeftItemSpec="Identity"
|
||||||
|
Right="@(PackageArtifact)" RightMetadata="Category">
|
||||||
|
<Output TaskParameter="JoinResult" ItemName="PackagesToPublish" />
|
||||||
|
</RepoTasks.JoinItems>
|
||||||
|
|
||||||
<Message Text="@(FilesToPublish -> '%(FullPath) -> %(RelativeBlobPath)','%0A')" />
|
<Message Text="@(FilesToPublish -> '%(FullPath) -> %(RelativeBlobPath)','%0A')" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_CheckFilesToPublish">
|
<Target Name="_CheckFilesToPublish">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_MissingFiles Include="%(FilesToPublish.Identity)" Condition=" ! Exists(%(FilesToPublish.Identity))" />
|
<_MissingFiles Include="%(FilesToPublish.Identity)" Condition="!Exists(%(FilesToPublish.Identity))" />
|
||||||
|
<_MissingFiles Include="%(PackagesToPublish.ArtifactPath)" Condition="!Exists(%(PackagesToPublish.ArtifactPath))" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Error Text="Missing expected files:%0A - @(_MissingFiles, '%0A - ')" Condition="@(_MissingFiles->Count()) != 0" />
|
<Error Text="Missing expected files:%0A - @(_MissingFiles, '%0A - ')" Condition="@(_MissingFiles->Count()) != 0" />
|
||||||
|
|
@ -156,11 +165,18 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PublishToTransportFeed"
|
<Target Name="PublishToTransportFeed"
|
||||||
DependsOnTargets="GetFilesToPublish;_CheckFilesToPublish"
|
DependsOnTargets="ResolveCommitHash;GetFilesToPublish;_CheckFilesToPublish"
|
||||||
Condition="'$(PublishToTransportFeed)' == 'true'">
|
Condition="'$(PublishToTransportFeed)' == 'true'">
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackagesToPublishToTransport Include="@(PackagesToPublish)" Condition=" '%(PackagesToPublish.IsSymbolsPackage)' != 'true' " />
|
<PackagesToPublishToTransport
|
||||||
|
Include="%(PackagesToPublish.PackagePath)"
|
||||||
|
Condition="'%(PackageToPublish.Category)' == 'ship'" />
|
||||||
|
|
||||||
|
<PackagesToPublishToTransport
|
||||||
|
Include="%(PackagesToPublish.PackagePath)"
|
||||||
|
ManifestArtifactData="NonShipping=true"
|
||||||
|
Condition="'%(PackageToPublish.Category)' != 'ship'" />
|
||||||
|
|
||||||
<!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
|
<!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
|
||||||
<FilesToPublishToTransport Include="@(FilesToPublish)"
|
<FilesToPublishToTransport Include="@(FilesToPublish)"
|
||||||
|
|
@ -175,6 +191,9 @@
|
||||||
AccountKey="$(PublishBlobFeedKey)"
|
AccountKey="$(PublishBlobFeedKey)"
|
||||||
ItemsToPush="@(PackagesToPublishToTransport)"
|
ItemsToPush="@(PackagesToPublishToTransport)"
|
||||||
Overwrite="$(PushToBlobFeed_Overwrite)"
|
Overwrite="$(PushToBlobFeed_Overwrite)"
|
||||||
|
ManifestBuildId="$(BuildNumber)"
|
||||||
|
ManifestCommit="$(CommitHash)"
|
||||||
|
ManifestName="aspnet"
|
||||||
MaxClients="$(PushToBlobFeed_MaxClients)"
|
MaxClients="$(PushToBlobFeed_MaxClients)"
|
||||||
Condition="@(PackagesToPublish->Count()) != 0" />
|
Condition="@(PackagesToPublish->Count()) != 0" />
|
||||||
|
|
||||||
|
|
@ -183,6 +202,9 @@
|
||||||
ItemsToPush="@(FilesToPublishToTransport)"
|
ItemsToPush="@(FilesToPublishToTransport)"
|
||||||
PublishFlatContainer="true"
|
PublishFlatContainer="true"
|
||||||
Overwrite="$(PushToBlobFeed_Overwrite)"
|
Overwrite="$(PushToBlobFeed_Overwrite)"
|
||||||
|
ManifestBuildId="$(BuildNumber)"
|
||||||
|
ManifestCommit="$(CommitHash)"
|
||||||
|
ManifestName="aspnet"
|
||||||
MaxClients="$(PushToBlobFeed_MaxClients)" />
|
MaxClients="$(PushToBlobFeed_MaxClients)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue