From b1fdf27f6192c35f96d4f7a3199f6f55410b3bd6 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 6 Aug 2019 10:47:56 -0700
Subject: [PATCH] Clean up #12854 a bit - remove incorrect comment - do not
 completely overwrite `$(RestoreAdditionalProjectSources)` values

---
 NuGet.config                                                    | 1 -
 .../test/Infrastructure/GenerateTestProps.targets               | 2 +-
 .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj  | 2 +-
 src/SiteExtensions/Sdk/SiteExtension.targets                    | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 61a7c1b08c..d0a37a8d8e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Keep this file in sync with src/ProjectTemplates/test/Infrastructure/NuGet.config.in. -->
 <configuration>
   <packageSources>
     <clear />
diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
index 566502471f..df2b4e5e1b 100644
--- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
+++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
@@ -6,7 +6,7 @@
     Condition="$(DesignTimeBuild) != true">
     <PropertyGroup>
       <PropsProperties>
-        RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
+        RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
         MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
         MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
         MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
index 6fc9867298..7054d0908d 100644
--- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
+++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
@@ -17,7 +17,7 @@
     <NoSemVer20>true</NoSemVer20>
 
     <!-- Grab packages LB.csproj should have just built. -->
-    <RestoreAdditionalProjectSources>$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets
index 304dfdd917..320ea9fb3d 100644
--- a/src/SiteExtensions/Sdk/SiteExtension.targets
+++ b/src/SiteExtensions/Sdk/SiteExtension.targets
@@ -15,6 +15,7 @@
       <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
       <_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
       <_RsRestoreSources>
+        $(RestoreAdditionalProjectSources);
         $(ArtifactsShippingPackagesDir);
         $(ArtifactsNonShippingPackagesDir)
       </_RsRestoreSources>