From cf315d991a4900d26eeb9b14b1987c51888a1018 Mon Sep 17 00:00:00 2001
From: Mitch Razga <Mitch@zarsoft.com.au>
Date: Tue, 17 Dec 2024 12:21:49 +1100
Subject: [PATCH] Remove unsupported .NET targets

---
 .github/workflows/dotnet.yml                        | 13 +------------
 README.md                                           | 12 ++----------
 .../Jab.FunctionalTest.props                        |  2 +-
 .../Jab.FunctionalTests.MEDI.csproj                 |  3 ---
 src/Jab.Tests/Jab.Tests.csproj                      |  2 +-
 src/samples/ConsoleSample/ConsoleSample.csproj      |  2 +-
 6 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index f0d4e4c..7acc754 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -20,9 +20,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1.x
-          6.0.x
-          7.0.x
           8.0.x
     - name: Build
       run: dotnet build src
@@ -55,16 +52,8 @@ jobs:
     strategy:
       matrix:
         sdk: 
-          - 6.0.x
-          - 7.x
           - 8.x
-        # https://github.com/microsoft/MSBuildSdks/issues/412
-        # sdk: [6.0.x, 7.0.x]
         include:
-          - sdk: 6.0.x
-            tfm: net6.0
-          - sdk: 7.x
-            tfm: net7.0
           - sdk: 8.x
             tfm: net8.0
     runs-on: ubuntu-latest
@@ -102,7 +91,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Publish unity packages to npm
       shell: pwsh
       run: |
diff --git a/README.md b/README.md
index 71b83bd..163bff9 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Jab provides a [C# Source Generator](https://devblogs.microsoft.com/dotnet/intro
 - Clean stack traces: <br> ![stacktrace](https://raw.githubusercontent.com/pakrym/jab/main/doc/stacktrace.png)
 - Readable generated code: <br> ![generated code](https://raw.githubusercontent.com/pakrym/jab/main/doc/generatedcode.png)
 - Registration validation. Container configuration issues become compiler errors: <br> ![generated code](https://raw.githubusercontent.com/pakrym/jab/main/doc/errors.png)
-- Incremental generation, .NET 5/6/7/8 SDK support, .NET Standard 2.0 support, [Unity support](README.md#Unity-installation)
+- Incremental generation, Modern .NET SDK support, .NET Standard 2.0 support, [Unity support](README.md#Unity-installation)
 
 ## Example
 
@@ -169,18 +169,10 @@ When the scope is disposed all `IDisposable` and `IAsyncDisposable` services tha
 
 ### Generic registration attributes 
 
-You can use generic attributes to register services if your project targets `net7.0` or `net6.0` and has `LangVersion` set to preview.
 
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-  </PropertyGroup>
+You can use generic attributes to register services if your project targets a framework compatible with C# 11 or greater. See [C# language versioning](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-versioning#defaults) for more details.
 
-</Project>
 
-```
 
 Generic attributes allow declaration to be more compact by avoiding the `typeof` calls:
 
diff --git a/src/Jab.FunctionalTests.Common/Jab.FunctionalTest.props b/src/Jab.FunctionalTests.Common/Jab.FunctionalTest.props
index 2183623..4ad7d3a 100644
--- a/src/Jab.FunctionalTests.Common/Jab.FunctionalTest.props
+++ b/src/Jab.FunctionalTests.Common/Jab.FunctionalTest.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <DefaultFunctionalTestTargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0;netstandard2.0</DefaultFunctionalTestTargetFrameworks>
+    <DefaultFunctionalTestTargetFrameworks>net8.0;netstandard2.0</DefaultFunctionalTestTargetFrameworks>
     <DefaultFunctionalTestTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))" >$(DefaultFunctionalTestTargetFrameworks);net472</DefaultFunctionalTestTargetFrameworks>
     <FunctionalTestTargetFrameworks Condition="'$(FunctionalTestTargetFrameworks)' == ''">$(DefaultFunctionalTestTargetFrameworks)</FunctionalTestTargetFrameworks>
     <IsPackable>false</IsPackable>
diff --git a/src/Jab.FunctionalTests.MEDI/Jab.FunctionalTests.MEDI.csproj b/src/Jab.FunctionalTests.MEDI/Jab.FunctionalTests.MEDI.csproj
index bf99528..f9d8556 100644
--- a/src/Jab.FunctionalTests.MEDI/Jab.FunctionalTests.MEDI.csproj
+++ b/src/Jab.FunctionalTests.MEDI/Jab.FunctionalTests.MEDI.csproj
@@ -9,9 +9,6 @@
   <ItemGroup>
     <PackageReference Condition="'$(TargetFramework)' == 'net472'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0"/>
     <PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0"/>
-    <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.1'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0"/>
-    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0"/>
-    <PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
     <PackageReference Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
   </ItemGroup>
 </Project>
diff --git a/src/Jab.Tests/Jab.Tests.csproj b/src/Jab.Tests/Jab.Tests.csproj
index e1fb06a..9c389ca 100644
--- a/src/Jab.Tests/Jab.Tests.csproj
+++ b/src/Jab.Tests/Jab.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/samples/ConsoleSample/ConsoleSample.csproj b/src/samples/ConsoleSample/ConsoleSample.csproj
index a27f694..54f1db7 100644
--- a/src/samples/ConsoleSample/ConsoleSample.csproj
+++ b/src/samples/ConsoleSample/ConsoleSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>