From b78ee81a1e6a063a3020498ded9fe23b2094de7c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 26 Oct 2018 09:57:45 -0700
Subject: [PATCH] Flow DotNetRestoreSourcePropsPath and
 DotNetPackageVersionPropsPath into the shared framework build steps

---
 build/SharedFx.targets | 17 +++++++++++------
 build/sources.props    |  4 ----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index c2d5d7ed5a..f5db4c1b86 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -14,29 +14,34 @@
     <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Redist\*.*proj" />
   </ItemGroup>
 
-  <Target Name="_BuildSharedFxProjects" DependsOnTargets="ResolveCommitHash">
+  <Target Name="BuildSharedFx" DependsOnTargets="_BuildSharedFxProjects;TestSharedFx"/>
+
+  <Target Name="_BuildSharedFxProjects" DependsOnTargets="GeneratePropsFiles;ResolveCommitHash">
 
     <PropertyGroup>
       <_RestoreGraphProjectInput>@(ProjectToBuild)</_RestoreGraphProjectInput>
+      <SharedFxBuildProperties>
+        $(SolutionProperties);
+        DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
+        DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)
+      </SharedFxBuildProperties>
     </PropertyGroup>
 
     <MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets"
              Targets="Restore"
-             Properties="$(SolutionProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
+             Properties="$(SharedFxBuildProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
 
     <MSBuild Projects="@(ProjectToBuild)"
-             Properties="$(SolutionProperties)"
+             Properties="$(SharedFxBuildProperties)"
              BuildInParallel="true" />
 
     <MSBuild Projects="@(ProjectToBuild)"
              Targets="Pack"
-             Properties="$(SolutionProperties);NoBuild=true"
+             Properties="$(SharedFxBuildProperties);NoBuild=true"
              BuildInParallel="true"
              SkipNonexistentTargets="true" />
   </Target>
 
-  <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;_BuildSharedFxProjects;TestSharedFx"/>
-
   <Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;InstallDotNet">
     <PropertyGroup>
 
diff --git a/build/sources.props b/build/sources.props
index 7f3d24608f..a08e49dfdb 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -7,10 +7,6 @@
       $(DotNetAdditionalRestoreSources);
       $(DotNetRestoreSources);
     </RestoreSources>
-    <RestoreSources Condition="Exists('$(RepositoryRoot)artifacts/build/')">
-      $(RepositoryRoot)artifacts/build/;
-      $(DotNetRestoreSources);
-    </RestoreSources>
     <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
       $(RestoreSources);
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;