diff --git a/.github/workflows/ci+cd.yml b/.github/workflows/ci+cd.yml index 139cd648..aceea66b 100644 --- a/.github/workflows/ci+cd.yml +++ b/.github/workflows/ci+cd.yml @@ -26,11 +26,11 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - framework: [net461, net8.0] - exclude: - # dotnet on Linux cannot build net461 without additional, unnecessary, work - - os: ubuntu-latest - framework: net461 + framework: [net462, net8.0] +# exclude: +# # dotnet on Linux cannot build net461 without additional, unnecessary, work +# - os: ubuntu-latest +# framework: net461 concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.framework }} cancel-in-progress: true @@ -45,7 +45,6 @@ jobs: uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0 with: dotnet-version: | - 6.0.x 8.0.x - name: Restore @@ -60,11 +59,11 @@ jobs: - name: Test Chorus run: dotnet test src/Chorus.Tests/Chorus.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults - if: matrix.framework == 'net461' + if: matrix.framework == 'net462' - name: Test Chorus Hub run: dotnet test src/ChorusHubTests/ChorusHubTests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults - if: matrix.framework == 'net461' + if: matrix.framework == 'net462' - name: Test ChorusMerge run: dotnet test src/ChorusMerge.Tests/ChorusMerge.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults diff --git a/Directory.Build.props b/Directory.Build.props index 264f8f66..d0cf1ae2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461 + net462 Debug;Release End-user collaboration library via 3-way xml merging and hg dvcs under the hood. SIL International diff --git a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj index c9adf996..3193ad0f 100644 --- a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj +++ b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj @@ -4,7 +4,7 @@ ChorusMerge.Tests ChorusMerge.Tests Unit tests for LibChorus.dll - net461;net8.0 + net462;net8.0 true false diff --git a/src/ChorusMerge/ChorusMerge.csproj b/src/ChorusMerge/ChorusMerge.csproj index 37d019c2..4348af3e 100644 --- a/src/ChorusMerge/ChorusMerge.csproj +++ b/src/ChorusMerge/ChorusMerge.csproj @@ -5,7 +5,7 @@ ChorusMerge SIL.Chorus.ChorusMerge Exe - net461;net8.0 + net462;net8.0 https://github.com/sillsdev/chorus.git true @@ -13,7 +13,7 @@ - + diff --git a/src/LibChorus/LibChorus.csproj b/src/LibChorus/LibChorus.csproj index 330dbd98..70f2c232 100644 --- a/src/LibChorus/LibChorus.csproj +++ b/src/LibChorus/LibChorus.csproj @@ -4,22 +4,22 @@ Chorus LibChorus SIL.Chorus.LibChorus - net461;netstandard2.0 + net462;netstandard2.0 https://github.com/sillsdev/chorus.git - + - + - - - + + + diff --git a/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs b/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs index 70344314..3863ca74 100644 --- a/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs +++ b/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs @@ -22,7 +22,8 @@ private static string SamplePluginPath var configOutputDir = Directory.GetParent(BaseDir); var outputDir = configOutputDir.Parent.FullName; var config = configOutputDir.Name; - var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, "net461", "Tests-ChorusPlugin.dll"); + var frameworkDir = Path.GetFileName(BaseDir); + var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, frameworkDir, "Tests-ChorusPlugin.dll"); return samplePluginDllPath; } } diff --git a/src/LibChorusTests/LibChorus.Tests.csproj b/src/LibChorusTests/LibChorus.Tests.csproj index f35a40c5..04ea7a74 100644 --- a/src/LibChorusTests/LibChorus.Tests.csproj +++ b/src/LibChorusTests/LibChorus.Tests.csproj @@ -4,7 +4,7 @@ LibChorus.Tests LibChorus.Tests Unit tests for LibChorus.dll - net461;net8.0 + net462;net8.0 true false