Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit baa5cb4

Browse files
author
Nate McMaster
committed
Consolidate dependency versions to one file and remove workarounds
1 parent cc6ff0a commit baa5cb4

File tree

6 files changed

+34
-33
lines changed

6 files changed

+34
-33
lines changed

‎build/dependencies.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
3+
<AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
4+
<AspNetCoreLabsVersion>0.3.0-*</AspNetCoreLabsVersion>
45
<CoreFxVersion>4.3.0</CoreFxVersion>
6+
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
7+
<TestSdkVersion>15.0.0</TestSdkVersion>
8+
<XunitVersion>2.2.0</XunitVersion>
59
</PropertyGroup>
610
</Project>

‎samples/StaticFileSample/StaticFileSample.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3+
<Import Project="..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
5-
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj" />
11-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
12-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
13-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
15+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
1417
</ItemGroup>
1518

1619
</Project>

‎samples/StaticFileSample/web.config

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.2.0-*" />
15-
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.2.0-*" />
16-
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.2.0-*" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
18-
<PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
14+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
15+
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(AspNetCoreVersion)" />
16+
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
18+
<PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(AspNetCoreVersion)" />
1919
</ItemGroup>
2020

2121
</Project>

‎test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
29-
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.3.0-*" />
30-
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="1.2.0-*" />
31-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
32-
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
34-
<PackageReference Include="xunit" Version="2.2.0-*" />
27+
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="$(AspNetCoreVersion)" />
28+
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(AspNetCoreLabsVersion)" />
29+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
30+
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
32+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
33+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
34+
<PackageReference Include="xunit" Version="$(XunitVersion)" />
3535
</ItemGroup>
3636

3737
</Project>

‎test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717

1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
22-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
23-
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
24-
<PackageReference Include="xunit" Version="2.2.0-*" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
24+
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
27+
<PackageReference Include="xunit" Version="$(XunitVersion)" />
2528
</ItemGroup>
2629

2730
</Project>

0 commit comments

Comments
 (0)