From 63e706b96516834de67ab676eb6402613497d526 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Apr 2018 13:56:38 -0700
Subject: [PATCH 1/3] Skip container creation Container creation isn't required
 and would be incorrect if the ExpectedFeedUrl's account name didn't match
 AccountName.

---
 src/publish.proj | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/publish.proj b/src/publish.proj
index 37d9d277cc65..0ab767f9a4d1 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)"
@@ -75,12 +69,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)"
@@ -113,12 +101,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)"

From e1c96129020132174b09ac7862495884637ef48f Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Apr 2018 15:45:32 -0700
Subject: [PATCH 2/3] Revert "Skip container creation"

This reverts commit 63e706b96516834de67ab676eb6402613497d526.
---
 src/publish.proj | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/publish.proj b/src/publish.proj
index 0ab767f9a4d1..37d9d277cc65 100644
--- a/src/publish.proj
+++ b/src/publish.proj
@@ -38,6 +38,12 @@
       </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)"
@@ -69,6 +75,12 @@
       </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)"
@@ -101,6 +113,12 @@
       </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)"

From a11c9d1a9817740967d98ce97807084fcd0e271e Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Apr 2018 15:47:53 -0700
Subject: [PATCH 3/3] Don't create container if not flatcontainer mode

---
 src/publish.proj | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/publish.proj b/src/publish.proj
index 37d9d277cc65..14158259d12f 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)"