Merge branch 'master' into merge-preview3-to-master

This commit is contained in:
Daniel Plaisted 2019-02-21 16:03:37 -08:00 committed by GitHub
commit 890673b833
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -26,9 +26,9 @@
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>de6587837888584f67b0d4fe389c40e704c19e9f</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19121.2">
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19121.3">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>3cacfd2a016ecbb064a0bb2379aaf55c9cba1f1d</Sha>
<Sha>4a006e962fc5c5651b7712028e0e352b1e011a58</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19111.1">
<Uri>https://github.com/dotnet/cli</Uri>

View file

@ -36,7 +36,7 @@
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19121.2</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19121.3</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>