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

Upgrade test framework versions

This commit is contained in:
Nate McMaster 2017-05-15 14:10:14 -07:00
parent 7e9397aa8a
commit 5761ddd284
6 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/dependencies.props
View File

@ -6,7 +6,7 @@
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion> <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
<TestSdkVersion>15.0.0</TestSdkVersion> <TestSdkVersion>15.3.0-*</TestSdkVersion>
<XunitVersion>2.2.0</XunitVersion> <XunitVersion>2.3.0-beta2-*</XunitVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
test/IISIntegration.FunctionalTests/HelloWorldTest.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return HelloWorld(ServerType.IISExpress, architecture, applicationType); return HelloWorld(ServerType.IISExpress, architecture, applicationType);
} }
public async Task HelloWorld(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType) private async Task HelloWorld(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType)
{ {
var testName = $"HelloWorld_{serverType}_{architecture}"; var testName = $"HelloWorld_{serverType}_{architecture}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))

6
test/IISIntegration.FunctionalTests/HttpsTest.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return HttpsHelloWorld(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType); return HttpsHelloWorld(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType);
} }
public async Task HttpsHelloWorld(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) private async Task HttpsHelloWorld(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType)
{ {
var testName = $"HttpsHelloWorld_{serverType}_{architecture}"; var testName = $"HttpsHelloWorld_{serverType}_{architecture}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))
@ -97,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return HttpsHelloWorldCerts(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType, sendClientCert: true); return HttpsHelloWorldCerts(ServerType.IISExpress, architecture, applicationBaseUrl, applicationType, sendClientCert: true);
} }
public async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType, bool sendClientCert) private async Task HttpsHelloWorldCerts(ServerType serverType, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType, bool sendClientCert)
{ {
var testName = $"HttpsHelloWorldCerts_{serverType}_{architecture}"; var testName = $"HttpsHelloWorldCerts_{serverType}_{architecture}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))

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

@ -21,8 +21,4 @@
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" /> <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project> </Project>

4
test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return NtlmAuthentication(ServerType.IISExpress, architecture, applicationType); return NtlmAuthentication(ServerType.IISExpress, architecture, applicationType);
} }
public async Task NtlmAuthentication(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType) private async Task NtlmAuthentication(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType)
{ {
var testName = $"NtlmAuthentication_{serverType}_{architecture}"; var testName = $"NtlmAuthentication_{serverType}_{architecture}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))

4
test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
View File

@ -17,8 +17,4 @@
<PackageReference Include="xunit" Version="$(XunitVersion)" /> <PackageReference Include="xunit" Version="$(XunitVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
</Project> </Project>