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

Unify dependency versions to one file and remove workarounds

This commit is contained in:
Nate McMaster 2017-03-15 13:47:45 -07:00
parent ba0926736b
commit e3ca1d1a2c
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/dependencies.props
View File

@ -1,6 +1,9 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion> <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<TestSdkVersion>15.0.0</TestSdkVersion>
<XunitVersion>2.2.0</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.2.0-*" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" /> <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Text.Encodings.Web" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>

11
test/Microsoft.AspNetCore.Html.Abstractions.Test/Microsoft.AspNetCore.Html.Abstractions.Test.csproj
View File

@ -10,10 +10,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="../../src/Microsoft.AspNetCore.Html.Abstractions/Microsoft.AspNetCore.Html.Abstractions.csproj" /> <ProjectReference Include="../../src/Microsoft.AspNetCore.Html.Abstractions/Microsoft.AspNetCore.Html.Abstractions.csproj" />
<ProjectReference Include="../../src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.csproj" /> <ProjectReference Include="../../src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" /> </ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" /> <ItemGroup>
<PackageReference Include="xunit" Version="2.2.0-*" /> <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
test/Microsoft.Extensions.WebEncoders.Tests/Microsoft.Extensions.WebEncoders.Tests.csproj
View File

@ -5,15 +5,17 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks> <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50;portable-net451+win8</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../../src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.csproj" /> <ProjectReference Include="../../src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.csproj" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" /> </ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" /> <ItemGroup>
<PackageReference Include="xunit" Version="2.2.0-*" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
<PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>