diff options
| author | Wes Haggard <weshaggard@users.noreply.github.com> | 2017-02-08 00:25:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 00:25:23 +0300 |
| commit | 38c0217a9e2e4a56fd1b4478b1f2e861c585ff49 (patch) | |
| tree | a71256aa286eb84fcbccf50ac1c60c2900d946aa | |
| parent | 7291cf0408f126ce805ab63e8e0ec04fcb1395e6 (diff) | |
| parent | 1c401817c5b24a3d67d7c197374899c0376c2d5c (diff) | |
Merge pull request #15924 from weshaggard/AddStandardAutoUpdate
Switch to using the full PackageId for NETStandard.Library Package
| -rw-r--r-- | dependencies.props | 7 | ||||
| -rw-r--r-- | external/netstandard/netstandard.depproj | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/dependencies.props b/dependencies.props index fb7ed95d2e..d40f6b0fff 100644 --- a/dependencies.props +++ b/dependencies.props @@ -31,7 +31,8 @@ <CoreClrExpectedPrerelease>beta-25007-01</CoreClrExpectedPrerelease> <ExternalExpectedPrerelease>beta-25005-00</ExternalExpectedPrerelease> <ProjectNTfsExpectedPrerelease>beta-25007-00</ProjectNTfsExpectedPrerelease> - <StandardExpectedPrerelease>beta-25006-01</StandardExpectedPrerelease> + <NETStandardPackageVersion>2.0.0-beta-25006-01</NETStandardPackageVersion> + <NETStandardPackageId>NETStandard.Library</NETStandardPackageId> <!-- Use the SNI runtime package --> <SniPackageVersion>4.4.0-beta-25007-01</SniPackageVersion> </PropertyGroup> @@ -96,8 +97,8 @@ </XmlUpdateStep> <XmlUpdateStep Include="Standard"> <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>StandardExpectedPrerelease</ElementName> - <BuildInfoName>Standard</BuildInfoName> + <ElementName>NETStandardPackageVersion</ElementName> + <PackageId>$(NETStandardPackageId)</PackageId> </XmlUpdateStep> <XmlUpdateStep Condition="'$(DisableProjectNTfsAutoUpgrade)' != 'true'" Include="ProjectNTfs"> <Path>$(MSBuildThisFileFullPath)</Path> diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj index 4553750dec..4db52b05eb 100644 --- a/external/netstandard/netstandard.depproj +++ b/external/netstandard/netstandard.depproj @@ -14,7 +14,7 @@ <_NETStandardTFMFolder Condition="'$(NuGetTargetMoniker)' == '.NETStandard,Version=v2.0'">netstandard2.0</_NETStandardTFMFolder> <_NETStandardTFMFolder Condition="'$(IsNetFx)' == 'true'">net461</_NETStandardTFMFolder> </PropertyGroup> - + <ItemGroup> <!-- for all configurations this project provides refs for that configuration --> <BinplaceConfiguration Include="$(Configuration)"> @@ -23,19 +23,17 @@ <RuntimePath>$(RuntimePath)</RuntimePath> </BinplaceConfiguration> </ItemGroup> - + <Target Name="AddNETStandardRefs" AfterTargets="ResolveReferences" Condition="'$(_NETStandardTFMFolder)' != ''"> <PropertyGroup> - <_NETStandardPackageId>NETStandard.Library</_NETStandardPackageId> - <_NETStandardPackageVersion>2.0.0-$(StandardExpectedPrerelease)</_NETStandardPackageVersion> - <_NETStandardRefFolder>$(PackagesDir)$(_NETStandardPackageId)\$(_NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder> + <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder> </PropertyGroup> <ItemGroup> <Reference Include="$(_NETStandardRefFolder)\*.dll"> <Private>False</Private> - <NuGetPackageId>NETStandard.Library</NuGetPackageId> - <NuGetPackageVersion>$(_NETStandardPackageVersion)</NuGetPackageVersion> + <NuGetPackageId>$(NETStandardPackageId)</NuGetPackageId> + <NuGetPackageVersion>$(NETStandardPackageVersion)</NuGetPackageVersion> </Reference> </ItemGroup> </Target> |