This repository was archived by the owner on Nov 22, 2018. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +11
-43
lines changed
src/Microsoft.AspNetCore.StaticFiles
Microsoft.AspNetCore.StaticFiles.FunctionalTests
Microsoft.AspNetCore.StaticFiles.Tests Expand file tree Collapse file tree 6 files changed +11
-43
lines changed Original file line number Diff line number Diff line change 8
8
<AssemblyOriginatorKeyFile >$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile >
9
9
<SignAssembly >true</SignAssembly >
10
10
<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 >
11
14
</PropertyGroup >
12
15
13
16
<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)" />
15
22
</ItemGroup >
16
23
17
24
</Project >
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 4
4
<TargetFrameworks >net451;netcoreapp1.1</TargetFrameworks >
5
5
<OutputType >Exe</OutputType >
6
6
<RuntimeIdentifier Condition =" '$(TargetFramework)'!='netcoreapp1.1'" >win7-x64</RuntimeIdentifier >
7
+ <NetCoreAppImplicitPackageVersion >1.2.0-*</NetCoreAppImplicitPackageVersion >
7
8
</PropertyGroup >
8
9
9
- <ItemGroup >
10
- <Content Include =" wwwroot\**\*;web.config" >
11
- <CopyToPublishDirectory >PreserveNewest</CopyToPublishDirectory >
12
- </Content >
13
- </ItemGroup >
14
-
15
10
<ItemGroup >
16
11
<ProjectReference Include =" ..\..\src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.csproj" />
17
- </ItemGroup >
18
-
19
- <ItemGroup >
20
12
<PackageReference Include =" Microsoft.AspNetCore.Server.IISIntegration" Version =" 1.2.0-*" />
21
13
<PackageReference Include =" Microsoft.AspNetCore.Server.Kestrel" Version =" 1.2.0-*" />
22
14
<PackageReference Include =" Microsoft.Extensions.Logging.Console" Version =" 1.2.0-*" />
23
15
</ItemGroup >
24
16
25
- <ItemGroup Condition =" '$(TargetFramework)' == 'netcoreapp1.1' " >
26
- <PackageReference Include =" Microsoft.NETCore.App" Version =" 1.2.0-*" />
27
- </ItemGroup >
28
-
29
17
</Project >
Original file line number Diff line number Diff line change 10
10
<PackageTags >aspnetcore;staticfiles</PackageTags >
11
11
</PropertyGroup >
12
12
13
- <ItemGroup >
14
- <Compile Include =" **\*.cs" />
15
- <EmbeddedResource Include =" **\*.resx" />
16
- </ItemGroup >
17
-
18
13
<ItemGroup >
19
14
<PackageReference Include =" Microsoft.AspNetCore.Hosting.Abstractions" Version =" 1.2.0-*" />
20
15
<PackageReference Include =" Microsoft.AspNetCore.Http.Extensions" Version =" 1.2.0-*" />
21
16
<PackageReference Include =" Microsoft.Extensions.FileProviders.Abstractions" Version =" 1.2.0-*" />
22
17
<PackageReference Include =" Microsoft.Extensions.Logging.Abstractions" Version =" 1.2.0-*" />
23
18
<PackageReference Include =" Microsoft.Extensions.WebEncoders" Version =" 1.2.0-*" />
24
- <PackageReference Include =" NETStandard.Library" Version =" 1.6.2-*" />
25
19
</ItemGroup >
26
20
27
21
</Project >
Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<ItemGroup >
11
- <Compile Include =" **\*.cs" />
12
11
<Compile Include =" ..\shared\*.cs" />
13
- <EmbeddedResource Include =" **\*.resx" />
14
12
<Content Include =" TestDocument1MB.txt" >
15
13
<CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory >
16
14
</Content >
25
23
</ItemGroup >
26
24
27
25
<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-* " />
29
27
<PackageReference Include =" xunit.runner.visualstudio" Version =" 2.2.0-*" />
30
28
<PackageReference Include =" Microsoft.AspNetCore.Server.IntegrationTesting" Version =" 0.3.0-*" />
31
29
<PackageReference Include =" Microsoft.AspNetCore.Server.HttpSys" Version =" 1.2.0-*" />
35
33
<PackageReference Include =" xunit" Version =" 2.2.0-*" />
36
34
</ItemGroup >
37
35
38
- <ItemGroup Condition =" '$(TargetFramework)' == 'netcoreapp1.1' " >
39
- <PackageReference Include =" Microsoft.NETCore.App" Version =" 1.2.0-*" />
40
- </ItemGroup >
41
-
42
36
</Project >
Original file line number Diff line number Diff line change 4
4
5
5
<PropertyGroup >
6
6
<TargetFrameworks >netcoreapp1.1;net451</TargetFrameworks >
7
- <RuntimeIdentifier Condition =" '$(TargetFramework)'!='netcoreapp1.1'" >win7-x64</RuntimeIdentifier >
8
7
</PropertyGroup >
9
8
10
9
<ItemGroup >
11
- <Compile Include =" **\*.cs" />
12
10
<Compile Include =" ..\shared\*.cs" />
13
- <EmbeddedResource Include =" **\*.resx" />
14
11
<Content Include =" SubFolder\**\*;TestDocument.txt" >
15
12
<CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory >
16
13
<CopyToPublishDirectory >PreserveNewest</CopyToPublishDirectory >
19
16
20
17
<ItemGroup >
21
18
<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-*" />
26
20
<PackageReference Include =" xunit.runner.visualstudio" Version =" 2.2.0-*" />
27
21
<PackageReference Include =" Microsoft.AspNetCore.TestHost" Version =" 1.2.0-*" />
28
22
<PackageReference Include =" Microsoft.AspNetCore.Testing" Version =" 1.2.0-*" />
29
23
<PackageReference Include =" Microsoft.Extensions.Logging.Testing" Version =" 1.2.0-*" />
30
24
<PackageReference Include =" xunit" Version =" 2.2.0-*" />
31
25
</ItemGroup >
32
26
33
- <ItemGroup Condition =" '$(TargetFramework)' == 'netcoreapp1.1' " >
34
- <PackageReference Include =" Microsoft.NETCore.App" Version =" 1.2.0-*" />
35
- </ItemGroup >
36
-
37
27
</Project >
You can’t perform that action at this time.
0 commit comments