From 339cfdcb46d066e5811b097b48fb64fd1534d6d6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 15:22:41 +0000 Subject: [PATCH 1/4] Initial plan From 63c19e54ba7e9633a8e49e1f28410d2dc6b913d5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 15:35:32 +0000 Subject: [PATCH 2/4] Migrate projects to .NET 10 - Fix XML doc error and convert 4 projects Co-authored-by: KaptenJon <10761546+KaptenJon@users.noreply.github.com> --- GDMCore/GDMCore.csproj | 160 +----- GDMCore/GDMCore.csproj.old | 158 ++++++ GDMCore/Properties/AssemblyInfo.cs | 35 -- GDMCore/packages.config | 4 - GDMInterfaces/GDMInterfaces.csproj | 152 +----- GDMInterfaces/GDMInterfaces.csproj.old | 147 +++++ GDMInterfaces/IDistribution.cs | 2 +- GDMInterfaces/Properties/AssemblyInfo.cs | 35 -- GDMInterfaces/packages.config | 4 - GDMPlugins/GDMPlugins.csproj | 502 +----------------- GDMPlugins/GDMPlugins.csproj.old | 478 +++++++++++++++++ GDMPlugins/Icons.resx | 4 +- GDMPlugins/Properties/AssemblyInfo.cs | 35 -- ...tive-icon.png => database-active-icon.png} | Bin GDMPlugins/Resources/{Team2.PNG => team2.png} | Bin .../Statistics/DistributionEvaluator.cs | 2 +- GDMPlugins/packages.config | 14 - GDMService/GDMService.csproj | 114 +--- GDMService/GDMService.csproj.old | 111 ++++ GDMService/OpenFileOrFolderDialog.cs | 12 - GDMService/Properties/AssemblyInfo.cs | 36 -- GDMTool/ConfigViewer.cs | 2 +- GDMTool/DataTableView.cs | 3 +- GDMTool/GDMTool.csproj | 352 +----------- GDMTool/GDMTool.csproj.old | 349 ++++++++++++ GDMTool/Main.cs | 2 +- GDMTool/Properties/AssemblyInfo.cs | 35 -- GDMTool/TableViewer.cs | 2 +- GDMTool/packages.config | 4 - 29 files changed, 1330 insertions(+), 1424 deletions(-) create mode 100644 GDMCore/GDMCore.csproj.old delete mode 100644 GDMCore/Properties/AssemblyInfo.cs delete mode 100644 GDMCore/packages.config create mode 100644 GDMInterfaces/GDMInterfaces.csproj.old delete mode 100644 GDMInterfaces/Properties/AssemblyInfo.cs delete mode 100644 GDMInterfaces/packages.config create mode 100644 GDMPlugins/GDMPlugins.csproj.old delete mode 100644 GDMPlugins/Properties/AssemblyInfo.cs rename GDMPlugins/Resources/{Database-Active-icon.png => database-active-icon.png} (100%) rename GDMPlugins/Resources/{Team2.PNG => team2.png} (100%) delete mode 100644 GDMPlugins/packages.config create mode 100644 GDMService/GDMService.csproj.old delete mode 100644 GDMService/OpenFileOrFolderDialog.cs delete mode 100644 GDMService/Properties/AssemblyInfo.cs create mode 100644 GDMTool/GDMTool.csproj.old delete mode 100644 GDMTool/Properties/AssemblyInfo.cs delete mode 100644 GDMTool/packages.config diff --git a/GDMCore/GDMCore.csproj b/GDMCore/GDMCore.csproj index 87b288c..d824c77 100644 --- a/GDMCore/GDMCore.csproj +++ b/GDMCore/GDMCore.csproj @@ -1,158 +1,20 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {AF4D5355-E689-480F-B266-5006C1ECAA54} - Library - Properties + net10.0-windows + true + true GDMCore GDMCore - v4.7.2 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - SAK - SAK - SAK - SAK - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - false - AllRules.ruleset - AnyCPU - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\Documents\Software Design Specification\XMLDoc\GDMCore.XML - Off - false - AllRules.ruleset - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - AllRules.ruleset - false - - - bin\x86\Release\ - TRACE - ..\..\Documents\Software Design Specification\XMLDoc\GDMCore.XML - true - pdbonly - x86 - Off - prompt - AllRules.ruleset - false - - - false - - - - + enable + - - ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} - GDMInterfaces - + + - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - + - - - \ No newline at end of file + diff --git a/GDMCore/GDMCore.csproj.old b/GDMCore/GDMCore.csproj.old new file mode 100644 index 0000000..87b288c --- /dev/null +++ b/GDMCore/GDMCore.csproj.old @@ -0,0 +1,158 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {AF4D5355-E689-480F-B266-5006C1ECAA54} + Library + Properties + GDMCore + GDMCore + v4.7.2 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + SAK + SAK + SAK + SAK + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + false + AllRules.ruleset + AnyCPU + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + ..\..\Documents\Software Design Specification\XMLDoc\GDMCore.XML + Off + false + AllRules.ruleset + false + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + AllRules.ruleset + false + + + bin\x86\Release\ + TRACE + ..\..\Documents\Software Design Specification\XMLDoc\GDMCore.XML + true + pdbonly + x86 + Off + prompt + AllRules.ruleset + false + + + false + + + + + + + + ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} + GDMInterfaces + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + \ No newline at end of file diff --git a/GDMCore/Properties/AssemblyInfo.cs b/GDMCore/Properties/AssemblyInfo.cs deleted file mode 100644 index e20093a..0000000 --- a/GDMCore/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GDMCore")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GDMCore")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("51b79fb8-f545-4f88-a6da-7b091889f720")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GDMCore/packages.config b/GDMCore/packages.config deleted file mode 100644 index 1c74c17..0000000 --- a/GDMCore/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GDMInterfaces/GDMInterfaces.csproj b/GDMInterfaces/GDMInterfaces.csproj index cb46904..b0236df 100644 --- a/GDMInterfaces/GDMInterfaces.csproj +++ b/GDMInterfaces/GDMInterfaces.csproj @@ -1,147 +1,17 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} - Library - Properties + net10.0-windows + true + true GDMInterfaces GDMInterfaces - v4.7.2 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - SAK - SAK - SAK - SAK + enable + true - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\Documents\Software Design Specification\XMLDoc\GDMInterfaces.XML - AllRules.ruleset - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - AllRules.ruleset - false - - - bin\x86\Release\ - TRACE - ..\..\Documents\Software Design Specification\XMLDoc\GDMInterfaces.XML - true - pdbonly - x86 - prompt - AllRules.ruleset - false - - - false - - - - - - - - ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - + - - - - \ No newline at end of file + + diff --git a/GDMInterfaces/GDMInterfaces.csproj.old b/GDMInterfaces/GDMInterfaces.csproj.old new file mode 100644 index 0000000..cb46904 --- /dev/null +++ b/GDMInterfaces/GDMInterfaces.csproj.old @@ -0,0 +1,147 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} + Library + Properties + GDMInterfaces + GDMInterfaces + v4.7.2 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + SAK + SAK + SAK + SAK + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + ..\..\Documents\Software Design Specification\XMLDoc\GDMInterfaces.XML + AllRules.ruleset + false + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + AllRules.ruleset + false + + + bin\x86\Release\ + TRACE + ..\..\Documents\Software Design Specification\XMLDoc\GDMInterfaces.XML + true + pdbonly + x86 + prompt + AllRules.ruleset + false + + + false + + + + + + + + ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + \ No newline at end of file diff --git a/GDMInterfaces/IDistribution.cs b/GDMInterfaces/IDistribution.cs index de3b12c..81c8957 100644 --- a/GDMInterfaces/IDistribution.cs +++ b/GDMInterfaces/IDistribution.cs @@ -14,7 +14,7 @@ public interface IDistribution /// /// Location parameter /// Scale parameter - /// Shape paramet + /// Shape parameter void MLE(List observations, out double a, out double b, out double c); /// diff --git a/GDMInterfaces/Properties/AssemblyInfo.cs b/GDMInterfaces/Properties/AssemblyInfo.cs deleted file mode 100644 index 1c0f5b0..0000000 --- a/GDMInterfaces/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GDMInterfaces")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GDMInterfaces")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d2fa2157-184d-4fb9-a833-bb21759c674a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GDMInterfaces/packages.config b/GDMInterfaces/packages.config deleted file mode 100644 index 1c74c17..0000000 --- a/GDMInterfaces/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GDMPlugins/GDMPlugins.csproj b/GDMPlugins/GDMPlugins.csproj index 60e0607..188efbd 100644 --- a/GDMPlugins/GDMPlugins.csproj +++ b/GDMPlugins/GDMPlugins.csproj @@ -1,478 +1,34 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {C469B1F9-2DA6-418F-9E49-378ACB1D8869} - Library - Properties + net10.0-windows + true + true + true GDMPlugins GDMPlugins - v4.7.2 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - SAK - SAK - SAK - SAK - - - - - true - full - false ..\GDMTool\Plugin\ - DEBUG;TRACE - prompt - 4 - GDMPlugins.ruleset - false - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - GDMPlugins.ruleset - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - GDMPlugins.ruleset - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - GDMPlugins.ruleset - false + enable - - false - - - - - - - - ..\packages\Accord.3.8.0\lib\net462\Accord.dll - - - ..\packages\Accord.Math.3.8.0\lib\net462\Accord.Math.dll - - - ..\packages\Accord.Math.3.8.0\lib\net462\Accord.Math.Core.dll - - - ..\packages\Accord.Statistics.3.8.0\lib\net462\Accord.Statistics.dll - - - - ..\packages\ExcelDataReader.2.1.2.3\lib\net45\Excel.dll - - - ..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll - - - ..\packages\LibOptimization.1.12.1\lib\net40\LibOptimization.dll - - - ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll - - - ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll - - - ..\packages\Microsoft.Data.ConnectionUI.16.1.28916.169\lib\net45\Microsoft.Data.ConnectionUI.dll - - - ..\packages\DataConnectionDialog.1.2\lib\Microsoft.Data.ConnectionUI.Dialog.dll - True - - - - - - - - - - - - - - - - - - - - - - ..\packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll - True - - - - - - - - - - - - - - - - - Form - - - CreateStringDataEditor.cs - - - - - Form - - - CreateNumericDataEditor.cs - - - - - - Form - - - DateDifferenceEditor.cs - - - - - - - - - True - True - Icons.resx - - - - - - - - - - - - Form - - - DateConverterEditor.cs - - - - - - - Form - - - DateIntervalEditor.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - ConfirmationEditor.cs - - - - - - - - - - - - Form - - - GroupingAndPreviewEditor.cs - - - - - - - - - - - - Code - - - - - - - - - VisulizationDataset.xsd - - - True - True - VisulizationDataset.xsd - - - - Form - - - VisulizeFormcs.cs - - - - - {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} - GDMInterfaces - - - - - PublicResXFileCodeGenerator - Designer - Icons.Designer.cs - - - Designer - - - - ConfirmationEditor.cs - Designer - - - GroupingAndPreviewEditor.cs - Designer - - - VisulizeFormcs.cs - - - - - DateConverterEditor.cs - Designer - - - DateIntervalEditor.cs - Designer - - - - - CreateStringDataEditor.cs - Designer - - - CreateNumericDataEditor.cs - Designer - - - DateDifferenceEditor.cs - Designer - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - VisulizationDataset.xsd - - - Designer - MSDataSetGenerator - VisulizationDataset.Designer.cs - - - VisulizationDataset.xsd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ConnectSQLServer.Images - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/GDMPlugins/GDMPlugins.csproj.old b/GDMPlugins/GDMPlugins.csproj.old new file mode 100644 index 0000000..60e0607 --- /dev/null +++ b/GDMPlugins/GDMPlugins.csproj.old @@ -0,0 +1,478 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {C469B1F9-2DA6-418F-9E49-378ACB1D8869} + Library + Properties + GDMPlugins + GDMPlugins + v4.7.2 + 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + SAK + SAK + SAK + SAK + + + + + true + full + false + ..\GDMTool\Plugin\ + DEBUG;TRACE + prompt + 4 + GDMPlugins.ruleset + false + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + GDMPlugins.ruleset + false + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + GDMPlugins.ruleset + false + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + GDMPlugins.ruleset + false + + + false + + + + + + + + ..\packages\Accord.3.8.0\lib\net462\Accord.dll + + + ..\packages\Accord.Math.3.8.0\lib\net462\Accord.Math.dll + + + ..\packages\Accord.Math.3.8.0\lib\net462\Accord.Math.Core.dll + + + ..\packages\Accord.Statistics.3.8.0\lib\net462\Accord.Statistics.dll + + + + ..\packages\ExcelDataReader.2.1.2.3\lib\net45\Excel.dll + + + ..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll + + + ..\packages\LibOptimization.1.12.1\lib\net40\LibOptimization.dll + + + ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll + + + ..\packages\Meta.Numerics.4.0.7\lib\netstandard1.1\Meta.Numerics.dll + + + ..\packages\Microsoft.Data.ConnectionUI.16.1.28916.169\lib\net45\Microsoft.Data.ConnectionUI.dll + + + ..\packages\DataConnectionDialog.1.2\lib\Microsoft.Data.ConnectionUI.Dialog.dll + True + + + + + + + + + + + + + + + + + + + + + + ..\packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll + True + + + + + + + + + + + + + + + + + Form + + + CreateStringDataEditor.cs + + + + + Form + + + CreateNumericDataEditor.cs + + + + + + Form + + + DateDifferenceEditor.cs + + + + + + + + + True + True + Icons.resx + + + + + + + + + + + + Form + + + DateConverterEditor.cs + + + + + + + Form + + + DateIntervalEditor.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + ConfirmationEditor.cs + + + + + + + + + + + + Form + + + GroupingAndPreviewEditor.cs + + + + + + + + + + + + Code + + + + + + + + + VisulizationDataset.xsd + + + True + True + VisulizationDataset.xsd + + + + Form + + + VisulizeFormcs.cs + + + + + {EFCBC6B5-139A-4ABE-B900-9A3BA074BB09} + GDMInterfaces + + + + + PublicResXFileCodeGenerator + Designer + Icons.Designer.cs + + + Designer + + + + ConfirmationEditor.cs + Designer + + + GroupingAndPreviewEditor.cs + Designer + + + VisulizeFormcs.cs + + + + + DateConverterEditor.cs + Designer + + + DateIntervalEditor.cs + Designer + + + + + CreateStringDataEditor.cs + Designer + + + CreateNumericDataEditor.cs + Designer + + + DateDifferenceEditor.cs + Designer + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + + + + + + + VisulizationDataset.xsd + + + Designer + MSDataSetGenerator + VisulizationDataset.Designer.cs + + + VisulizationDataset.xsd + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ConnectSQLServer.Images + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GDMPlugins/Icons.resx b/GDMPlugins/Icons.resx index cfe0cd7..ba9201b 100644 --- a/GDMPlugins/Icons.resx +++ b/GDMPlugins/Icons.resx @@ -221,9 +221,9 @@ Resources\insert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - resources\database-active-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\database-active-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - resources\team2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\team2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GDMPlugins/Properties/AssemblyInfo.cs b/GDMPlugins/Properties/AssemblyInfo.cs deleted file mode 100644 index 00b39b8..0000000 --- a/GDMPlugins/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GDMPlugins")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GDMPlugins")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("fb44f2ad-7600-458f-a164-30bc407a713f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GDMPlugins/Resources/Database-Active-icon.png b/GDMPlugins/Resources/database-active-icon.png similarity index 100% rename from GDMPlugins/Resources/Database-Active-icon.png rename to GDMPlugins/Resources/database-active-icon.png diff --git a/GDMPlugins/Resources/Team2.PNG b/GDMPlugins/Resources/team2.png similarity index 100% rename from GDMPlugins/Resources/Team2.PNG rename to GDMPlugins/Resources/team2.png diff --git a/GDMPlugins/Statistics/DistributionEvaluator.cs b/GDMPlugins/Statistics/DistributionEvaluator.cs index a52579b..99c454f 100644 --- a/GDMPlugins/Statistics/DistributionEvaluator.cs +++ b/GDMPlugins/Statistics/DistributionEvaluator.cs @@ -196,7 +196,7 @@ private static IUnivariateDistribution UnivariateDistribution(List obser } - public static double Evaluate(List observations, IDistribution dist) + public static double Evaluate(List observations, GDMInterfaces.IDistribution dist) { if (dist == null) throw new Exception("Distribution not initialized"); diff --git a/GDMPlugins/packages.config b/GDMPlugins/packages.config deleted file mode 100644 index c54fea4..0000000 --- a/GDMPlugins/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GDMService/GDMService.csproj b/GDMService/GDMService.csproj index 90f44eb..bbe8a56 100644 --- a/GDMService/GDMService.csproj +++ b/GDMService/GDMService.csproj @@ -1,111 +1,23 @@ - - - + + - Debug - AnyCPU - {76FE59CF-66FA-402D-91FD-63CD8A24DDC4} WinExe - Properties + net10.0-windows + true + true GDMService GDMService - v4.7.2 - 512 - true - SAK - SAK - SAK - SAK - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + enable + - - - - - - - - - - - - - - - - - - Form - - - ChooseFolder.cs - - - - Component - - - Component - - - ProjectInstaller.cs - - - Component - - - RunGDMBatch.cs - - - - - - - - - - ChooseFolder.cs - - - ProjectInstaller.cs - - - RunGDMBatch.cs - + + + + - - {af4d5355-e689-480f-b266-5006c1ecaa54} - GDMCore - + - - - \ No newline at end of file + diff --git a/GDMService/GDMService.csproj.old b/GDMService/GDMService.csproj.old new file mode 100644 index 0000000..90f44eb --- /dev/null +++ b/GDMService/GDMService.csproj.old @@ -0,0 +1,111 @@ + + + + + Debug + AnyCPU + {76FE59CF-66FA-402D-91FD-63CD8A24DDC4} + WinExe + Properties + GDMService + GDMService + v4.7.2 + 512 + true + SAK + SAK + SAK + SAK + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + Form + + + ChooseFolder.cs + + + + Component + + + Component + + + ProjectInstaller.cs + + + Component + + + RunGDMBatch.cs + + + + + + + + + + ChooseFolder.cs + + + ProjectInstaller.cs + + + RunGDMBatch.cs + + + + + {af4d5355-e689-480f-b266-5006c1ecaa54} + GDMCore + + + + + + \ No newline at end of file diff --git a/GDMService/OpenFileOrFolderDialog.cs b/GDMService/OpenFileOrFolderDialog.cs deleted file mode 100644 index 5cf626d..0000000 --- a/GDMService/OpenFileOrFolderDialog.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GDMService -{ - class OpenFileOrFolderDialog - { - } -} diff --git a/GDMService/Properties/AssemblyInfo.cs b/GDMService/Properties/AssemblyInfo.cs deleted file mode 100644 index 9c3bddf..0000000 --- a/GDMService/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GDMService")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GDMService")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("76fe59cf-66fa-402d-91fd-63cd8a24ddc4")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GDMTool/ConfigViewer.cs b/GDMTool/ConfigViewer.cs index 58972f8..e10a5d1 100644 --- a/GDMTool/ConfigViewer.cs +++ b/GDMTool/ConfigViewer.cs @@ -214,7 +214,7 @@ private void PreviousConfigurations() private void UpdateCurrentConfiguration() { _menu.Items["saveConfig"].Enabled = true; - _menu.Invoke((MethodInvoker)(() => + _menu.Invoke((System.Windows.Forms.MethodInvoker)(() => { _current.Nodes.Clear(); diff --git a/GDMTool/DataTableView.cs b/GDMTool/DataTableView.cs index b685088..0d69275 100644 --- a/GDMTool/DataTableView.cs +++ b/GDMTool/DataTableView.cs @@ -35,7 +35,7 @@ public void Inactivate() try { if(this.IsHandleCreated) - this.Invoke((MethodInvoker) (() => + this.Invoke((System.Windows.Forms.MethodInvoker) (() => { bindingSource.DataSource = null; @@ -51,6 +51,7 @@ public void Activate() _inactive = false; } + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public DataTable DataTable { get { return (DataTable)bindingSource.DataSource; } diff --git a/GDMTool/GDMTool.csproj b/GDMTool/GDMTool.csproj index 7320fba..7380b63 100644 --- a/GDMTool/GDMTool.csproj +++ b/GDMTool/GDMTool.csproj @@ -1,349 +1,25 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {6A6C5CAA-5E98-492A-86E9-8B1CFD36CCE1} WinExe - Properties + net10.0-windows + true + true + true GDMTool GDMTool - v4.7.2 - 512 - - - 3.5 - - true - - SAK - SAK - SAK - SAK - C:\Users\jonan\Documents\Visual Studio 2015\Projects\Codeplex\GDM\publish\ - true - Web - true - Foreground - 7 - Days - false - false - false - http://gdm.codeplex.com/releases/clickonce/ - en-GB - GDM Tool - SharpedNET - GDM Tools - true - gdm.htm - 92 - 1.2.0.%2a - true - true - true - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 1 - AllRules.ruleset - AnyCPU - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\Documents\Software Design Specification\XMLDoc\GDMTool.XML - AllRules.ruleset - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - AllRules.ruleset - false - - - bin\x86\Release\ - TRACE - ..\..\Documents\Software Design Specification\XMLDoc\GDMTool.XML - true - pdbonly - x86 - prompt - AllRules.ruleset - false - - - D79B839A56FB0D6D87E3F516C502FD9C92541A1E - - - - - - - true - - - true - - - Images\Logo-GDM_256x256pxl.ico - - GDMTool.Program + enable - - http://timestamp.verisign.com/scripts/timstamp.dll - - - false - - - OnOutputUpdated - - - - ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll - - - - - - - - - - - - - - - - - Form - - - About.cs - - - - - UserControl - - - DataTableView.cs - - - True - True - Images.resx - - - Form - - - LogViewer.cs - - - Form - - - Main.cs - - - Form - - - NewConfig.cs - - - - - - - PublicResXFileCodeGenerator - Images.Designer.cs - Designer - - - Main.cs - - - PublicResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - Form - - - Start.cs - - - - - - - - - - - DataTableView.cs - Designer - - - - NewConfig.cs - Designer - - - - - - - - - - About.cs - Designer - - - - LogViewer.cs - Designer - - - Start.cs - Designer - - - - - False - Microsoft .NET Framework 4.6 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + - + + - - {af4d5355-e689-480f-b266-5006c1ecaa54} - GDMCore - - - {efcbc6b5-139a-4abe-b900-9a3ba074bb09} - GDMInterfaces - + + - - - - - - \ No newline at end of file + + diff --git a/GDMTool/GDMTool.csproj.old b/GDMTool/GDMTool.csproj.old new file mode 100644 index 0000000..7320fba --- /dev/null +++ b/GDMTool/GDMTool.csproj.old @@ -0,0 +1,349 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {6A6C5CAA-5E98-492A-86E9-8B1CFD36CCE1} + WinExe + Properties + GDMTool + GDMTool + v4.7.2 + 512 + + + 3.5 + + true + + SAK + SAK + SAK + SAK + C:\Users\jonan\Documents\Visual Studio 2015\Projects\Codeplex\GDM\publish\ + true + Web + true + Foreground + 7 + Days + false + false + false + http://gdm.codeplex.com/releases/clickonce/ + en-GB + GDM Tool + SharpedNET + GDM Tools + true + gdm.htm + 92 + 1.2.0.%2a + true + true + true + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 1 + AllRules.ruleset + AnyCPU + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + ..\..\Documents\Software Design Specification\XMLDoc\GDMTool.XML + AllRules.ruleset + false + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + AllRules.ruleset + false + + + bin\x86\Release\ + TRACE + ..\..\Documents\Software Design Specification\XMLDoc\GDMTool.XML + true + pdbonly + x86 + prompt + AllRules.ruleset + false + + + D79B839A56FB0D6D87E3F516C502FD9C92541A1E + + + + + + + true + + + true + + + + Images\Logo-GDM_256x256pxl.ico + + + GDMTool.Program + + + http://timestamp.verisign.com/scripts/timstamp.dll + + + false + + + OnOutputUpdated + + + + ..\packages\MathNet.Numerics.Signed.4.7.0\lib\net461\MathNet.Numerics.dll + + + + + + + + + + + + + + + + + Form + + + About.cs + + + + + UserControl + + + DataTableView.cs + + + True + True + Images.resx + + + Form + + + LogViewer.cs + + + Form + + + Main.cs + + + Form + + + NewConfig.cs + + + + + + + PublicResXFileCodeGenerator + Images.Designer.cs + Designer + + + Main.cs + + + PublicResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + Form + + + Start.cs + + + + + + + + + + + DataTableView.cs + Designer + + + + NewConfig.cs + Designer + + + + + + + + + + About.cs + Designer + + + + LogViewer.cs + Designer + + + Start.cs + Designer + + + + + False + Microsoft .NET Framework 4.6 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + {af4d5355-e689-480f-b266-5006c1ecaa54} + GDMCore + + + {efcbc6b5-139a-4abe-b900-9a3ba074bb09} + GDMInterfaces + + + + + + + + \ No newline at end of file diff --git a/GDMTool/Main.cs b/GDMTool/Main.cs index ec59359..f0b7b22 100644 --- a/GDMTool/Main.cs +++ b/GDMTool/Main.cs @@ -144,7 +144,7 @@ private void Batch_Click(object sender, EventArgs e) { if (Batch.Text == "Start new file batch") { - OpenFileDialog files = new OpenFileDialog(); + System.Windows.Forms.OpenFileDialog files = new System.Windows.Forms.OpenFileDialog(); files.Multiselect = true; files.Title = "Select all files for the batch operation"; if (files.ShowDialog() == DialogResult.OK) diff --git a/GDMTool/Properties/AssemblyInfo.cs b/GDMTool/Properties/AssemblyInfo.cs deleted file mode 100644 index 85af15d..0000000 --- a/GDMTool/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GDM Tool")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("SharpedNET")] -[assembly: AssemblyProduct("GDM Tools")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("667c41c0-218e-4bd6-80cf-2f8b441a4e84")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/GDMTool/TableViewer.cs b/GDMTool/TableViewer.cs index 99c3c30..cb68852 100644 --- a/GDMTool/TableViewer.cs +++ b/GDMTool/TableViewer.cs @@ -40,7 +40,7 @@ private void Controller_ModelChanged() { _dataTableView.Activate(); TabPage selected = null; - _tableControl.Invoke((MethodInvoker)(() => + _tableControl.Invoke((System.Windows.Forms.MethodInvoker)(() => { if (_tableControl.TabPages.Count > 0) { diff --git a/GDMTool/packages.config b/GDMTool/packages.config deleted file mode 100644 index 1c74c17..0000000 --- a/GDMTool/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 8c36e4864e379af55ccee355db01ec4d5d653f6d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 15:55:00 +0000 Subject: [PATCH 3/4] Complete GDMPlugins migration and fix API compatibility issues Co-authored-by: KaptenJon <10761546+KaptenJon@users.noreply.github.com> --- GDMPlugins/Excel/Excel.cs | 2 +- GDMPlugins/GDMPlugins.csproj | 3 ++- GDMPlugins/Statistics/DistributionEvaluator.cs | 4 ++-- GDMPlugins/Statistics/MaximumLikelihoodEstimation.cs | 9 --------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/GDMPlugins/Excel/Excel.cs b/GDMPlugins/Excel/Excel.cs index efca766..eb8bbc2 100644 --- a/GDMPlugins/Excel/Excel.cs +++ b/GDMPlugins/Excel/Excel.cs @@ -7,7 +7,7 @@ using System.Net; using System.Text.RegularExpressions; using System.Windows.Forms; -using Excel; +using ExcelDataReader; using GDMInterfaces; namespace GDMPlugins.Excel diff --git a/GDMPlugins/GDMPlugins.csproj b/GDMPlugins/GDMPlugins.csproj index 188efbd..73dd9a7 100644 --- a/GDMPlugins/GDMPlugins.csproj +++ b/GDMPlugins/GDMPlugins.csproj @@ -21,9 +21,10 @@ - + + diff --git a/GDMPlugins/Statistics/DistributionEvaluator.cs b/GDMPlugins/Statistics/DistributionEvaluator.cs index 99c454f..f7fb6cc 100644 --- a/GDMPlugins/Statistics/DistributionEvaluator.cs +++ b/GDMPlugins/Statistics/DistributionEvaluator.cs @@ -209,8 +209,8 @@ public static double Evaluate(List observations, GDMInterfaces.IDistribu foreach (double x in copy) { - double t1 = (double) j/n - dist.DistributionFunction(x); - double t2 = dist.DistributionFunction(x) - ((double) (j - 1)/n); + double t1 = (double) j/n - dist.CDF(x, 0, 0, 0); + double t2 = dist.CDF(x, 0, 0, 0) - ((double) (j - 1)/n); if (t1 > dMaxPlus) dMaxPlus = t1; if (t2 > dMaxMinus) dMaxMinus = t2; j++; diff --git a/GDMPlugins/Statistics/MaximumLikelihoodEstimation.cs b/GDMPlugins/Statistics/MaximumLikelihoodEstimation.cs index fd9a881..91973df 100644 --- a/GDMPlugins/Statistics/MaximumLikelihoodEstimation.cs +++ b/GDMPlugins/Statistics/MaximumLikelihoodEstimation.cs @@ -155,15 +155,6 @@ public WeibullDistribution GetOptimalWeibull() obt.DoIteration(); return new WeibullDistribution(obt.Result[0], obt.Result[1]); } - public override List Gradient(List x) - { - return x; - } - - public override List> Hessian(List x) - { - throw new NotImplementedException(); - } public int _numberOfVariable = 2; } From 6fb89efdc98dec1cccc7126f8ad65d33cff37882 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Dec 2025 16:00:15 +0000 Subject: [PATCH 4/4] Add .gitignore rule for backup .csproj.old files and finalize migration Co-authored-by: KaptenJon <10761546+KaptenJon@users.noreply.github.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4ce6fdd..b5208b0 100644 --- a/.gitignore +++ b/.gitignore @@ -244,6 +244,7 @@ UpgradeLog*.XML UpgradeLog*.htm ServiceFabricBackup/ *.rptproj.bak +*.csproj.old # SQL Server files *.mdf