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

Commit 88abfa4

Browse files
authored
Upgrade to RC.3
1 parent 2505419 commit 88abfa4

File tree

6 files changed

+11
-43
lines changed

6 files changed

+11
-43
lines changed

build/common.props

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@
88
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
99
<SignAssembly>true</SignAssembly>
1010
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
11+
<NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
12+
<NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
13+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1114
</PropertyGroup>
1215

1316
<ItemGroup>
14-
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.0-*" PrivateAssets="All" />
17+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
21+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
1522
</ItemGroup>
1623

1724
</Project>

global.json

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

samples/StaticFileSample/StaticFileSample.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,14 @@
44
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
7+
<NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
78
</PropertyGroup>
89

9-
<ItemGroup>
10-
<Content Include="wwwroot\**\*;web.config">
11-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
12-
</Content>
13-
</ItemGroup>
14-
1510
<ItemGroup>
1611
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
2012
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
2113
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
2214
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
2315
</ItemGroup>
2416

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
26-
<PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
27-
</ItemGroup>
28-
2917
</Project>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,12 @@
1010
<PackageTags>aspnetcore;staticfiles</PackageTags>
1111
</PropertyGroup>
1212

13-
<ItemGroup>
14-
<Compile Include="**\*.cs" />
15-
<EmbeddedResource Include="**\*.resx" />
16-
</ItemGroup>
17-
1813
<ItemGroup>
1914
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.2.0-*" />
2015
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.2.0-*" />
2116
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.2.0-*" />
2217
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
2318
<PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
24-
<PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
2519
</ItemGroup>
2620

2721
</Project>

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<Compile Include="**\*.cs" />
1211
<Compile Include="..\shared\*.cs" />
13-
<EmbeddedResource Include="**\*.resx" />
1412
<Content Include="TestDocument1MB.txt">
1513
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1614
</Content>
@@ -25,7 +23,7 @@
2523
</ItemGroup>
2624

2725
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
2927
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
3028
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.3.0-*" />
3129
<PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="1.2.0-*" />
@@ -35,8 +33,4 @@
3533
<PackageReference Include="xunit" Version="2.2.0-*" />
3634
</ItemGroup>
3735

38-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
39-
<PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
40-
</ItemGroup>
41-
4236
</Project>

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
7-
<RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
87
</PropertyGroup>
98

109
<ItemGroup>
11-
<Compile Include="**\*.cs" />
1210
<Compile Include="..\shared\*.cs" />
13-
<EmbeddedResource Include="**\*.resx" />
1411
<Content Include="SubFolder\**\*;TestDocument.txt">
1512
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1613
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
@@ -19,19 +16,12 @@
1916

2017
<ItemGroup>
2118
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj" />
22-
</ItemGroup>
23-
24-
<ItemGroup>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
2620
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
2721
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
2822
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
2923
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
3024
<PackageReference Include="xunit" Version="2.2.0-*" />
3125
</ItemGroup>
3226

33-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
34-
<PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
35-
</ItemGroup>
36-
3727
</Project>

0 commit comments

Comments
 (0)