From f9d2f753f983f284350e3d99fc5f7c071888b2d4 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 30 Aug 2017 10:39:44 -0500
Subject: [PATCH] Pass through the Configuration when restoring.

Since BaseIntermediateOutputPath depends on Configuration, it needs to be flown properly.


Commit migrated from https://github.com/dotnet/core-setup/commit/f320e6a8fc9336b01616fc53a49055983dfc9cc9
---
 src/installer/build.proj                           | 2 +-
 src/installer/sharedFramework/sharedFramework.proj | 8 ++++++--
 src/installer/test/dir.proj                        | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/installer/build.proj b/src/installer/build.proj
index f123037..667eb78 100644
--- a/src/installer/build.proj
+++ b/src/installer/build.proj
@@ -36,7 +36,7 @@
 
   <Target Name="BatchRestorePackages" Condition="'$(RestoreDuringBuild)'=='true'">
     <Message Importance="High" Text="Restoring all packages..." />
-    <Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot;" StandardOutputImportance="Low" />
+    <Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; $(MSBuildPassThroughPropertyList)" StandardOutputImportance="Low" />
   </Target>
 
   <Import Project="dir.targets" />
diff --git a/src/installer/sharedFramework/sharedFramework.proj b/src/installer/sharedFramework/sharedFramework.proj
index 8a7d0f9..629659d 100644
--- a/src/installer/sharedFramework/sharedFramework.proj
+++ b/src/installer/sharedFramework/sharedFramework.proj
@@ -16,6 +16,10 @@
     </BuildTargets>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <CommonProjectArgs>$(MSBuildPassThroughPropertyList) /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid)</CommonProjectArgs>
+  </PropertyGroup>
+
   <Target Name="Build" DependsOnTargets="$(BuildTargets)" />
 
   <Target Name="PublishSharedFrameworkAndSharedHost"
@@ -23,7 +27,7 @@
     
     <PropertyGroup>
       <SharedFrameworkSourceRoot>$(MSBuildThisFileDirectory)framework</SharedFrameworkSourceRoot>
-      <CommonSharedFrameworkArgs>/p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion)</CommonSharedFrameworkArgs>
+      <CommonSharedFrameworkArgs>$(CommonProjectArgs) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion)</CommonSharedFrameworkArgs>
     </PropertyGroup>  
 
     <RemoveDir Directories="$(SharedFrameworkNameAndVersionRoot)" />
@@ -133,7 +137,7 @@
   <Target Name="RestoreLockedCoreHost">
     <PropertyGroup>
       <LockedHostSourceRoot>$(MSBuildThisFileDirectory)lockedhost</LockedHostSourceRoot>
-      <CommonLockedHostArgs>/p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) /p:HostResolverVersion=$(HostResolverVersion) /p:HostVersion=$(HostVersion)</CommonLockedHostArgs>
+      <CommonLockedHostArgs>$(CommonProjectArgs) /p:HostResolverVersion=$(HostResolverVersion) /p:HostVersion=$(HostVersion)</CommonLockedHostArgs>
     </PropertyGroup>
 
     <RemoveDir Directories="$(CoreHostLockedDir)" />
diff --git a/src/installer/test/dir.proj b/src/installer/test/dir.proj
index 3f1898a..dfce040 100644
--- a/src/installer/test/dir.proj
+++ b/src/installer/test/dir.proj
@@ -47,7 +47,7 @@
       <RestoreSourceArg>@(RestoreTestSource->'--source %(Identity)', ' ')</RestoreSourceArg>
       <RestoreSourceArg>$(RestoreSourceArg) @(RestoreTestFallbackSource->'--source %(Identity)', ' ')</RestoreSourceArg>
       <RestoreArgs>--disable-parallel --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(RestoreSourceArg)</RestoreArgs>
-      <RestoreArgs>$(RestoreArgs) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid)</RestoreArgs>
+      <RestoreArgs>$(RestoreArgs) $(MSBuildPassThroughPropertyList) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid)</RestoreArgs>
       <RestorePrefix Condition="'$(OsEnvironment)' != 'Windows_NT'">DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1</RestorePrefix>
     </PropertyGroup>
 
@@ -59,7 +59,7 @@
           DependsOnTargets="DetermineTestOutputDirectory">
 
     <PropertyGroup>
-      <BuildArgs>--configuration $(ConfigurationGroup)</BuildArgs>
+      <BuildArgs>$(MSBuildPassThroughPropertyList)</BuildArgs>
     </PropertyGroup>
 
     <Message Text="Building Tests" Importance="High" />
@@ -84,7 +84,7 @@
       <SystemPathTestsOutputDir>$([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)'))</SystemPathTestsOutputDir>   
     </PropertyGroup>
     <PropertyGroup>
-      <TestArgs>--configuration $(ConfigurationGroup)</TestArgs>
+      <TestArgs>$(MSBuildPassThroughPropertyList)</TestArgs>
       <IsCrossArch Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel'">true</IsCrossArch>
       <TestResultsXml>$(TestsOutputDir)$(TestProjectFilename)-testResults.trx</TestResultsXml>
     </PropertyGroup>
-- 
2.7.4