Merge pull request #1027 from adamralph/remove-net7

remove .NET 7
adamralph · Jul 21, 2024 · 75a9cb6 · 75a9cb6
2 parents 9d5f1ec + c10cbe1
commit 75a9cb6
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,12 +48,6 @@ jobs:
               framework: net6.0
               sdk: "6.0.418"
               sdk-major-minor: "6.0"
-          - job:
-              os: ubuntu-22.04
-            tests:
-              framework: net7.0
-              sdk: "7.0.405"
-              sdk-major-minor: "7.0"
           - job:
               os: ubuntu-22.04
               upload: true

diff --git a/MinVer.Lib/MinVer.Lib.csproj b/MinVer.Lib/MinVer.Lib.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 

diff --git a/MinVer/MinVer.csproj b/MinVer/MinVer.csproj
@@ -18,7 +18,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 

diff --git a/MinVer/build/MinVer.targets b/MinVer/build/MinVer.targets
@@ -10,7 +10,6 @@
     <MinVerDetailed>low</MinVerDetailed>
     <MinVerDetailed Condition="'$(MinVerVerbosity)' == 'detailed' Or '$(MinVerVerbosity)' == 'd' Or '$(MinVerVerbosity)' == 'diagnostic' Or '$(MinVerVerbosity)' == 'diag'">high</MinVerDetailed>
     <MinVerTargetFramework>net6.0</MinVerTargetFramework>
-    <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.4'">net7.0</MinVerTargetFramework>
     <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.8'">net8.0</MinVerTargetFramework>
     <NoWarn>$(NoWarn);NU5105</NoWarn>
   </PropertyGroup>

diff --git a/MinVerTests.Infra/MinVerCli.cs b/MinVerTests.Infra/MinVerCli.cs
@@ -14,9 +14,6 @@ public static string GetPath(string configuration) =>
 #if NET6_0
         Solution.GetFullPath($"minver-cli/bin/{configuration}/net6.0/minver-cli.dll");
 #endif
-#if NET7_0
-            Solution.GetFullPath($"minver-cli/bin/{configuration}/net7.0/minver-cli.dll");
-#endif
 #if NET8_0
             Solution.GetFullPath($"minver-cli/bin/{configuration}/net8.0/minver-cli.dll");
 #endif

diff --git a/MinVerTests.Infra/MinVerTests.Infra.csproj b/MinVerTests.Infra/MinVerTests.Infra.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MinVerTests.Lib/MinVerTests.Lib.csproj b/MinVerTests.Lib/MinVerTests.Lib.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RollForward>major</RollForward>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/minver-cli/minver-cli.csproj b/minver-cli/minver-cli.csproj
@@ -14,7 +14,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <RootNamespace>MinVer</RootNamespace>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ToolCommandName>minver</ToolCommandName>
     <LangVersion>default</LangVersion>
   </PropertyGroup>