Rename the new ConditionalProxy to SpaProxy, since it's not always 'conditional' any more. This is internal, so the name change is fine.

Author: SteveSandersonMS

src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxyMiddleware.cs

@@ -39,15 +39,15 @@ public ConditionalProxyMiddleware(
             _pathPrefix = pathPrefix;
             _pathPrefixIsRoot = string.Equals(_pathPrefix, "/", StringComparison.Ordinal);
             _baseUriTask = baseUriTask;
-            _httpClient = ConditionalProxy.CreateHttpClientForProxy(requestTimeout);
+            _httpClient = SpaProxy.CreateHttpClientForProxy(requestTimeout);
             _applicationStoppingToken = applicationLifetime.ApplicationStopping;
         }
 
         public async Task Invoke(HttpContext context)
         {
             if (context.Request.Path.StartsWithSegments(_pathPrefix) || _pathPrefixIsRoot)
             {
-                var didProxyRequest = await ConditionalProxy.PerformProxyRequest(
+                var didProxyRequest = await SpaProxy.PerformProxyRequest(
                     context, _httpClient, _baseUriTask, _applicationStoppingToken, proxy404s: false);
                 if (didProxyRequest)
                 {

src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxy.cs renamed to src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxy.cs

@@ -15,9 +15,9 @@ namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
 {
     // This duplicates and updates the proxying logic in SpaServices so that we can update
     // the project templates without waiting for 2.1 to ship. When 2.1 is ready to ship,
-    // merge the additional proxying features (e.g., proxying websocket connections) back
-    // into the SpaServices proxying code. It's all internal.
-    internal static class ConditionalProxy
+    // remove the old ConditionalProxy.cs from SpaServices and replace its usages with this.
+    // Doesn't affect public API surface - it's all internal.
+    internal static class SpaProxy
     {
         private const int DefaultWebSocketBufferSize = 4096;
         private const int StreamCopyBufferSize = 81920;

src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxyingExtensions.cs

@@ -48,12 +48,12 @@ public static void UseProxyToSpaDevelopmentServer(
             // server-sent event endpoints or similar, where it's expected that the response
             // takes an unlimited time and never actually completes
             var neverTimeOutHttpClient =
-                ConditionalProxy.CreateHttpClientForProxy(Timeout.InfiniteTimeSpan);
+                SpaProxy.CreateHttpClientForProxy(Timeout.InfiniteTimeSpan);
 
             // Proxy all requests into the Angular CLI server
             applicationBuilder.Use(async (context, next) =>
             {
-                var didProxyRequest = await ConditionalProxy.PerformProxyRequest(
+                var didProxyRequest = await SpaProxy.PerformProxyRequest(
                     context, neverTimeOutHttpClient, baseUriTask, applicationStoppingToken,
                     proxy404s: true);
             });