Merge in 'release/2.1' changes

src/Middleware/WebSockets/test/AutobahnTestApp/Properties/launchSettings.json

@@ -1,42 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:6155/",
-      "sslPort": 44371
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "ManagedSockets"
-      }
-    },
-    "AutobahnTestApp": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "ManagedSockets"
-      }
-    },
-    "AutobahnTestApp (SSL)": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "https://localhost:5443",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "ManagedSockets"
-      }
-    },
-    "WebListener": {
-      "commandName": "Project",
-      "commandLineArgs": "--server Microsoft.AspNetCore.Server.HttpSys",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "ManagedSockets"
-      }
-    }
-  }
-}

src/Middleware/WebSockets/test/ConformanceTests/Helpers.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
@@ -7,22 +7,7 @@ namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
     {
         public static string GetApplicationPath(string projectName)
         {
-            var applicationBasePath = AppContext.BaseDirectory;
+            return Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, projectName));
-
-            var directoryInfo = new DirectoryInfo(applicationBasePath);
-            do
-            {
-                var solutionFileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, "WebSockets.sln"));
-                if (solutionFileInfo.Exists)
-                {
-                    return Path.GetFullPath(Path.Combine(directoryInfo.FullName, "test", projectName));
-                }
-
-                directoryInfo = directoryInfo.Parent;
-            }
-            while (directoryInfo.Parent != null);
-
-            throw new Exception($"Solution root could not be found using {applicationBasePath}");
         }
     }
 }

src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DeveloperBuild)' != 'true' ">$(TargetFrameworks);netcoreapp2.0</TargetFrameworks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);AutobahnTestApp\**\*</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,6 +11,7 @@
 
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
+    <Content Include="AutobahnTestApp\**\*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>