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