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

Update test projects to netcoreapp3.0

This commit is contained in:
Nate McMaster 2018-11-21 16:50:09 -08:00
parent 6c60e0260c
commit f67acd67a2
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
12 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
<!-- Mitigation for long path issues -->
<AssemblyName>Diagnostics.EFCore.FunctionalTests</AssemblyName>
</PropertyGroup>

2
src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
<SignAssembly>false</SignAssembly>
<AssemblyName>Diagnostics.FunctionalTests</AssemblyName>
</PropertyGroup>

6
src/Middleware/Diagnostics/test/UnitTests/Microsoft.AspNetCore.Diagnostics.Tests.csproj
View File

@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\**" Exclude="$(DefaultItemExcludes)" />
<Content Include="TestFiles\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\testassets\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Diagnostics" />
<Reference Include="Microsoft.AspNetCore.TestHost" />

2
src/Middleware/HealthChecks/test/UnitTests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Diagnostics.HealthChecks</RootNamespace>
</PropertyGroup>

2
src/Middleware/MiddlewareAnalysis/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/Middleware/WebSockets/samples/EchoApp/EchoApp.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/Middleware/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<IsTestAssetProject>true</IsTestAssetProject>
</PropertyGroup>

8
src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs
View File

@ -135,17 +135,11 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn
var appPath = Helpers.GetApplicationPath("AutobahnTestApp");
var configPath = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "Http.config");
var targetFramework =
#if NETCOREAPP2_2
"netcoreapp2.2";
#else
#error Target frameworks need to be updated
#endif
var parameters = new DeploymentParameters(appPath, server, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
{
Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp),
ApplicationType = ApplicationType.Portable,
TargetFramework = targetFramework,
TargetFramework = "netcoreapp3.0",
EnvironmentName = environment,
SiteName = "HttpTestSite", // This is configured in the Http.config
ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null,

2
src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

40
src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
View File

@ -15,17 +15,9 @@ using Xunit;
namespace Microsoft.AspNetCore.WebSockets.Test
{
#if NET461
// ClientWebSocket does not support WebSockets on these platforms and OS. Kestrel does support it.
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "No WebSockets Client for this platform")]
#elif NETCOREAPP2_2
// ClientWebSocket has added support for WebSockets on Win7.
#else
#error Unknown TFM
#endif
public class WebSocketMiddlewareTests : LoggedTest
{
[ConditionalFact]
[Fact]
public async Task Connect_Success()
{
using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context =>
@ -41,7 +33,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task NegotiateSubProtocol_Success()
{
using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context =>
@ -69,7 +61,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendEmptyData_Success()
{
using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, async context =>
@ -93,7 +85,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendShortData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes("Hello World");
@ -118,7 +110,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendMediumData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes(new string('a', 130));
@ -143,7 +135,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendLongData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes(new string('a', 0x1FFFF));
@ -180,7 +172,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendFragmentedData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes("Hello World");
@ -223,7 +215,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task ReceiveShortData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes("Hello World");
@ -248,7 +240,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task ReceiveMediumData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes(new string('a', 130));
@ -273,7 +265,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task ReceiveLongData()
{
var orriginalData = Encoding.UTF8.GetBytes(new string('a', 0x1FFFF));
@ -306,7 +298,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task ReceiveFragmentedData_Success()
{
var orriginalData = Encoding.UTF8.GetBytes("Hello World");
@ -349,7 +341,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task SendClose_Success()
{
string closeDescription = "Test Closed";
@ -377,7 +369,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task ReceiveClose_Success()
{
string closeDescription = "Test Closed";
@ -405,7 +397,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task CloseFromOpen_Success()
{
string closeDescription = "Test Closed";
@ -435,7 +427,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task CloseFromCloseSent_Success()
{
string closeDescription = "Test Closed";
@ -467,7 +459,7 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
}
[ConditionalFact]
[Fact]
public async Task CloseFromCloseReceived_Success()
{
string closeDescription = "Test Closed";