Updating package dependencies

Serg-Norseman · Dec 6, 2024 · cbf646e · cbf646e
1 parent 79b2d78
commit cbf646e
Show file tree

Hide file tree

Showing 27 changed files with 80 additions and 62 deletions.
diff --git a/projects/GKCommunicator b/projects/GKCommunicator
diff --git a/projects/GKCore/GKCore.nstd.csproj b/projects/GKCore/GKCore.nstd.csproj
@@ -11,6 +11,8 @@
 
         <Configurations>Debug;Release</Configurations>
         <Platforms>MSWin86;MSWin64;Linux;MacOS;FreeBSD;Android;iPhone</Platforms>
+
+        <NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
     </PropertyGroup>
 
     <Import Project="..\GKConfigurations3.targets" />
@@ -48,17 +50,17 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
-        <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
-        <PackageReference Include="YamlDotNet" Version="12.0.0" />
+        <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+        <PackageReference Include="YamlDotNet" Version="16.2.1" />
         <PackageReference Include="UTF.Unknown" Version="2.5.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="iTextSharp.LGPLv2.Core" Version="3.3.3" />
-        <PackageReference Include="log4net" Version="2.0.15" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="iTextSharp.LGPLv2.Core" Version="3.4.18" />
+        <PackageReference Include="log4net" Version="3.0.3" />
     </ItemGroup>
 
 
     <ItemGroup Condition=" !$(DefineConstants.Contains('MOBILE')) ">
-        <PackageReference Include="NLua" Version="1.6.2" />
+        <PackageReference Include="NLua" Version="1.7.3" />
     </ItemGroup>
 
 

diff --git a/projects/GKGenetix b/projects/GKGenetix
diff --git a/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj b/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj
@@ -20,7 +20,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" !$(DefineConstants.Contains('MOBILE')) ">
-        <PackageReference Include="System.Data.SQLite" Version="1.0.117" />
+        <PackageReference Include="System.Data.SQLite" Version="1.0.119" />
     </ItemGroup>
 
     <ItemGroup Condition=" $(DefineConstants.Contains('OS_MSWIN')) ">

diff --git a/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj b/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
     </ItemGroup>
 
 </Project>
diff --git a/projects/GKTests/GKCore/ControllerTests.cs b/projects/GKTests/GKCore/ControllerTests.cs
@@ -448,6 +448,7 @@ public void Test_LocationEditDlgController()
             SubstituteControl<IButton>(view, "btnSearch");
             SubstituteControl<IButton>(view, "btnSelect");
             SubstituteControl<IButton>(view, "btnSelectName");
+            SubstituteControl<IButton>(view, "btnSelectCursor");
             SubstituteControl<IGroupBox>(view, "pageHistNames");
             SubstituteControl<IGroupBox>(view, "pageHistLinks");
 

diff --git a/projects/GKTests/GKCore/ListsTests.cs b/projects/GKTests/GKCore/ListsTests.cs
@@ -170,7 +170,7 @@ public void Test_LMGroup()
             Assert.Throws(typeof(ArgumentNullException), () => { listColumns.CopyTo(null); });
 
             listManager.QuickFilter.Value = "*";
-            listManager.AddCondition((byte)GroupListModel.ColumnType.ctName, ConditionKind.ck_Contains, "*roup*");
+            listManager.AddCondition((byte)GroupListModel.ColumnType.ctName, ConditionKind.ck_ContainsMask, "*roup*");
             Assert.IsTrue(listManager.CheckFilter());
         }
 

diff --git a/projects/GKv3/GEDKeeper3.sln b/projects/GKv3/GEDKeeper3.sln
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{4AF8
 		..\..\locales\russian.lng = ..\..\locales\russian.lng
 		..\..\locales\Serbian (Latin).lng = ..\..\locales\Serbian (Latin).lng
 		..\..\locales\Spanish.lng = ..\..\locales\Spanish.lng
+		..\..\locales\Turkish.lng = ..\..\locales\Turkish.lng
 		..\..\locales\ukrainian.lng = ..\..\locales\ukrainian.lng
 	EndProjectSection
 EndProject

diff --git a/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj b/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj
@@ -11,6 +11,8 @@
 
         <Configurations>Debug;Release</Configurations>
         <Platforms>MSWin86;MSWin64;Linux;MacOS;FreeBSD</Platforms>
+
+        <NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
     </PropertyGroup>
 
     <Import Project="..\..\GKConfigurations3.targets" />
@@ -35,7 +37,7 @@
 
     <ItemGroup>
         <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
 
@@ -50,7 +52,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" $(DefineConstants.Contains('OS_MSWIN')) ">
-        <PackageReference Include="Eto.Platform.Wpf" Version="2.8.0" />
+        <PackageReference Include="Eto.Platform.Wpf" Version="2.8.3" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(Platform)' == 'MSWin86' ">
@@ -89,7 +91,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" $(DefineConstants.Contains('OS_LINUX')) or $(DefineConstants.Contains('OS_FREEBSD')) ">
-        <PackageReference Include="Eto.Platform.Gtk" Version="2.8.0" />
+        <PackageReference Include="Eto.Platform.Gtk" Version="2.8.3" />
     </ItemGroup>
 
 
@@ -101,7 +103,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition=" $(DefineConstants.Contains('OS_MACOS')) ">
-        <PackageReference Include="Eto.Platform.Mac64" Version="2.8.0" />
+        <PackageReference Include="Eto.Platform.Mac64" Version="2.8.3" />
     </ItemGroup>
 
     <ItemGroup Condition=" $(DefineConstants.Contains('OS_MACOS')) ">

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/RepositoryCitEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/RepositoryCitEditDlg.cs
@@ -44,12 +44,11 @@ public sealed partial class RepositoryCitEditDlg : CommonDialog<IRepositoryCitEd
         private Button btnAccept;
         private Button btnCancel;
         private Button btnRepositoryAdd;
+        private GKSheetList fCallNumbersList;
 
 #pragma warning restore CS0169, CS0649, IDE0044, IDE0051
         #endregion
 
-        private readonly GKSheetList fCallNumbersList;
-
         public GDMRepositoryCitation RepositoryCitation
         {
             get { return fController.RepositoryCitation; }

diff --git a/projects/GKv3/GKComponents/GKComponents.csproj b/projects/GKv3/GKComponents/GKComponents.csproj
@@ -10,6 +10,8 @@
 
         <Configurations>Debug;Release</Configurations>
         <Platforms>MSWin86;MSWin64;Linux;MacOS;FreeBSD</Platforms>
+
+        <NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
     </PropertyGroup>
 
     <Import Project="..\..\GKConfigurations3.targets" />
@@ -34,11 +36,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
         <PackageReference Include="OxyPlot.Eto" Version="1.1.0" />
         <PackageReference Include="ExifLibNet" Version="2.1.4" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
     </ItemGroup>
 
     <ItemGroup Condition=" !$(DefineConstants.Contains('DIS_VLC')) ">

diff --git a/projects/GKv3/GKComponents/GKUI/Components/GKListView.cs b/projects/GKv3/GKComponents/GKUI/Components/GKListView.cs
@@ -20,6 +20,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using BSLib;
 using Eto.Drawing;
 using Eto.Forms;
@@ -305,21 +306,14 @@ protected override void OnColumnHeaderClick(GridColumnEventArgs e)
             base.OnColumnHeaderClick(e);
         }
 
-        // In Eto not exists
-        /*protected override void OnDrawColumnHeader(DrawListViewColumnHeaderEventArgs e)
-        {
-        }*/
-
         /*protected override void OnSelectionChanged(EventArgs e)
         {
             base.OnSelectionChanged(e);
 
             // FIXME: [Wpf]GridView.ReloadData(...) is very slow, Eto 2.7.0 #2245
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-                return;
+                base.ReloadData(base.SelectedRow);
             }
-
-            base.ReloadData(base.SelectedRow);
         }*/
 
         private int fRowFormatting = -1;

diff --git a/projects/GKv3/GKComponents/GKUI/Forms/PrintableForm.cs b/projects/GKv3/GKComponents/GKUI/Forms/PrintableForm.cs
@@ -20,9 +20,11 @@
 
 //define DEBUG_PRINT
 
+using System;
 using BSLib;
 using Eto.Drawing;
 using Eto.Forms;
+using GKCore;
 using GKCore.Design.Graphics;
 using GKUI.Platform.Handlers;
 
@@ -108,17 +110,25 @@ public void DoPrint()
         {
             InitCurDoc();
 
-            using (PrintDialog printDlg = new PrintDialog()) {
-                printDlg.ShowDialog(this, fPrintDoc);
+            try {
+                using (PrintDialog printDlg = new PrintDialog()) {
+                    printDlg.ShowDialog(this, fPrintDoc);
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("PrintableForm.DoPrint()", ex);
             }
         }
 
         public void DoPrintPreview()
         {
             InitCurDoc();
 
-            using (PrintPreviewDialog previewDlg = new PrintPreviewDialog(fPrintDoc)) {
-                previewDlg.ShowDialog(this);
+            try {
+                using (PrintPreviewDialog previewDlg = new PrintPreviewDialog(fPrintDoc)) {
+                    previewDlg.ShowDialog(this);
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("PrintableForm.DoPrintPreview()", ex);
             }
         }
 

diff --git a/projects/GKv3/NOTES.md b/projects/GKv3/NOTES.md
@@ -1,4 +1,11 @@
 
+# Fundamentals
+
+.NET 6,8-9 - only supports Windows >= 10 (7 SP1 and 8.1 also ended!)
+  https://github.com/dotnet/core/blob/main/release-notes/9.0/supported-os.md
+  https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md
+  https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md
+
 # Eto.Forms
 
 Eto.Forms v2.7.4 compatible with netfw462

diff --git a/projects/plugins/GKBackupPlugin/GKBackupPlugin.net.csproj b/projects/plugins/GKBackupPlugin/GKBackupPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKBackupPlugin.props" />

diff --git a/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj b/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKCalculatorPlugin.props" />

diff --git a/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj b/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKCalendarPlugin.props" />

diff --git a/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj b/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKChroniclePlugin.props" />

diff --git a/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj b/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj
@@ -29,8 +29,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKFlowInputPlugin.props" />

diff --git a/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj b/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKHistoryDataPlugin.props" />

diff --git a/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj b/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKLifePlugin.props" />

diff --git a/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj b/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKNamesBookPlugin.props" />

diff --git a/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj b/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj
@@ -28,8 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKNavigatorPlugin.props" />

diff --git a/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj b/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj
@@ -30,9 +30,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
-        <PackageReference Include="NPOI" Version="2.6.2" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
+        <PackageReference Include="NPOI" Version="2.7.2" />
     </ItemGroup>
 
     <Import Project="GKPedigreeImporterPlugin.props" />

diff --git a/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj b/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj
@@ -30,11 +30,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
-        <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
-        <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
-        <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
+        <PackageReference Include="Lucene.Net" Version="4.8.0-beta00017" />
+        <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00017" />
+        <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00017" />
     </ItemGroup>
 
     <Import Project="GKTextSearchPlugin.props" />

diff --git a/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj b/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj
@@ -27,8 +27,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.0" />
-        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3" />
+        <PackageReference Include="Eto.Serialization.Xaml" Version="2.8.3" />
     </ItemGroup>
 
     <Import Project="GKTimeLinePlugin.props" />
+2 −2		GKCommunicatorPlugin/GKCommunicatorPlugin.net.csproj
+5 −3		GKNetCore/GKNetCore.nstd.csproj
+4 −2		GKNetUI.EtoForms/GKNetUI.net.csproj
+3 −1		GKGenetix.Core/GKGenetix.Core.nstd.csproj
+2 −2		GKGenetix.UI.EtoForms/GKGenetix.UI.EtoForms.csproj
+2 −2		GKGenetixPlugin/GKGenetixPlugin.net.csproj