From 21701e5d84f5550cdd925d7f4cc6e77855165efb Mon Sep 17 00:00:00 2001 From: Adam Ralph Date: Sun, 21 Jul 2024 13:16:17 +0200 Subject: [PATCH] remove .NET 7 --- .github/workflows/ci.yml | 1 - SimpleExec/Command.cs | 2 +- SimpleExec/SimpleExec.csproj | 2 +- SimpleExecTester/SimpleExecTester.csproj | 2 +- SimpleExecTests/Infra/Tester.cs | 6 ------ SimpleExecTests/SimpleExecTests.csproj | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8c93f3..5e8bf00 100644 --- 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/checkout@v4.1.7 with: diff --git a/SimpleExec/Command.cs b/SimpleExec/Command.cs index 16b1be6..45fa839 100644 --- 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 index 7d0a74d..f7194ca 100644 --- a/SimpleExec/SimpleExec.csproj +++ b/SimpleExec/SimpleExec.csproj @@ -11,7 +11,7 @@ README.md https://github.com/adamralph/simple-exec/blob/main/CHANGELOG.md true - net6.0;net7.0;net8.0 + net6.0;net8.0 diff --git a/SimpleExecTester/SimpleExecTester.csproj b/SimpleExecTester/SimpleExecTester.csproj index 17ae456..38ee1db 100644 --- a/SimpleExecTester/SimpleExecTester.csproj +++ b/SimpleExecTester/SimpleExecTester.csproj @@ -4,7 +4,7 @@ false Exe major - net6.0;net7.0;net8.0 + net6.0;net8.0 diff --git a/SimpleExecTests/Infra/Tester.cs b/SimpleExecTests/Infra/Tester.cs index 1f209df..24afb50 100644 --- 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 index 6e54d8c..73362a2 100644 --- a/SimpleExecTests/SimpleExecTests.csproj +++ b/SimpleExecTests/SimpleExecTests.csproj @@ -2,7 +2,7 @@ major - net6.0;net7.0;net8.0 + net6.0;net8.0