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

Commit 539a137

Browse files
TratcherTratcher
committed
Migrate to netcoreapp2.0
1 parent 6a5fb3b commit 539a137

File tree

9 files changed

+47
-121
lines changed

9 files changed

+47
-121
lines changed

‎build/dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<AspNetCoreVersion>2.0.0-preview1-*</AspNetCoreVersion>
44
<AspNetCoreLabsVersion>0.3.0-*</AspNetCoreLabsVersion>

‎samples/IISSample/IISSample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<Import Project="..\..\build\dependencies.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>ASP.NET Core components for working with the IIS AspNetCoreModule.</Description>
7-
<TargetFramework>netstandard1.3</TargetFramework>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore;iis</PackageTags>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="$(AspNetCoreVersion)" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
1919
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
21-
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
20+
<PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
21+
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
2222
<PackageReference Include="System.Security.Principal.Windows" Version="$(CoreFxVersion)" />
2323
</ItemGroup>
2424

‎test/IISIntegration.FunctionalTests/HelloWorldTest.cs

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -22,50 +22,26 @@ public HelloWorldTests(ITestOutputHelper output) : base(output)
2222

2323
[ConditionalTheory]
2424
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
25-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
26-
//[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)]
27-
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)]
28-
public Task HelloWorld_IISExpress(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
25+
//[InlineData(RuntimeArchitecture.x86, ApplicationType.Portable)]
26+
[InlineData(RuntimeArchitecture.x64, ApplicationType.Portable)]
27+
public Task HelloWorld_IISExpress(RuntimeArchitecture architecture, ApplicationType applicationType)
2928
{
30-
return HelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationType);
29+
return HelloWorld(ServerType.IISExpress, architecture, applicationType);
3130
}
3231

33-
[ConditionalTheory]
34-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
35-
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
36-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)]
37-
// TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
38-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)]
39-
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)]
40-
public Task HelloWorld_IISExpress_CoreClr(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
41-
{
42-
return HelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationType);
43-
}
44-
45-
[ConditionalTheory]
46-
[SkipIfEnvironmentVariableNotEnabled("IIS_VARIATIONS_ENABLED")]
47-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
48-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
49-
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)]
50-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)]
51-
public Task HelloWorld_IIS(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
52-
{
53-
return HelloWorld(ServerType.IIS, runtimeFlavor, architecture, applicationType);
54-
}
55-
56-
public async Task HelloWorld(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
32+
public async Task HelloWorld(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType)
5733
{
58-
var testName = $"HelloWorld_{serverType}_{runtimeFlavor}_{architecture}";
34+
var testName = $"HelloWorld_{serverType}_{architecture}";
5935
using (StartLog(out var loggerFactory, testName))
6036
{
6137
var logger = loggerFactory.CreateLogger("HelloWorldTest");
6238

63-
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
39+
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, RuntimeFlavor.CoreClr, architecture)
6440
{
6541
EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld',
6642
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null,
6743
SiteName = "HttpTestSite", // This is configured in the Http.config
68-
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0",
44+
TargetFramework = "netcoreapp2.0",
6945
ApplicationType = applicationType
7046
};
7147

‎test/IISIntegration.FunctionalTests/HttpsTest.cs

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -25,40 +25,29 @@ public HttpsTest(ITestOutputHelper output) : base(output)
2525
{
2626
}
2727

28-
[ConditionalTheory]
29-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
30-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
31-
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44396/", ApplicationType.Portable)]
32-
public Task Https_HelloWorld(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
33-
{
34-
return HttpsHelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType);
35-
}
36-
3728
[ConditionalTheory(Skip = "No test configuration enabled")]
3829
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
39-
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
40-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44394/", ApplicationType.Portable)]
41-
// TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
42-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44395/", ApplicationType.Standalone)]
43-
public Task Https_HelloWorld_CoreCLR(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
30+
//[InlineData(RuntimeArchitecture.x86, "https://localhost:44394/", ApplicationType.Portable)]
31+
[InlineData(RuntimeArchitecture.x64, "https://localhost:44395/", ApplicationType.Standalone)]
32+
public Task Https_HelloWorld(RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
4433
{
45-
return HttpsHelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType);
34+
return HttpsHelloWorld(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType);
4635
}
4736

48-
public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
37+
public async Task HttpsHelloWorld(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
4938
{
50-
var testName = $"HttpsHelloWorld_{serverType}_{runtimeFlavor}_{architecture}";
39+
var testName = $"HttpsHelloWorld_{serverType}_{architecture}";
5140
using (StartLog(out var loggerFactory, testName))
5241
{
5342
var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest");
5443

55-
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
44+
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, RuntimeFlavor.CoreClr, architecture)
5645
{
5746
ApplicationBaseUriHint = applicationBaseUrl,
5847
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
5948
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null,
6049
SiteName = "HttpsTestSite", // This is configured in the Https.config
61-
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0",
50+
TargetFramework = "netcoreapp2.0",
6251
ApplicationType = applicationType
6352
};
6453

@@ -91,58 +80,37 @@ public async Task HttpsHelloWorld(ServerType serverType, RuntimeFlavor runtimeFl
9180
}
9281
}
9382

94-
[ConditionalTheory(Skip = "No test configuration enabled")]
95-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
96-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
97-
//[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "https://localhost:44399/", ApplicationType.Standalone)]
98-
public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
99-
{
100-
return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: false);
101-
}
102-
10383
[ConditionalTheory]
10484
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
105-
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
106-
// TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
107-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)]
108-
[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)]
109-
public Task Https_HelloWorld_NoClientCert_CoreCLR(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
110-
{
111-
return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: false);
112-
}
113-
114-
[ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
115-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
116-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
117-
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44301/", ApplicationType.Portable)]
118-
public Task Https_HelloWorld_ClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
85+
//[InlineData(RuntimeArchitecture.x86, "https://localhost:44399/", ApplicationType.Standalone)]
86+
[InlineData(RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)]
87+
public Task Https_HelloWorld_NoClientCert(RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
11988
{
120-
return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: true);
89+
return HttpsHelloWorldCerts(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType, sendClientCert: false);
12190
}
12291

12392
[ConditionalTheory(Skip = "Manual test only, selecting a client cert is non-determanistic on different machines.")]
12493
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
125-
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
126-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44302/", ApplicationType.Standalone)]
127-
public Task Https_HelloWorld_ClientCert_CoreCLR(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
94+
[InlineData(RuntimeArchitecture.x64, "https://localhost:44301/", ApplicationType.Portable)]
95+
public Task Https_HelloWorld_ClientCert(RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
12896
{
129-
return HttpsHelloWorldCerts(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType, sendClientCert: true);
97+
return HttpsHelloWorldCerts(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType, sendClientCert: true);
13098
}
13199

132-
public async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType, bool sendClientCert)
100+
public async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType, bool sendClientCert)
133101
{
134-
var testName = $"HttpsHelloWorldCerts_{serverType}_{runtimeFlavor}_{architecture}";
102+
var testName = $"HttpsHelloWorldCerts_{serverType}_{architecture}";
135103
using (StartLog(out var loggerFactory, testName))
136104
{
137105
var logger = loggerFactory.CreateLogger("HttpsHelloWorldTest");
138106

139-
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
107+
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, RuntimeFlavor.CoreClr, architecture)
140108
{
141109
ApplicationBaseUriHint = applicationBaseUrl,
142110
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
143111
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null,
144112
SiteName = "HttpsTestSite", // This is configured in the Https.config
145-
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0",
113+
TargetFramework = "netcoreapp2.0",
146114
ApplicationType = applicationType
147115
};
148116

‎test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
7-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
8-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
97
</PropertyGroup>
108

119
<ItemGroup>

‎test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -24,27 +24,15 @@ public NtlmAuthenticationTests(ITestOutputHelper output) : base(output)
2424

2525
[ConditionalTheory]
2626
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
27-
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
28-
[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)]
29-
public Task NtlmAuthentication(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
27+
[InlineData(RuntimeArchitecture.x64, ApplicationType.Portable, Skip = "https://github.com/aspnet/ServerTests/issues/82")]
28+
public Task NtlmAuthentication(RuntimeArchitecture architecture, ApplicationType applicationType)
3029
{
31-
return NtlmAuthentication(ServerType.IISExpress, runtimeFlavor, architecture, applicationType);
30+
return NtlmAuthentication(ServerType.IISExpress, architecture, applicationType);
3231
}
3332

34-
[ConditionalTheory(Skip = "No test configuration enabled")]
35-
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
36-
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
37-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)]
38-
// TODO reenable when https://github.com/dotnet/sdk/issues/696 is resolved
39-
//[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)]
40-
public Task NtlmAuthentication_CoreCLR(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
41-
{
42-
return NtlmAuthentication(ServerType.IISExpress, runtimeFlavor, architecture, applicationType);
43-
}
44-
45-
public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType)
33+
public async Task NtlmAuthentication(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType)
4634
{
47-
var testName = $"NtlmAuthentication_{serverType}_{runtimeFlavor}_{architecture}";
35+
var testName = $"NtlmAuthentication_{serverType}_{architecture}";
4836
using (StartLog(out var loggerFactory, testName))
4937
{
5038
var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest");
@@ -53,14 +41,14 @@ public async Task NtlmAuthentication(ServerType serverType, RuntimeFlavor runtim
5341
? "win7-x64"
5442
: "win7-x86";
5543

56-
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, runtimeFlavor, architecture)
44+
var deploymentParameters = new DeploymentParameters(Helpers.GetTestSitesPath(), serverType, RuntimeFlavor.CoreClr, architecture)
5745
{
5846
EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication'
5947
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null,
6048
SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config
61-
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0",
49+
TargetFramework = "netcoreapp2.0",
6250
ApplicationType = applicationType,
63-
AdditionalPublishParameters = ApplicationType.Standalone == applicationType && RuntimeFlavor.CoreClr == runtimeFlavor
51+
AdditionalPublishParameters = ApplicationType.Standalone == applicationType
6452
? "-r " + windowsRid
6553
: null
6654
};

0 commit comments

Comments
 (0)