Merge pull request #612 from dsplaisted/FixTargetingPacks

dsplaisted · web-flow · commit 65dabc458e7f · 2019-02-20T10:58:38.000-08:00
Fix targeting packs
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -33,6 +33,9 @@
   </PropertyGroup>
   <PropertyGroup>
     <NETStandardLibraryPackageVersion>2.1.0-prerelease.19078.1</NETStandardLibraryPackageVersion>
+    <!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package,
+         which ends up overriding the value set here. -->
+    <NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19066.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
@@ -239,7 +239,7 @@ Copyright (c) .NET Foundation. All rights reserved.
      <KnownFrameworkReference Include="NETStandard.Library"
                               TargetFramework="netstandard2.1"
                               TargetingPackName="NETStandard.Library"
-                              TargetingPackVersion="$(NETStandardLibraryPackageVersion)"
+                              TargetingPackVersion="$(NETSTandardTargetingPackVersion)"
                               TargetingPackFormat="NETStandardLegacy"
                               />
 
