diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2018-04-18 20:25:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 20:25:32 -0700 |
| commit | 819a2f6f8fb76ae617e34001d717fa57d5b3ffeb (patch) | |
| tree | 6338c7ffbf0bc71cfa0ee8e54bee2a43c20b89d9 | |
| parent | 1ac9b830805c32128eb0876ea029d084bf2c3b9a (diff) | |
| download | coreclr-819a2f6f8fb76ae617e34001d717fa57d5b3ffeb.tar.gz coreclr-819a2f6f8fb76ae617e34001d717fa57d5b3ffeb.tar.bz2 coreclr-819a2f6f8fb76ae617e34001d717fa57d5b3ffeb.zip | |
Skip container creation (#17655)
Skip container creation if not in flatcontainer mode
Container creation isn't required and would be incorrect if the ExpectedFeedUrl's account name didn't match AccountName
| -rw-r--r-- | src/publish.proj | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/publish.proj b/src/publish.proj index 37d9d277cc..14158259d1 100644 --- a/src/publish.proj +++ b/src/publish.proj @@ -38,12 +38,6 @@ </ItemsToPush> </ItemGroup> - <!-- create the container if it doesn't exist --> - <CreateAzureContainer AccountKey="$(AccountKey)" - AccountName="$(AccountName)" - ContainerName="$(ContainerName)" - IsPublic="true" /> - <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'" ExpectedFeedUrl="$(ExpectedFeedUrl)" AccountKey="$(AccountKey)" @@ -54,6 +48,13 @@ ManifestBranch="$(ManifestBranch)" ManifestCommit="$(ManifestCommit)" /> + <!-- create the container if it doesn't exist --> + <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'" + AccountKey="$(AccountKey)" + AccountName="$(AccountName)" + ContainerName="$(ContainerName)" + IsPublic="true" /> + <!-- now upload the items --> <UploadToAzure Condition="'$(PublishFlatContainer)' == 'true'" AccountKey="$(AccountKey)" @@ -75,12 +76,6 @@ </ItemsToPush> </ItemGroup> - <!-- create the container if it doesn't exist --> - <CreateAzureContainer AccountKey="$(AccountKey)" - AccountName="$(AccountName)" - ContainerName="$(ContainerName)" - IsPublic="true" /> - <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'" ExpectedFeedUrl="$(ExpectedFeedUrl)" AccountKey="$(AccountKey)" @@ -91,6 +86,13 @@ ManifestBranch="$(ManifestBranch)" ManifestCommit="$(ManifestCommit)" /> + <!-- create the container if it doesn't exist --> + <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'" + AccountKey="$(AccountKey)" + AccountName="$(AccountName)" + ContainerName="$(ContainerName)" + IsPublic="true" /> + <!-- now upload the items --> <UploadToAzure Condition="'$(PublishFlatContainer)' == 'true'" AccountKey="$(AccountKey)" @@ -113,18 +115,19 @@ </ItemsToPush> </ItemGroup> - <!-- create the container if it doesn't exist --> - <CreateAzureContainer AccountKey="$(AccountKey)" - AccountName="$(AccountName)" - ContainerName="$(ContainerName)" - IsPublic="true" /> - <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'" ExpectedFeedUrl="$(ExpectedFeedUrl)" AccountKey="$(AccountKey)" ItemsToPush="@(ItemsToPush)" Overwrite="$(OverwriteOnPublish)" /> + <!-- create the container if it doesn't exist --> + <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'" + AccountKey="$(AccountKey)" + AccountName="$(AccountName)" + ContainerName="$(ContainerName)" + IsPublic="true" /> + <!-- now upload the items --> <UploadToAzure Condition="'$(PublishFlatContainer)' == 'true'" AccountKey="$(AccountKey)" |