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

Remove net451 as a cross-compile target

This commit is contained in:
Pranav K 2017-03-22 19:21:49 -07:00
parent dbc012c713
commit 6e1a53f1f5
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -27,4 +27,5 @@ nuget.exe
project.lock.json
/.vs/
.testPublish/
.build/
.build/
global.json

2
test/ServerComparison.FunctionalTests/HelloWorldTest.cs
View File

@ -75,7 +75,7 @@ namespace ServerComparison.FunctionalTests
EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld',
ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"),
SiteName = "HttpTestSite", // This is configured in the Http.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net452" : "netcoreapp1.1",
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp1.1",
ApplicationType = applicationType
};

8
test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs
View File

@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NET452
#if NET46
using System;
using System.Net;
@ -41,7 +41,7 @@ namespace ServerComparison.FunctionalTests
EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication'
ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "NtlmAuthentication.config", nginxConfig: null),
SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net452" : "netcoreapp1.1",
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp1.1",
ApplicationType = applicationType
};
@ -140,5 +140,7 @@ namespace ServerComparison.FunctionalTests
}
}
}
#elif NETCOREAPP1_1
#else
#error target frameworks need to be updated
#endif

2
test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs
View File

@ -133,7 +133,7 @@ namespace ServerComparison.FunctionalTests
hostCompression ? "http.config" : "NoCompression.config",
hostCompression ? "nginx.conf" : "NoCompression.conf"),
SiteName = "HttpTestSite", // This is configured in the Http.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net452" : "netcoreapp1.1",
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp1.1",
ApplicationType = applicationType
};

2
test/ServerComparison.FunctionalTests/ResponseTests.cs
View File

@ -168,7 +168,7 @@ namespace ServerComparison.FunctionalTests
EnvironmentName = "Responses",
ServerConfigTemplateContent = Helpers.GetConfigContent(serverType, "Http.config", "nginx.conf"),
SiteName = "HttpTestSite", // This is configured in the Http.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net452" : "netcoreapp1.1",
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp1.1",
ApplicationType = applicationType
};

4
test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.csproj
View File

@ -3,8 +3,10 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<ItemGroup>

2
test/ServerComparison.TestSites/ServerComparison.TestSites.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
<RuntimeIdentifiers>win7-x86;win7-x64;win81-x86;win81-x64;win10-x86;win10-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.15.04-x64;centos.7-x64;rhel.7.2-x64</RuntimeIdentifiers>
</PropertyGroup>