Merge pull request #1203 from dotnet/darc-master-aa7c1fce-5d46-43d7-9af0-1675f4e746de

[master] Update dependencies from dotnet/standard
This commit is contained in:
William Li 2019-04-05 11:10:44 -07:00 committed by GitHub
commit b728799ab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -46,9 +46,9 @@
<Uri>https://github.com/dotnet/toolset</Uri> <Uri>https://github.com/dotnet/toolset</Uri>
<Sha>881204d06947b0266ea43d586a2461c9386d0092</Sha> <Sha>881204d06947b0266ea43d586a2461c9386d0092</Sha>
</Dependency> </Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19204.1"> <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19205.1">
<Uri>https://github.com/dotnet/standard</Uri> <Uri>https://github.com/dotnet/standard</Uri>
<Sha>0362f55e37d73b7e607b2f256279caaac82c8725</Sha> <Sha>fbff1a0f87e029f968db2cbb573c8aa1e69705f9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19111.1"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19111.1">
<Uri>https://github.com/dotnet/cli</Uri> <Uri>https://github.com/dotnet/cli</Uri>

View file

@ -34,7 +34,7 @@
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19204.1</NETStandardLibraryPackageVersion> <NETStandardLibraryPackageVersion>2.1.0-prerelease.19205.1</NETStandardLibraryPackageVersion>
<!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package, <!-- 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. --> which ends up overriding the value set here. -->
<NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion> <NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>