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] 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>