huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev

This commit is contained in:
Mike Harder 2017-05-03 11:42:10 -07:00
parent bdd3ff6d0e db517803c8
commit cfc41d3845
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/dependencies.props
View File

@ -1,6 +1,14 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<AspNetCoreVersion>2.0.0-*</AspNetCoreVersion> <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
<!--
* Use 4.4.0-* instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008"
* https://github.com/dotnet/corefx/issues/18406
* Revert if and when $(CoreFxVersion) is upgraded to 4.4.0-*
-->
<SqlClientVersion>4.4.0-*</SqlClientVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion> <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>

6
src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
View File

@ -21,11 +21,11 @@
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<!-- <!--
* Use 4.4.0-* instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008" * Use $(SqlClientVersion) instead of $(CoreFxVersion) to address "SqlClient fails with netcoreapp2.0 on Win7/Server2008"
* https://github.com/dotnet/corefx/issues/18406 * https://github.com/dotnet/corefx/issues/18406
* Revert if and when $(CoreFxVersion) is upgraded to 4.4.0-* * Revert if and when $(CoreFxVersion) is upgraded to match $(SqlClientVersion)
--> -->
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-*" /> <PackageReference Include="System.Data.SqlClient" Version="$(SqlClientVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>