Make restore of external 2-pass

Commit migrated from https://github.com/dotnet/corefx/commit/c8e44c3d027d0539e7f9091336cc48e59e7d03e8

diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 6e23026..3d2f713 100644 (file)
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -27,6 +27,7 @@
       <_RestoreProjects Include="external\dir.proj" />
     </ItemGroup>
 
+    <MSBuild Projects="@(_RestoreProjects)" Properties="$(ProjectProperties);DefaultBuildAllTarget=Restore" />
     <MSBuild Projects="@(_RestoreProjects)" Properties="$(ProjectProperties)" />
   </Target>
 

diff --git a/src/libraries/external/Directory.Build.props b/src/libraries/external/Directory.Build.props
index 5971cb9..9564ed9 100644 (file)
--- a/src/libraries/external/Directory.Build.props
+++ b/src/libraries/external/Directory.Build.props
@@ -9,4 +9,12 @@
     <!-- let us control the output path -->
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
+  
+  <!-- don't bring in props/targets from packages, we're not consuming them we're
+       deploying them -->
+  <ItemDefinitionGroup>
+    <PackageReference>
+      <ExcludeAssets>Build</ExcludeAssets>
+    </PackageReference>
+  </ItemDefinitionGroup>
 </Project>
\ No newline at end of file

diff --git a/src/libraries/external/netstandard/netstandard.depproj b/src/libraries/external/netstandard/netstandard.depproj
index 3827443..efc29e5 100644 (file)
--- a/src/libraries/external/netstandard/netstandard.depproj
+++ b/src/libraries/external/netstandard/netstandard.depproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NETStandard.Library" ExcludeAssets="Build">
+    <PackageReference Include="NETStandard.Library">
       <Version>$(NETStandardLibraryPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>