From a5783855f3e397241abcd9a4a2cab5a4622dbe68 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Fri, 8 Sep 2017 12:52:47 -0700
Subject: [PATCH 1/2] Use a file list rather than globbing NETStandard
 assemblies

This change minimizes the amount of work done during project evaluation by directly
setting the reference items to all the files/paths we know are part of the package.
---
 netstandard/pkg/NETStandard.Library.pkgproj   | 33 +++++++++++--------
 .../pkg/targets/NETStandard.Library.targets   | 23 -------------
 .../netstandard/NETStandard.Library.targets   | 29 ++++++++++++----
 3 files changed, 42 insertions(+), 43 deletions(-)
 delete mode 100644 netstandard/pkg/targets/NETStandard.Library.targets

diff --git a/netstandard/pkg/NETStandard.Library.pkgproj b/netstandard/pkg/NETStandard.Library.pkgproj
index 2bfc745fe..2780b0bca 100644
--- a/netstandard/pkg/NETStandard.Library.pkgproj
+++ b/netstandard/pkg/NETStandard.Library.pkgproj
@@ -9,23 +9,23 @@
     <OmitDependencies>true</OmitDependencies>
     <SkipValidatePackage>true</SkipValidatePackage>
     <TargetsFileName>NETStandard.Library.targets</TargetsFileName>
-    <RootTargetsTemplate>targets\$(TargetsFileName)</RootTargetsTemplate>
-    <RootTargetsSource>$(IntermediateOutputPath)$(TargetsFileName)</RootTargetsSource>
+    <VersionTargetsTemplate>targets\netstandard\$(TargetsFileName)</VersionTargetsTemplate>
     <NETStandardVersion>netstandard2.0</NETStandardVersion>
+    <VersionTargetsSource>$(IntermediateOutputPath)$(NETStandardVersion)\$(TargetsFileName)</VersionTargetsSource>
   </PropertyGroup>
 
   <Import Project="NETStandard.Library.dependencies.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\ref\netstandard.csproj" />
-    <ProjectReference Include="shims\netstandard\dir.builds" />
-    <ProjectReference Include="shims\netfx\dir.builds" />
-
-    <File Include="$(RootTargetsSource)">
-      <TargetPath>build/$(Id).targets</TargetPath>
-    </File>
-
-    <File Include="targets\netstandard\$(TargetsFileName)">
+    <ProjectReference Include="shims\netstandard\dir.builds">
+      <Facade>true</Facade>
+    </ProjectReference>
+    <ProjectReference Include="shims\netfx\dir.builds">
+      <Facade>true</Facade>
+    </ProjectReference>
+
+    <File Include="$(VersionTargetsSource)">
       <TargetPath>build/$(NETStandardVersion)/$(Id).targets</TargetPath>
     </File>
 
@@ -34,11 +34,16 @@
     </File>
   </ItemGroup>
 
-  <Target Name="StampPackageVersionInTargets" BeforeTargets="GenerateNuSpec">
-    <MakeDir Directories="$(IntermediateOutputPath)" />
+  <Target Name="StampTargets" BeforeTargets="GenerateNuSpec">
+    <PropertyGroup>
+      <_FacadeFiles Condition="'%(File.Facade)' == 'true' AND '%(File.Extension)' == '.dll'" >@(File->'%24(MSBuildThisFileDirectory)\ref\%(FileName)%(Extension)')</_FacadeFiles>
+    </PropertyGroup>
+    <Error Condition="'$(_FacadeFiles)' == ''" Text="Could not determine facade file names to write to targets" />
+
+    <MakeDir Directories="$(IntermediateOutputPath)$(NETStandardVersion)" />
 
-    <WriteLinesToFile File="$(RootTargetsSource)"
-                      Lines="$([System.IO.File]::ReadAllText('$(RootTargetsTemplate)').Replace('#VERSION#', '$(PackageVersion)'))"
+    <WriteLinesToFile File="$(VersionTargetsSource)"
+                      Lines="$([System.IO.File]::ReadAllText('$(VersionTargetsTemplate)').Replace('#VERSION#', '$(PackageVersion)').Replace('#NETSTANDARDFACADES#', '$(_FacadeFiles)'))"
                       Overwrite="true" />
   </Target>
 
diff --git a/netstandard/pkg/targets/NETStandard.Library.targets b/netstandard/pkg/targets/NETStandard.Library.targets
deleted file mode 100644
index ff3355ed1..000000000
--- a/netstandard/pkg/targets/NETStandard.Library.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <NETStandardLibraryPackageVersion>#VERSION#</NETStandardLibraryPackageVersion>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(_NetStandardLibraryRefPath)' != ''">
-    <Reference Include="$(_NetStandardLibraryRefPath)*.dll">
-      <!-- Private = false to make these reference only -->
-      <Private>false</Private>
-      <!-- hide these from Assemblies view in Solution Explorer, they will be shown under packages -->
-      <Visible>false</Visible>
-      <Facade Condition="'%(FileName)' != 'netstandard'">true</Facade>
-      <NuGetPackageId>NETStandard.Library</NuGetPackageId>
-      <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>
-    </Reference>
-    <ReferenceCopyLocalPaths Condition="'$(_NetStandardLibraryLibPath)' != ''" Include="$(_NetStandardLibraryLibPath)*.dll">
-      <Private>false</Private>
-      <Facade Condition="'%(FileName)' != 'netstandard'">true</Facade>
-      <NuGetPackageId>NETStandard.Library</NuGetPackageId>
-      <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>
-    </ReferenceCopyLocalPaths>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/netstandard/pkg/targets/netstandard/NETStandard.Library.targets b/netstandard/pkg/targets/netstandard/NETStandard.Library.targets
index b654df8d5..d3a5a2c2e 100644
--- a/netstandard/pkg/targets/netstandard/NETStandard.Library.targets
+++ b/netstandard/pkg/targets/netstandard/NETStandard.Library.targets
@@ -1,12 +1,29 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <NETStandardLibraryPackageVersion>#VERSION#</NETStandardLibraryPackageVersion>
+  </PropertyGroup>
+
   <!-- Only add references if we're actually targeting .NETStandard.
        If the project is targeting some other TFM that is compatible with NETStandard we expect
        that framework to provide all references for NETStandard, mscorlib, System.* in their own
        targeting pack / SDK. -->
-  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
-    <_NetStandardLibraryRefPath>$(MSBuildThisFileDirectory)\ref\</_NetStandardLibraryRefPath>
-  </PropertyGroup>
-
-  <!-- import the TFM-agnostic targets -->
-  <Import Project="..\$(MSBuildThisFile)"/>
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
+    <Reference Include="$(MSBuildThisFileDirectory)\ref\netstandard.dll">
+      <!-- Private = false to make these reference only -->
+      <Private>false</Private>
+      <!-- hide these from Assemblies view in Solution Explorer, they will be shown under packages -->
+      <Visible>false</Visible>
+      <NuGetPackageId>NETStandard.Library</NuGetPackageId>
+      <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>    
+    </Reference>
+    <Reference Include="#NETSTANDARDFACADES#">
+      <Facade>true</Facade>
+      <!-- Private = false to make these reference only -->
+      <Private>false</Private>
+      <!-- hide these from Assemblies view in Solution Explorer, they will be shown under packages -->
+      <Visible>false</Visible>
+      <NuGetPackageId>NETStandard.Library</NuGetPackageId>
+      <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file

From fb1efaaf80f165562edd89447f63e57ea1b117ad Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Mon, 25 Sep 2017 10:22:55 -0700
Subject: [PATCH 2/2] Bump NETStandard.Library package version for servicing

---
 netstandard/pkg/NETStandard.Library.pkgproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netstandard/pkg/NETStandard.Library.pkgproj b/netstandard/pkg/NETStandard.Library.pkgproj
index 2780b0bca..e24e79519 100644
--- a/netstandard/pkg/NETStandard.Library.pkgproj
+++ b/netstandard/pkg/NETStandard.Library.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <HarvestStablePackage>false</HarvestStablePackage>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <OmitDependencies>true</OmitDependencies>