From f6691cff13e142bf0070d0c60d5faeb548e05df3 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 24 Jan 2019 13:12:57 -0800
Subject: [PATCH] Move property group after import

---
 eng/Publishing.props | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index ff1a990bc..2846f7c9e 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -13,12 +13,6 @@
     <ChecksumsAccountKey>$(DotNetPublishChecksumsBlobFeedKey)</ChecksumsAccountKey>
     <SdkAssetsFeedUrl>$(DotnetPublishSdkAssetsBlobFeedUrl)</SdkAssetsFeedUrl>
     <SdkAssetsAzureAccountKey>$(DotNetPublishSdkAssetsBlobFeedKey)</SdkAssetsAzureAccountKey>
-    <!-- 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 RID -->
-    <AssetManifestFileName>$(OS)-$(PlatformName)</AssetManifestFileName>
-    <AssetManifestFileName Condition="'$(Rid)' != ''">$(AssetManifestFileName)-$(Rid)</AssetManifestFileName>
-    <AssetManifestFileName>$(AssetManifestFileName).xml</AssetManifestFileName>
-    <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName)</AssetManifestFilePath>
 
     <PublishSdkAssetsAndChecksumsToBlob>false</PublishSdkAssetsAndChecksumsToBlob>
     <PublishSdkAssetsAndChecksumsToBlob Condition=" '$(ChecksumsFeedUrl)' != '' and '$(SdkAssetsFeedUrl)' != '' ">true</PublishSdkAssetsAndChecksumsToBlob>
@@ -27,6 +21,15 @@
   </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 RID -->
+      <AssetManifestFileName>$(OS)-$(PlatformName)</AssetManifestFileName>
+      <AssetManifestFileName Condition="'$(Rid)' != ''">$(AssetManifestFileName)-$(Rid)</AssetManifestFileName>
+      <AssetManifestFileName>$(AssetManifestFileName).xml</AssetManifestFileName>
+      <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName)</AssetManifestFilePath>
+  </PropertyGroup>
 
   <ItemGroup>
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />