Drop .NET 6 runtime support (compiling still works for libraries)

Author: twsouthwick

samples/Modules/ModulesLibrary/ModulesLibrary.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <EnablePackageValidation>true</EnablePackageValidation>
     <RootNamespace>Microsoft.AspNetCore.SystemWebAdapters</RootNamespace>
@@ -17,11 +17,6 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <!-- Provided in box for .NET 8+ -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.Bcl.TimeProvider" />
-  </ItemGroup>
-
   <ItemGroup>
     <Using Include="Microsoft.AspNetCore.Http.HttpContext" Alias="HttpContextCore" />
     <Using Include="Microsoft.AspNetCore.Http.HttpResponse" Alias="HttpResponseCore" />

src/Microsoft.AspNetCore.SystemWebAdapters/Generated/ExcludedAttributes.txt

@@ -1 +1,3 @@
 T:System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute
+T:System.Runtime.CompilerServices.NullableAttribute
+T:System.Runtime.CompilerServices.NullableContextAttribute

src/Microsoft.AspNetCore.SystemWebAdapters/IHtmlString.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 // This is available in-box in .NET Framework and .NET 8+. We type forward to that when possible, otherwise, provide an implementation here for compat purposes.
-#if NETSTANDARD || NET6_0
+#if NETSTANDARD
 
 namespace System.Web;
 

src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;netstandard2.0;net45;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0;net45;net472</TargetFrameworks>
     <IsPackable>true</IsPackable>
 
     <!-- This will validate that the package will unify correctly with System.Web.dll -->
@@ -35,17 +35,6 @@
     <PackageReference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-
-    <PackageReference Include="System.Runtime.Caching" />
-
-    <Using Include="Microsoft.AspNetCore.Http.HttpContext" Alias="HttpContextCore" />
-    <Using Include="Microsoft.AspNetCore.Http.HttpResponse" Alias="HttpResponseCore" />
-    <Using Include="Microsoft.AspNetCore.Http.HttpRequest" Alias="HttpRequestCore" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
@@ -78,6 +67,6 @@
     <None Include="Build\*" Pack="true" PackagePath="Build\" />
   </ItemGroup>
 
-  <Import Condition=" '$(TargetFramework)' == 'net6.0' " Project="Generated/GenerateApis.targets" />
+  <Import Condition=" '$(TargetFramework)' == 'net8.0' " Project="Generated/GenerateApis.targets" />
 
 </Project>

test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/VerifyTypeForwards.cs

@@ -35,6 +35,10 @@ public void VerifyPublicTypesAreForwardedToSystemWeb()
             .Where(t => systemWeb.GetType(t) is not null)
             .ToHashSet();
 
+        // .NET 8+ this is only a typeforward, but we need it here so it shows up on the list of types
+        // since it's technically not "exported" from the assembly
+        exportedTypes.Add(typeof(IHtmlString).FullName!);
+
         WriteExpectedFile(exportedTypes);
 
         var forwardedTypes = frameworkContext.LoadFromAssemblyName("Microsoft.AspNetCore.SystemWebAdapters")

test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Autofac.Extras.Moq" />

test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

update_apis.ps1

@@ -4,8 +4,8 @@ param($config = "release")
 
 $project = "src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj"
 
-dotnet build --no-incremental $project -c $config -f net6.0 /p:GenerateStandard=true
-dotnet build --no-incremental $project -c $config -f net6.0 /p:GenerateTypeForwards=true
+dotnet build --no-incremental $project -c $config -f net8.0 /p:GenerateStandard=true
+dotnet build --no-incremental $project -c $config -f net8.0 /p:GenerateTypeForwards=true
 
 # Script will have an error if there are git changes
 if(git status --porcelain){