Merge pull request #713 from ericstj/fixOldProjectSystemWarnings-rel2.0

[release/2.0.0] Fix old project system warnings
dotnet · Apr 19, 2018 · d23ee8a · d23ee8a
2 parents bb6d7bb + 3c51876
commit d23ee8a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git 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.2</Version>
+    <Version>2.0.3</Version>
     <HarvestStablePackage>false</HarvestStablePackage>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <OmitDependencies>true</OmitDependencies>
@@ -36,7 +36,7 @@
 
   <Target Name="StampTargets" BeforeTargets="GenerateNuSpec">
     <PropertyGroup>
-      <_FacadeFiles Condition="'%(File.Facade)' == 'true' AND '%(File.Extension)' == '.dll'" >@(File->'%24(MSBuildThisFileDirectory)\ref\%(FileName)%(Extension)')</_FacadeFiles>
+      <_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" />
 

diff --git a/netstandard/pkg/targets/netstandard/NETStandard.Library.targets b/netstandard/pkg/targets/netstandard/NETStandard.Library.targets
@@ -6,24 +6,30 @@
   <!-- 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. -->
-  <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>
+       targeting pack / SDK.
+       Choose/When is required to avoid an issue where the old desktop project system in VS 
+       will evaluate this item ignoring the condition in order to populate the references. -->
+  <Choose>
+    <When Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
+      <ItemGroup>
+        <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>
+    </When>
+  </Choose>
 </Project>