diff --git a/WebListener.sln b/WebListener.sln index 9f9ffbfbf5..77b27f9fbf 100644 --- a/WebListener.sln +++ b/WebListener.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22710.0 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "samples\TestClient\TestClient.csproj", "{8B828433-B333-4C19-96AE-00BFFF9D8841}" EndProject @@ -32,6 +32,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HotAddSample", "samples\HotAddSample\HotAddSample.xproj", "{8BFA392A-8B67-4454-916B-67C545EDFAEF}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Testing", "..\testing\src\Microsoft.AspNet.Testing\Microsoft.AspNet.Testing.xproj", "{09BE5203-8042-4338-9713-E44169342E72}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.TestHost", "..\testing\src\Microsoft.Dnx.TestHost\Microsoft.Dnx.TestHost.xproj", "{F003F228-2AE2-4E9D-877B-93EB773B5061}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Dnx.Testing.Abstractions", "..\testing\src\Microsoft.Dnx.Testing.Abstractions\Microsoft.Dnx.Testing.Abstractions.xproj", "{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -134,6 +140,42 @@ Global {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.ActiveCfg = Release|Any CPU {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.Build.0 = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|x86.ActiveCfg = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Debug|x86.Build.0 = Debug|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|Any CPU.Build.0 = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|x86.ActiveCfg = Release|Any CPU + {09BE5203-8042-4338-9713-E44169342E72}.Release|x86.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x86.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x86.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x86.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x86.Build.0 = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Debug|x86.Build.0 = Debug|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|Any CPU.Build.0 = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|x86.ActiveCfg = Release|Any CPU + {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/global.json b/global.json index 983ba0401e..42a9fa1e7a 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,3 @@ { - "projects": ["src"] + "projects": ["src","c:/github/testing/src"] } diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs index acdb509cad..5b72b73549 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Server.WebListener public class OpaqueUpgradeTests { [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task OpaqueUpgrade_SupportKeys_Present() { string address; @@ -61,7 +61,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task OpaqueUpgrade_AfterHeadersSent_Throws() { bool? upgradeThrew = null; @@ -92,7 +92,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task OpaqueUpgrade_GetUpgrade_Success() { ManualResetEvent waitHandle = new ManualResetEvent(false); @@ -120,7 +120,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] // See HTTP_VERB for known verbs [InlineData("UNKNOWN", null)] [InlineData("INVALID", null)] @@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] // Http.Sys returns a 411 Length Required if PUT or POST does not specify content-length or chunked. [InlineData("POST", "Content-Length: 10")] [InlineData("POST", "Transfer-Encoding: chunked")] diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs index 09830bf3f3..c099e3a7d7 100644 --- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs +++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Server.WebListener public class WebSocketTests { [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task WebSocketTests_SupportKeys_Present() { string address; @@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task WebSocketTests_AfterHeadersSent_Throws() { bool? upgradeThrew = null; @@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task WebSocketAccept_Success() { ManualResetEvent waitHandle = new ManualResetEvent(false); @@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Server.WebListener } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task WebSocketAccept_SendAndReceive_Success() { byte[] clientBuffer = new byte[] { 0x00, 0x01, 0xFF, 0x00, 0x00 }; @@ -161,7 +161,7 @@ namespace Microsoft.AspNet.Server.WebListener return await client.GetAsync(uri); } } - + private async Task SendWebSocketRequestAsync(string address) { ClientWebSocket client = new ClientWebSocket(); diff --git a/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs index e077352d42..04a17e4241 100644 --- a/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs +++ b/test/Microsoft.Net.Http.Server.FunctionalTests/OpaqueUpgradeTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.Net.Http.Server public class OpaqueUpgradeTests { [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task OpaqueUpgrade_AfterHeadersSent_Throws() { string address; @@ -36,7 +36,7 @@ namespace Microsoft.Net.Http.Server } [ConditionalFact] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] public async Task OpaqueUpgrade_GetUpgrade_Success() { string address; @@ -58,7 +58,7 @@ namespace Microsoft.Net.Http.Server } [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] // See HTTP_VERB for known verbs [InlineData("UNKNOWN", null)] [InlineData("INVALID", null)] @@ -114,7 +114,7 @@ namespace Microsoft.Net.Http.Server } [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Win7And2008R2)] + [OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)] // Http.Sys returns a 411 Length Required if PUT or POST does not specify content-length or chunked. [InlineData("POST", "Content-Length: 10")] [InlineData("POST", "Transfer-Encoding: chunked")]