diff --git a/projects/GKCommunicator b/projects/GKCommunicator index a7ebc268b..80d05062d 160000 --- a/projects/GKCommunicator +++ b/projects/GKCommunicator @@ -1 +1 @@ -Subproject commit a7ebc268bd6ef8536e715975a0e52b4e75fbc85e +Subproject commit 80d05062dd59596d4802656e7fee7e99b70ab15d diff --git a/projects/GKCore/GKCore.nstd.csproj b/projects/GKCore/GKCore.nstd.csproj index 5c1bf54a5..e261fd269 100644 --- a/projects/GKCore/GKCore.nstd.csproj +++ b/projects/GKCore/GKCore.nstd.csproj @@ -11,6 +11,8 @@ Debug;Release MSWin86;MSWin64;Linux;MacOS;FreeBSD;Android;iPhone + + $(NoWarn);NU1902;NU1903;NU1904 @@ -48,17 +50,17 @@ - - + + - - - + + + - + diff --git a/projects/GKGenetix b/projects/GKGenetix index 220bfe773..ea1cd9c6d 160000 --- a/projects/GKGenetix +++ b/projects/GKGenetix @@ -1 +1 @@ -Subproject commit 220bfe773d74a146d82b1183674ee5f5c423736f +Subproject commit ea1cd9c6d2882488e364c2043c5a5c9c189a2336 diff --git a/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj b/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj index c726f7e8d..910680875 100644 --- a/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj +++ b/projects/GKMap/GKMap.Core/GKMap.Core.nstd.csproj @@ -20,7 +20,7 @@ - + diff --git a/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj b/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj index b21d6b6c6..aa0f426c3 100644 --- a/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj +++ b/projects/GKMap/GKMap.EtoForms/GKMap.EtoForms.csproj @@ -19,7 +19,7 @@ - + diff --git a/projects/GKTests/GKCore/ControllerTests.cs b/projects/GKTests/GKCore/ControllerTests.cs index 8945bce3e..f789a2a83 100644 --- a/projects/GKTests/GKCore/ControllerTests.cs +++ b/projects/GKTests/GKCore/ControllerTests.cs @@ -448,6 +448,7 @@ public void Test_LocationEditDlgController() SubstituteControl(view, "btnSearch"); SubstituteControl(view, "btnSelect"); SubstituteControl(view, "btnSelectName"); + SubstituteControl(view, "btnSelectCursor"); SubstituteControl(view, "pageHistNames"); SubstituteControl(view, "pageHistLinks"); diff --git a/projects/GKTests/GKCore/ListsTests.cs b/projects/GKTests/GKCore/ListsTests.cs index a08e1f628..f7a13fae4 100644 --- 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 index 578a10158..2ab449c0c 100644 --- 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 index 299441a33..aed6120fb 100644 --- a/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj +++ b/projects/GKv3/GEDKeeper3/GEDKeeper3.csproj @@ -11,6 +11,8 @@ Debug;Release MSWin86;MSWin64;Linux;MacOS;FreeBSD + + $(NoWarn);NU1902;NU1903;NU1904 @@ -35,7 +37,7 @@ - + @@ -50,7 +52,7 @@ - + @@ -89,7 +91,7 @@ - + @@ -101,7 +103,7 @@ - + diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/RepositoryCitEditDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/RepositoryCitEditDlg.cs index 05029723f..a4efa3457 100644 --- 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 : CommonDialogDebug;Release MSWin86;MSWin64;Linux;MacOS;FreeBSD + + $(NoWarn);NU1902;NU1903;NU1904 @@ -34,11 +36,11 @@ - - + + - + diff --git a/projects/GKv3/GKComponents/GKUI/Components/GKListView.cs b/projects/GKv3/GKComponents/GKUI/Components/GKListView.cs index 37ad8a472..31d3c52da 100644 --- 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 index 0bb43e0a3..eca579a4b 100644 --- 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,8 +110,12 @@ 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); } } @@ -117,8 +123,12 @@ 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 index f80637751..aed18980c 100644 --- 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 index c5507f0b6..c3f090aa2 100644 --- a/projects/plugins/GKBackupPlugin/GKBackupPlugin.net.csproj +++ b/projects/plugins/GKBackupPlugin/GKBackupPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj b/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj index dc0900b6b..a4fdd4e52 100644 --- a/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj +++ b/projects/plugins/GKCalculatorPlugin/GKCalculatorPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj b/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj index c43e8edd5..83dcca485 100644 --- a/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj +++ b/projects/plugins/GKCalendarPlugin/GKCalendarPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj b/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj index 0df90ce69..440762b1b 100644 --- a/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj +++ b/projects/plugins/GKChroniclePlugin/GKChroniclePlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj b/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj index 0506a08a6..afc1df645 100644 --- a/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj +++ b/projects/plugins/GKFlowInputPlugin/GKFlowInputPlugin.net.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj b/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj index babcbade4..9cdd3edd4 100644 --- a/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj +++ b/projects/plugins/GKHistoryDataPlugin/GKHistoryDataPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj b/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj index 045eebc06..79206356c 100644 --- a/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj +++ b/projects/plugins/GKLifePlugin/GKLifePlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj b/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj index b58292082..5f7431058 100644 --- a/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj +++ b/projects/plugins/GKNamesBookPlugin/GKNamesBookPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj b/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj index f7d38d04d..45a38445f 100644 --- a/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj +++ b/projects/plugins/GKNavigatorPlugin/GKNavigatorPlugin.net.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj b/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj index bf8d72f23..79377fac5 100644 --- a/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj +++ b/projects/plugins/GKPedigreeImporterPlugin/GKPedigreeImporterPlugin.net.csproj @@ -30,9 +30,9 @@ - - - + + + diff --git a/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj b/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj index 1d12e876d..b4fdb2f0b 100644 --- a/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj +++ b/projects/plugins/GKTextSearchPlugin/GKTextSearchPlugin.net.csproj @@ -30,11 +30,11 @@ - - - - - + + + + + diff --git a/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj b/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj index 41f4e7e02..2c7527bdf 100644 --- a/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj +++ b/projects/plugins/GKTimeLinePlugin/GKTimeLinePlugin.net.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/projects/plugins/GKWordsCloudPlugin/GKWordsCloudPlugin.net.csproj b/projects/plugins/GKWordsCloudPlugin/GKWordsCloudPlugin.net.csproj index 15c7f341b..4a9e5932a 100644 --- a/projects/plugins/GKWordsCloudPlugin/GKWordsCloudPlugin.net.csproj +++ b/projects/plugins/GKWordsCloudPlugin/GKWordsCloudPlugin.net.csproj @@ -28,8 +28,8 @@ - - + +