Don't use 'ParseBlobUrl'; use the original values.

This commit is contained in:
jbeisner 2018-01-17 02:52:59 +00:00
parent 3386db7bed
commit d04e8c84e1

View file

@ -2,42 +2,13 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="FinishBuild"
Condition="'$(IsNotOrchestratedPublish)' == 'true'"
DependsOnTargets="SetArtifactBlobProps;
SetChecksumBlobProps;
CheckIfAllBuildsHavePublished;
DependsOnTargets="CheckIfAllBuildsHavePublished;
FinalizeBuild" />
<Target Name="SetArtifactBlobProps">
<Error Condition="'$(ArtifactCloudDropURL)' == ''" Text="Missing property ArtifactCloudDropURL." />
<ParseBlobUrl BlobUrl="$(ArtifactCloudDropURL)">
<Output TaskParameter="BlobElements" ItemName="BlobElements" />
</ParseBlobUrl>
<PropertyGroup>
<ArtifactBlobContainerName>%(BlobElements.ContainerName)</ArtifactBlobContainerName>
<ArtifactBlobAccountName>%(BlobElements.AccountName)</ArtifactBlobAccountName>
</PropertyGroup>
</Target>
<Target Name="SetChecksumBlobProps">
<Error Condition="'$(ChecksumCloudDropURL)' == ''" Text="Missing property ChecksumCloudDropURL." />
<ParseBlobUrl BlobUrl="$(ChecksumCloudDropURL)">
<Output TaskParameter="BlobElements" ItemName="BlobElements" />
</ParseBlobUrl>
<PropertyGroup>
<ChecksumBlobContainerName>%(BlobElements.ContainerName)</ChecksumBlobContainerName>
<ChecksumBlobAccountName>%(BlobElements.AccountName)</ChecksumBlobAccountName>
</PropertyGroup>
</Target>
<Target Name="CheckIfAllBuildsHavePublished">
<CheckIfAllBuildsHavePublished AccountKey="$(ArtifactCloudDropAccessToken)"
AccountName="$(ArtifactBlobAccountName)"
ContainerName="$(ArtifactBlobContainerName)"
AccountName="$(ArtifactCloudDropAccountName)"
ContainerName="$(ArtifactContainerName)"
NugetVersion="$(FullNugetVersion)"
VersionBadgeMoniker="$(VersionBadgeMoniker)">
<Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
@ -45,17 +16,17 @@
</Target>
<Target Name="FinalizeBuild" Condition=" '$(HaveAllBuildsPublished)' == 'True' ">
<CopyBlobsToLatest AccountName="$(ArtifactBlobAccountName)"
<CopyBlobsToLatest AccountName="$(ArtifactCloudDropAccountName)"
AccountKey="$(ArtifactCloudDropAccessToken)"
ContainerName="$(ArtifactBlobContainerName)"
ContainerName="$(ArtifactContainerName)"
NugetVersion="$(FullNugetVersion)"
Channel="$(Channel)"
CommitHash="$(CommitHash)"
Coherent="$(Coherent)" />
<CopyBlobsToLatest AccountName="$(ChecksumBlobAccountName)"
<CopyBlobsToLatest AccountName="$(ChecksumCloudDropAccountName)"
AccountKey="$(ChecksumCloudDropAccessToken)"
ContainerName="$(ChecksumBlobContainerName)"
ContainerName="$(ChecksumContainerName)"
NugetVersion="$(FullNugetVersion)"
Channel="$(Channel)"
CommitHash="$(CommitHash)"