drop net6 support

sensslen · Feb 3, 2025 · a50bc7b · a50bc7b
1 parent 2343742
commit a50bc7b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -15,12 +15,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
 
-        framework: [net6.0, net8.0, net9.0]
+        framework: [net8.0, net9.0]
 
         include:
-          - framework: net6.0
-            dotnetVersion: "6.0.x"
-
           - framework: net8.0
             dotnetVersion: "8.0.x"
 
@@ -30,11 +27,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup dotnet 6.0.x
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 6.0.x
-
       - name: Setup dotnet 8.0.x
         uses: actions/setup-dotnet@v4
         with:
@@ -59,12 +51,9 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        framework: [net6.0, net8.0, net472, net9.0]
+        framework: [net8.0, net472, net9.0]
 
         include:
-          - framework: net6.0
-            dotnetVersion: "6.0.x"
-
           - framework: net8.0
             dotnetVersion: "8.0.x"
 
@@ -73,11 +62,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup dotnet 6.0.x
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 6.0.x
-
       - name: Setup dotnet 8.0.x
         uses: actions/setup-dotnet@v4
         with:
@@ -127,13 +111,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        framework: [net6.0, net8.0, net9.0]
+        framework: [net8.0, net9.0]
         project: [App, Tests, ProjectWithReferenceContainingLicenseExpression]
 
         include:
-          - framework: net6.0
-            dotnetVersion: "6.0.x"
-
           - framework: net8.0
             dotnetVersion: "8.0.x"
 
@@ -218,12 +199,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        framework: [net6.0, net8.0, net9.0]
+        framework: [net8.0, net9.0]
 
         include:
-          - framework:  net6.0
-            dotnetVersion: "6.0.x"
-
           - framework:  net8.0
             dotnetVersion: "8.0.x"
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,10 +10,6 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 6.0.x
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "6.0.x"
       - name: Setup dotnet 8.0.x
         uses: actions/setup-dotnet@v4
         with:
@@ -54,8 +50,6 @@ jobs:
           echo "publish to path: $path"
           echo "path=$path" >> $env:GITHUB_OUTPUT
 
-      - name: Publish the application binaries (.net6)
-        run: dotnet publish ./src/NuGetLicenseCore/NuGetLicenseCore.csproj -c Release --no-restore -o ${{ steps.artifacts_path.outputs.path }}/net6 -f net6.0 -p:Version=${{ steps.version.outputs.full_without_prefix }}
       - name: Publish the application binaries (.net8)
         run: dotnet publish ./src/NuGetLicenseCore/NuGetLicenseCore.csproj -c Release --no-restore -o ${{ steps.artifacts_path.outputs.path }}/net8 -f net8.0 -p:Version=${{ steps.version.outputs.full_without_prefix }}
       - name: Publish the application binaries (.net9)

diff --git a/src/NuGetLicenseCore/NuGetLicenseCore.csproj b/src/NuGetLicenseCore/NuGetLicenseCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <PackageType>DotnetTool</PackageType>

diff --git a/src/NuGetUtility/NuGetUtility.csproj b/src/NuGetUtility/NuGetUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
     <RepositoryType>git</RepositoryType>
     <Version>100.100.100</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/tests/NuGetUtility.Test/ReferencedPackagesReader/ReferencedPackagesReaderIntegrationTest.cs b/tests/NuGetUtility.Test/ReferencedPackagesReader/ReferencedPackagesReaderIntegrationTest.cs
@@ -151,10 +151,10 @@ public void GetInstalledPackagesShould_ThrowError_For_PackagesForNativeCppProjec
 #endif
 
 
-        [TestCase("net6.0", false, "TinyCsvParser")]
+        [TestCase("net9.0", false, "TinyCsvParser")]
         [TestCase("net8.0", false, "Microsoft.Extensions.Logging.Abstractions")]
         [TestCase("net8.0-browser", false, "Microsoft.Extensions.Logging.Abstractions")]
-        [TestCase("net6.0", true, "TinyCsvParser")]
+        [TestCase("net9.0", true, "TinyCsvParser")]
         [TestCase("net8.0", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions", "System.Diagnostics.DiagnosticSource")]
         [TestCase("net8.0-browser", true, "Microsoft.Extensions.Logging.Abstractions", "Microsoft.Extensions.DependencyInjection.Abstractions", "System.Diagnostics.DiagnosticSource")]
         public void GetInstalledPackagesShould_OnlyReturn_PackagesPackagesReferencedByRequestedFramework(string framework, bool includeTransitive, params string[] packages)

diff --git a/...TargetProjectWithDifferentDependencies/MultiTargetProjectWithDifferentDependencies.csproj b/...TargetProjectWithDifferentDependencies/MultiTargetProjectWithDifferentDependencies.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0;net8.0-browser</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0;net8.0-browser</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
     <PackageReference Include="TinyCsvParser" Version="2.7.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-browser'">