From 4c6dfd118894ecd6e9edb64626bf5ab756d84bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Divino=20C=C3=A9sar?= <divcesar@gmail.com>
Date: Fri, 28 Feb 2020 14:01:01 -0800
Subject: [PATCH] Simplify eng\publishing.props (#6501)

With newer versions of Microsoft.DotNet.Build.Tasks.Feed you don't need to pass a temporary path to the manifest. I.e., we can remove AssetsTemporaryDirectory and associated code.
---
 eng/Publishing.props | 27 ++-------------------------
 eng/Versions.props   |  3 +--
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 7bf3a5f50..85a78b0c6 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -14,8 +14,6 @@
     <PublishBinariesAndBadge Condition=" '$(PublishBinariesAndBadge)' == '' ">true</PublishBinariesAndBadge>
   </PropertyGroup>
 
-  <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' " />
-  
   <PropertyGroup>
       <!-- Because we may be building in a container, we should use an asset manifest file path
              that exists in the container. Disambiguate the manifests via available properties.
@@ -111,9 +109,6 @@
       </ChecksumsWithSuffixToPushToBlobFeed>
     </ItemGroup>
 
-    <MakeDir Directories="$(DotnetTempWorkingDirectory)"/>
-    <MakeDir Directories="$(ChecksumTempWorkingDirectory)"/>
-
     <PushToAzureDevOpsArtifacts
       ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(SdkAssetsWithSuffixToPushToBlobFeed)"
       ManifestBuildData="Location=$(SdkAssetsFeedUrl)"
@@ -122,8 +117,7 @@
       ManifestBuildId="$(BUILD_BUILDNUMBER)"
       ManifestCommit="$(BUILD_SOURCEVERSION)"
       AssetManifestPath="$(DotNetAssetManifestFilePath)"
-      PublishFlatContainer="true"
-      AssetsTemporaryDirectory="$(DotnetTempWorkingDirectory)" />
+      PublishFlatContainer="true" />
 
     <PushToAzureDevOpsArtifacts
       ItemsToPush="@(ChecksumsToPushToBlobFeed);@(ChecksumsWithSuffixToPushToBlobFeed)"
@@ -133,23 +127,6 @@
       ManifestBuildId="$(BUILD_BUILDNUMBER)"
       ManifestCommit="$(BUILD_SOURCEVERSION)"
       AssetManifestPath="$(ChecksumsAssetManifestFilePath)"
-      PublishFlatContainer="true"
-      AssetsTemporaryDirectory="$(ChecksumTempWorkingDirectory)" />
-
-    <Copy
-      SourceFiles="$(DotNetAssetManifestFilePath)"
-      DestinationFolder="$(DotnetTempWorkingDirectory)\$(AssetManifestFileName)" />
-
-    <Copy
-      SourceFiles="$(ChecksumsAssetManifestFilePath)"
-      DestinationFolder="$(ChecksumTempWorkingDirectory)\$(ChecksumsAssetManifestFileName)" />
-
-    <Message
-      Text="##vso[artifact.upload containerfolder=AssetManifests;artifactname=AssetManifests]$(DotnetTempWorkingDirectory)/$(AssetManifestFileName)"
-      Importance="high" />
-
-    <Message
-      Text="##vso[artifact.upload containerfolder=AssetManifests;artifactname=AssetManifests]$(ChecksumTempWorkingDirectory)/$(ChecksumsAssetManifestFileName)"
-      Importance="high" />
+      PublishFlatContainer="true" />
   </Target>
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index c7f35a3a0..daf6f60ea 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -122,8 +122,7 @@
   </PropertyGroup>
   <!-- infrastructure and test only dependencies -->
   <PropertyGroup>
-    <BuildTasksFeedToolVersion>2.2.0-beta.19072.10</BuildTasksFeedToolVersion>
-    <VersionToolsVersion>$(BuildTasksFeedToolVersion)</VersionToolsVersion>
+    <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
     <MicrosoftNETTestSdkVersion>15.8.0</MicrosoftNETTestSdkVersion>
   </PropertyGroup>