Merge pull request #645 from adamralph/remove-net7

remove .NET 7
adamralph · Jul 21, 2024 · a4fb3e1 · a4fb3e1
2 parents 1c68cae + 21701e5
commit a4fb3e1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,6 @@ jobs:
         with:
           dotnet-version: |
             6.0.418
-            7.0.405
             8.0.101
       - uses: actions/[email protected]
         with:

diff --git a/SimpleExec/Command.cs b/SimpleExec/Command.cs
@@ -376,7 +376,7 @@ private static async Task RunAsync(
             await process.StandardInput.WriteAsync(standardInput).ConfigureAwait(false);
             process.StandardInput.Close();
 
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
             readOutput = process.StandardOutput.ReadToEndAsync(cancellationToken);
             readError = process.StandardError.ReadToEndAsync(cancellationToken);
 #else

diff --git a/SimpleExec/SimpleExec.csproj b/SimpleExec/SimpleExec.csproj
@@ -11,7 +11,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>https://github.com/adamralph/simple-exec/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/SimpleExecTester/SimpleExecTester.csproj b/SimpleExecTester/SimpleExecTester.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RollForward>major</RollForward>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/SimpleExecTests/Infra/Tester.cs b/SimpleExecTests/Infra/Tester.cs
@@ -9,12 +9,6 @@ internal static class Tester
 #if NET6_0 && RELEASE
             "../../../../SimpleExecTester/bin/Release/net6.0/SimpleExecTester.dll";
 #endif
-#if NET7_0 && DEBUG
-        $"../../../../SimpleExecTester/bin/Debug/net7.0/SimpleExecTester.dll";
-#endif
-#if NET7_0 && RELEASE
-            $"../../../../SimpleExecTester/bin/Release/net7.0/SimpleExecTester.dll";
-#endif
 #if NET8_0 && DEBUG
             $"../../../../SimpleExecTester/bin/Debug/net8.0/SimpleExecTester.dll";
 #endif

diff --git a/SimpleExecTests/SimpleExecTests.csproj b/SimpleExecTests/SimpleExecTests.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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ jobs: @@
             with:
               dotnet-version: |
 .0.418
-.0.405
 .0.101
           - uses: actions/[email protected]
             with:
@@ Expand Down @@