From 04ac042451c1d5760ef98588d94467d0d11be228 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 8 Nov 2017 19:07:29 -0800
Subject: [PATCH 1/7] Changes in the Transport feed DLL requires our response;
 update Transport feed DLL version and base URL.

Defining "BuildTasksFeedDll" & relevent 'UsingTask' no longer needed as PublishNupkgToTransportFeed.targets uses the imported Microsoft.DotNet.Build.Tasks.Feed.targets to locate the Feed DLL
---
 NuGet.Config                                    |  3 +--
 build.proj                                      |  2 +-
 build/AzureInfo.props                           |  2 --
 build/Microsoft.DotNet.Cli.tasks                |  1 -
 .../publish/PublishNupkgToTransportFeed.targets | 17 ++++++-----------
 .../dotnet-cli-build/dotnet-cli-build.csproj    |  2 +-
 dir.props                                       |  1 -
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 9c645c984..95416b2f1 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -3,7 +3,7 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json" />
+    <add key="TransportFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
@@ -16,7 +16,6 @@
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
-    <add key="build_tools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
     <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
   </packageSources>
diff --git a/build.proj b/build.proj
index bac606d59..3f755df09 100644
--- a/build.proj
+++ b/build.proj
@@ -52,7 +52,7 @@
   <Import Project="build/Compile.targets" />
   <Import Project="build/Package.targets" />
   <Import Project="build/Test.targets" />
-  <Import Project="build/Publish.targets" />
+  <Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="build/Publish.targets" />
 
   <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index 9f323b42b..b651458ee 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -15,7 +15,5 @@
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
-    <TransportFeedCloudDropAccountName>$(TRANSPORTFEED_STORAGE_ACCOUNT)</TransportFeedCloudDropAccountName>
-    <TransportFeedCloudDropAccountName Condition="'$(TransportFeedCloudDropAccountName)' == ''">dotnetfeed</TransportFeedCloudDropAccountName>
   </PropertyGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
index 1c4bbac75..901a48f84 100644
--- a/build/Microsoft.DotNet.Cli.tasks
+++ b/build/Microsoft.DotNet.Cli.tasks
@@ -24,7 +24,6 @@
   <UsingTask TaskName="GenerateNuGetPackagesArchiveVersion" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="PushToBlobFeed" AssemblyFile="$(BuildTasksFeedDll)" />
   <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
   <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 2f41acfd1..939b02c01 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
+  
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />
   </ItemGroup>
 
   <PropertyGroup>
-    <RelativePath>packages</RelativePath>
+    <ExpectedFeedUrl>https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</ExpectedFeedUrl>
   </PropertyGroup>
 
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
-    <Error Condition="'$(TransportFeedContainerName)' == ''" Text="Missing property TransportFeedContainerName." />
-    <Error Condition="'$(TransportFeedCloudDropAccountName)' == ''" Text="Missing property TransportFeedCloudDropAccountName." />
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
 
-    <Message Text="Publish to $(TransportFeedContainerName) started" />
+    <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
-                AccountName="$(TransportFeedCloudDropAccountName)"
-                ContainerName="$(TransportFeedContainerName)"
-                IndexDirectory="$(IndexDirectory)"
+                ExpectedFeedUrl="$(ExpectedFeedUrl)"
                 ItemsToPush="@(NupkgsForPublishing)"
-                Overwrite="false"
-                PublishFlatContainer="false"
-                RelativePath="$(RelativePath)" />
-
+                Overwrite="false" />
   </Target>
 </Project>
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index 89dc0f323..c3413747d 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -29,6 +29,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-01929-02" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-02203-01" />
  </ItemGroup>
 </Project>
diff --git a/dir.props b/dir.props
index 7133cb74f..756fccc32 100644
--- a/dir.props
+++ b/dir.props
@@ -7,7 +7,6 @@
     <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
 
     <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
-    <BuildTasksFeedDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/Microsoft.DotNet.Build.Tasks.Feed.dll</BuildTasksFeedDll>
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>

From 7b593a8ec6ce0e0728e7687b380dd3a31f81560b Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 8 Nov 2017 19:42:41 -0800
Subject: [PATCH 2/7] Defining: "BuildTasksFeedToolVersion"

---
 build/DependencyVersions.props                          | 1 +
 build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 748b3d8fa..b4b597844 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -50,5 +50,6 @@
   <PropertyGroup>
     <VersionToolsVersion>1.0.27-prerelease-01723-01</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
+    <BuildTasksFeedToolVersion>1.0.0-prerelease-02203-01</BuildTasksFeedToolVersion>
   </PropertyGroup>
 </Project>
diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
index c3413747d..86531abc4 100644
--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
+++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj
@@ -29,6 +29,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="1.0.0-prerelease-02203-01" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(BuildTasksFeedToolVersion)" />
  </ItemGroup>
 </Project>

From 95f30e3becc9d2d1061a44887781cd91f4b8bbfa Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 09:30:11 -0800
Subject: [PATCH 3/7] Moving conditional to load
 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj'

---
 build.proj                                        | 2 +-
 build/publish/PublishNupkgToTransportFeed.targets | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.proj b/build.proj
index 3f755df09..bac606d59 100644
--- a/build.proj
+++ b/build.proj
@@ -52,7 +52,7 @@
   <Import Project="build/Compile.targets" />
   <Import Project="build/Package.targets" />
   <Import Project="build/Test.targets" />
-  <Import Condition=" '$(GeneratePropsFile)' != 'true' " Project="build/Publish.targets" />
+  <Import Project="build/Publish.targets" />
 
   <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 939b02c01..053ee47af 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
-  
+  <PropertyGroup>
+    <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
+  </PropertyGroup>
+
+  <Import Condition="Exists('$(BuildTasksFeedToolTargetsFileName)')" Project="$(BuildTasksFeedToolTargetsFileName)" />
+
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />

From 31fd2312b0642183dc4a37bae92a306fbab37c67 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:11:25 -0800
Subject: [PATCH 4/7] Make the "ExpectedFeedUrl" fully configurable.

---
 build/AzureInfo.props                             | 2 ++
 build/publish/PublishNupkgToTransportFeed.targets | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index b651458ee..df686e43e 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -14,6 +14,8 @@
     <ChecksumCloudDropAccountName Condition="'$(ChecksumCloudDropAccountName)' == ''">dotnetclichecksums</ChecksumCloudDropAccountName>
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
+    <TransportFeedExpectedURL>$(TRANSPORTFEED_EXPECTED_URL)</TransportFeedExpectedURL>
+    <TransportFeedExpectedURL Condition="'$(TransportFeedContainerName)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
   </PropertyGroup>
 </Project>
diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 053ee47af..82fd2839d 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -4,7 +4,7 @@
     <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
   </PropertyGroup>
 
-  <Import Condition="Exists('$(BuildTasksFeedToolTargetsFileName)')" Project="$(BuildTasksFeedToolTargetsFileName)" />
+  <Import Condition="'$(GeneratePropsFile)' != 'true'" Project="$(BuildTasksFeedToolTargetsFileName)" />
 
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />
@@ -12,12 +12,13 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <ExpectedFeedUrl>https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</ExpectedFeedUrl>
+    <ExpectedFeedUrl>$(TransportFeedExpectedURL)</ExpectedFeedUrl>
   </PropertyGroup>
 
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
-
+    <Error Condition="'$(TransportFeedExpectedURL)' == ''" Text="Missing property TransportFeedExpectedURL." />
+    
     <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
                 ExpectedFeedUrl="$(ExpectedFeedUrl)"

From 14be2fc2a8e7736f2cdf7e3dbe114547b7ef69b5 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:14:56 -0800
Subject: [PATCH 5/7] Fixed an incorrect conditional.

---
 build/AzureInfo.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index df686e43e..2773a817c 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -15,7 +15,7 @@
     <TransportFeedContainerName>$(TRANSPORTFEED_STORAGE_CONTAINER)</TransportFeedContainerName>
     <TransportFeedContainerName Condition="'$(TransportFeedContainerName)' == ''">dotnet-core</TransportFeedContainerName>
     <TransportFeedExpectedURL>$(TRANSPORTFEED_EXPECTED_URL)</TransportFeedExpectedURL>
-    <TransportFeedExpectedURL Condition="'$(TransportFeedContainerName)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
+    <TransportFeedExpectedURL Condition="'$(TransportFeedExpectedURL)' == ''">https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json</TransportFeedExpectedURL>
     <TransportFeedCloudDropAccessToken>$(TRANSPORTFEED_STORAGE_KEY)</TransportFeedCloudDropAccessToken>
   </PropertyGroup>
 </Project>

From ef22bb23fcd133af1e1d6a7a9f0cf8d0a3654e75 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 12:17:25 -0800
Subject: [PATCH 6/7] Simplified some logic.

---
 build/publish/PublishNupkgToTransportFeed.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index 82fd2839d..c610edc2f 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -11,17 +11,13 @@
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.MSBuildSdkResolver.*.nupkg" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <ExpectedFeedUrl>$(TransportFeedExpectedURL)</ExpectedFeedUrl>
-  </PropertyGroup>
-
   <Target Name="PublishNupkgToTransportFeed" Condition=" '$(PUBLISH_NUPKG_TO_TRANSPORT_FEED)' == 'true' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " >
     <Error Condition="'$(TransportFeedCloudDropAccessToken)' == ''" Text="Missing property TransportFeedCloudDropAccessToken." />
     <Error Condition="'$(TransportFeedExpectedURL)' == ''" Text="Missing property TransportFeedExpectedURL." />
     
     <Message Text="Publish NuPkgs to Transport feed started" />
     <PushToBlobFeed AccountKey="$(TransportFeedCloudDropAccessToken)"
-                ExpectedFeedUrl="$(ExpectedFeedUrl)"
+                ExpectedFeedUrl="$(TransportFeedExpectedURL)"
                 ItemsToPush="@(NupkgsForPublishing)"
                 Overwrite="false" />
   </Target>

From 85e79297c35f9a17c7d508cc595d50011cf0ea65 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 9 Nov 2017 13:38:33 -0800
Subject: [PATCH 7/7] Simplified logic; part 2.

---
 build/publish/PublishNupkgToTransportFeed.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets
index c610edc2f..19dd03e71 100644
--- a/build/publish/PublishNupkgToTransportFeed.targets
+++ b/build/publish/PublishNupkgToTransportFeed.targets
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <BuildTasksFeedToolTargetsFileName>"$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets"</BuildTasksFeedToolTargetsFileName>
-  </PropertyGroup>
-
-  <Import Condition="'$(GeneratePropsFile)' != 'true'" Project="$(BuildTasksFeedToolTargetsFileName)" />
+  <Import Condition="'$(GeneratePropsFile)' != 'true'"  Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
 
   <ItemGroup>
     <NupkgsForPublishing Include="$(PackagesDirectory)/Microsoft.DotNet.Cli.Utils.*.nupkg" />