Update framework to 462 and drop 461 build

sillsdev · Nov 20, 2024 · b530168 · b530168
1 parent 56b1609
commit b530168
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <Description>End-user collaboration library via 3-way xml merging and hg dvcs under the hood.</Description>
     <Company>SIL International</Company>

diff --git a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>ChorusMerge.Tests</RootNamespace>
     <AssemblyTitle>ChorusMerge.Tests</AssemblyTitle>
     <Description>Unit tests for LibChorus.dll</Description>
-    <TargetFrameworks>net461;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/ChorusMerge/ChorusMerge.csproj b/src/ChorusMerge/ChorusMerge.csproj
@@ -5,15 +5,15 @@
     <AssemblyTitle>ChorusMerge</AssemblyTitle>
     <PackageId>SIL.Chorus.ChorusMerge</PackageId>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/sillsdev/chorus.git</RepositoryUrl>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
+    <PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.0.1" />
   </ItemGroup>

diff --git a/src/LibChorus/LibChorus.csproj b/src/LibChorus/LibChorus.csproj
@@ -4,22 +4,22 @@
     <RootNamespace>Chorus</RootNamespace>
     <AssemblyTitle>LibChorus</AssemblyTitle>
     <PackageId>SIL.Chorus.LibChorus</PackageId>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/sillsdev/chorus.git</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.9.4" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
-    <PackageReference Include="icu.net" Version="2.9.0" />
+    <PackageReference Include="icu.net" Version="3.0.0-*" />
     <PackageReference Include="Icu4c.Win.Min" Version="59.1.7" IncludeAssets="build" />
-    <PackageReference Include="L10NSharp" Version="6.0.0-*" />
+    <PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="NDesk.DBus" Version="0.15.0" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
     <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.*" IncludeAssets="build" />
-    <PackageReference Include="SIL.Core" Version="12.0.0-*" />
-    <PackageReference Include="SIL.Lift" Version="12.0.0-*" />
-    <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
+    <PackageReference Include="SIL.Core" Version="15.0.0-*" />
+    <PackageReference Include="SIL.Lift" Version="15.0.0-*" />
+    <PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" />

diff --git 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
@@ -4,7 +4,7 @@
     <RootNamespace>LibChorus.Tests</RootNamespace>
     <AssemblyTitle>LibChorus.Tests</AssemblyTitle>
     <Description>Unit tests for LibChorus.dll</Description>
-    <TargetFrameworks>net461;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>