Update basic middleware projects to netcoreapp3.0

eng/ProjectReferences.props

@@ -30,7 +30,6 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Core" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel.Https" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.Kestrel" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj" />
     <ProjectReferenceProvider Include="PlatformBenchmarks" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\PlatformBenchmarks.csproj" />
     <ProjectReferenceProvider Include="CodeGenerator" ProjectPath="$(RepositoryRoot)src\Servers\Kestrel\tools\CodeGenerator\CodeGenerator.csproj" />

eng/dependencies.temp.props

@@ -6,6 +6,7 @@ This is required to provide dependencies for samples and tests.
   <ItemGroup>
     <LatestPackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="3.0.0-preview-18571-0010" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="3.0.0-preview-18571-0010" />
+    <LatestPackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="3.0.0-preview-18571-0010" />
     <LatestPackageReference Include="Microsoft.AspNetCore.Routing" Version="3.0.0-preview-18571-0010" />
   </ItemGroup>
 </Project>

src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj

@@ -4,7 +4,7 @@
     <Description>
       ASP.NET Core middleware for filtering out requests with unknown HTTP host headers.
     </Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore</PackageTags>
   </PropertyGroup>
@@ -13,6 +13,6 @@
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.Extensions.Options" />
-    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" /> 
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
   </ItemGroup>
 </Project>

src/Middleware/HostFiltering/test/Microsoft.AspNetCore.HostFiltering.Tests.csproj

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

src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj

@@ -4,7 +4,7 @@
     <Description>ASP.NET Core basic middleware for supporting HTTP method overrides. Includes:
 * X-Forwarded-* headers to forward headers from a proxy.
 * HTTP method override header.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;proxy;headers;xforwarded</PackageTags>

src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj

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

src/Middleware/HttpsPolicy/sample/HttpsPolicySample.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
   </ItemGroup>

src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj

@@ -4,7 +4,7 @@
     <Description>
       ASP.NET Core basic middleware for supporting HTTPS Redirection and HTTP Strict-Transport-Security.
     </Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;https;hsts</PackageTags>
@@ -15,6 +15,6 @@
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder" />
     <Reference Include="Microsoft.Extensions.Options" />
-    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" /> 
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
   </ItemGroup>
 </Project>

src/Middleware/ResponseCompression/src/BrotliCompressionProvider.cs

@@ -30,22 +30,13 @@ namespace Microsoft.AspNetCore.ResponseCompression
         private BrotliCompressionProviderOptions Options { get; }
 
         /// <inheritdoc />
-        public string EncodingName => "br";
+        public string EncodingName { get; } = "br";
 
         /// <inheritdoc />
-        public bool SupportsFlush => true;
+        public bool SupportsFlush { get; } = true;
 
         /// <inheritdoc />
         public Stream CreateStream(Stream outputStream)
-        {
-#if NETCOREAPP2_1
-            return new BrotliStream(outputStream, Options.Level, leaveOpen: true);
-#elif NET461 || NETSTANDARD2_0
-            // Brotli is only supported in .NET Core 2.1+
-            throw new PlatformNotSupportedException();
-#else
-#error Target frameworks need to be updated.
-#endif
-        }
+            => new BrotliStream(outputStream, Options.Level, leaveOpen: true);
     }
 }

src/Middleware/ResponseCompression/src/GzipCompressionProvider.cs

@@ -30,27 +30,13 @@ namespace Microsoft.AspNetCore.ResponseCompression
         private GzipCompressionProviderOptions Options { get; }
 
         /// <inheritdoc />
-        public string EncodingName => "gzip";
+        public string EncodingName { get; } = "gzip";
 
         /// <inheritdoc />
-        public bool SupportsFlush
-        {
-            get
-            {
-#if NET461
-                return false;
-#elif NETSTANDARD2_0 || NETCOREAPP2_1
-                return true;
-#else
-#error target frameworks need to be updated
-#endif
-            }
-        }
+        public bool SupportsFlush { get; } = true;
 
         /// <inheritdoc />
         public Stream CreateStream(Stream outputStream)
-        {
-            return new GZipStream(outputStream, Options.Level, leaveOpen: true);
-        }
+            => new GZipStream(outputStream, Options.Level, leaveOpen: true);
     }
 }

src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj

@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />

src/Middleware/ResponseCompression/src/ResponseCompressionProvider.cs

@@ -48,13 +48,7 @@ namespace Microsoft.AspNetCore.ResponseCompression
                 // Use the factory so it can resolve IOptions<GzipCompressionProviderOptions> from DI.
                 _providers = new ICompressionProvider[]
                 {
-#if NETCOREAPP2_1
                     new CompressionProviderFactory(typeof(BrotliCompressionProvider)),
-#elif NET461 || NETSTANDARD2_0
-                    // Brotli is only supported in .NET Core 2.1+
-#else
-#error Target frameworks need to be updated.
-#endif
                     new CompressionProviderFactory(typeof(GzipCompressionProvider)),
                 };
             }

src/Middleware/ResponseCompression/test/Microsoft.AspNetCore.ResponseCompression.Tests.csproj

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

src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs

@@ -37,12 +37,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
             get
             {
                 yield return new EncodingTestData("gzip", expectedBodyLength: 24);
-#if NETCOREAPP2_2
                 yield return new EncodingTestData("br", expectedBodyLength: 20);
-#elif NET461
-#else
-#error Target frameworks need to be updated.
-#endif
             }
         }
 
@@ -77,14 +72,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
         {
             var (response, logMessages) = await InvokeMiddleware(100, requestAcceptEncodings: new[] { "br" }, responseType: TextPlain);
 
-#if NET461
-            CheckResponseNotCompressed(response, expectedBodyLength: 100, sendVaryHeader: true);
-#elif NETCOREAPP2_2
             CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br");
             AssertCompressedWithLog(logMessages, "br");
-#else
-#error Target frameworks need to be updated.
-#endif
         }
 
         [Theory]
@@ -94,18 +83,10 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
         {
             var (response, logMessages) = await InvokeMiddleware(100, new[] { encoding1, encoding2 }, responseType: TextPlain);
 
-#if NET461
-            CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip");
-            AssertCompressedWithLog(logMessages, "gzip");
-#elif NETCOREAPP2_2
             CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br");
             AssertCompressedWithLog(logMessages, "br");
-#else
-#error Target frameworks need to be updated.
-#endif
         }
 
-#if NETCOREAPP2_2
         [Theory]
         [InlineData("gzip", "br")]
         [InlineData("br", "gzip")]
@@ -122,10 +103,6 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
             CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip");
             AssertCompressedWithLog(logMessages, "gzip");
         }
-#elif NET461
-#else
-#error Target frameworks need to be updated.
-#endif
 
         [Fact]
         public async Task Request_AcceptUnknown_NotCompressed()
@@ -339,15 +316,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
         {
             var (response, logMessages) = await InvokeMiddleware(100, requestAcceptEncodings: new[] { "*" }, responseType: TextPlain);
 
-#if NET461
-            CheckResponseCompressed(response, expectedBodyLength: 24, expectedEncoding: "gzip");
-            AssertCompressedWithLog(logMessages, "gzip");
-#elif NETCOREAPP2_2
             CheckResponseCompressed(response, expectedBodyLength: 20, expectedEncoding: "br");
             AssertCompressedWithLog(logMessages, "br");
-#else
-#error Target frameworks need to be updated.
-#endif
         }
 
         [Fact]
@@ -699,16 +669,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
             request.Headers.AcceptEncoding.ParseAdd(encoding);
 
             var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-
-#if NET461 // Flush not supported, compression disabled
-            Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5));
-            Assert.Empty(response.Content.Headers.ContentEncoding);
-#elif NETCOREAPP2_2 // Flush supported, compression enabled
             Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out _));
             Assert.Single(response.Content.Headers.ContentEncoding, encoding);
-#else
-#error Target frameworks need to be updated.
-#endif
 
             var body = await response.Content.ReadAsStreamAsync();
 
@@ -764,16 +726,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
             request.Headers.AcceptEncoding.ParseAdd(encoding);
 
             var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-
-#if NET461 // Flush not supported, compression disabled
-            Assert.NotNull(response.Content.Headers.GetValues(HeaderNames.ContentMD5));
-            Assert.Empty(response.Content.Headers.ContentEncoding);
-#elif NETCOREAPP2_2 // Flush supported, compression enabled
             Assert.False(response.Content.Headers.TryGetValues(HeaderNames.ContentMD5, out _));
             Assert.Single(response.Content.Headers.ContentEncoding, encoding);
-#else
-#error Target framework needs to be updated
-#endif
 
             var body = await response.Content.ReadAsStreamAsync();
 

src/Middleware/Rewrite/sample/RewriteSample.csproj

@@ -7,7 +7,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Rewrite" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
   </ItemGroup>
 
 </Project>

src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj

@@ -5,7 +5,7 @@
 * Support for custom URL rewrite rules
 * Support for running IIS URL Rewrite module rules
 * Support for running Apache mod_rewrite rules.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;urlrewrite;mod_rewrite</PackageTags>

src/Middleware/Rewrite/test/Microsoft.AspNetCore.Rewrite.Tests.csproj

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