From f1dd96fcf0f0397b0cbcca3ee6ef1936f1e86e45 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 07 三月 2025 13:02:57 +0800
Subject: [PATCH] math net 版本统一
---
Desktop/IBox.Desktop/IBox.Desktop.csproj | 1
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 1
HStation.PBS.sln | 42 --------------
Desktop/PBS.Desktop/App.config | 90 +++++++++++++++---------------
5 files changed, 47 insertions(+), 89 deletions(-)
diff --git a/Desktop/IBox.Desktop/IBox.Desktop.csproj b/Desktop/IBox.Desktop/IBox.Desktop.csproj
index 4b37564..09ab4bf 100644
--- a/Desktop/IBox.Desktop/IBox.Desktop.csproj
+++ b/Desktop/IBox.Desktop/IBox.Desktop.csproj
@@ -25,6 +25,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+ <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/Desktop/PBS.Desktop/App.config b/Desktop/PBS.Desktop/App.config
index 040da78..7fa7695 100644
--- a/Desktop/PBS.Desktop/App.config
+++ b/Desktop/PBS.Desktop/App.config
@@ -1,48 +1,48 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
- <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </sectionGroup>
- </configSections>
- <applicationSettings>
- <DevExpress.LookAndFeel.Design.AppSettings>
- <setting name="DefaultAppSkin" serializeAs="String">
- <value>CompactSkin/WXI</value>
- </setting>
- <setting name="DefaultPalette" serializeAs="String">
- <value></value>
- </setting>
- <setting name="TouchUI" serializeAs="String">
- <value></value>
- </setting>
- <setting name="CompactUI" serializeAs="String">
- <value></value>
- </setting>
- <setting name="TouchScaleFactor" serializeAs="String">
- <value></value>
- </setting>
- <setting name="DirectX" serializeAs="String">
- <value>True</value>
- </setting>
- <setting name="RegisterUserSkins" serializeAs="String">
- <value></value>
- </setting>
- <setting name="RegisterBonusSkins" serializeAs="String">
- <value>True</value>
- </setting>
- <setting name="FontBehavior" serializeAs="String">
- <value></value>
- </setting>
- <setting name="DefaultAppFont" serializeAs="String">
- <value></value>
- </setting>
- <setting name="DPIAwarenessMode" serializeAs="String">
- <value></value>
- </setting>
- <setting name="CustomPaletteCollection" serializeAs="Xml">
- <value />
- </setting>
- </DevExpress.LookAndFeel.Design.AppSettings>
- </applicationSettings>
+ <configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+ <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </sectionGroup>
+ </configSections>
+ <applicationSettings>
+ <DevExpress.LookAndFeel.Design.AppSettings>
+ <setting name="DefaultAppSkin" serializeAs="String">
+ <value>CompactSkin/WXI</value>
+ </setting>
+ <setting name="DefaultPalette" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="TouchUI" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="CompactUI" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="TouchScaleFactor" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="DirectX" serializeAs="String">
+ <value>True</value>
+ </setting>
+ <setting name="RegisterUserSkins" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="RegisterBonusSkins" serializeAs="String">
+ <value>True</value>
+ </setting>
+ <setting name="FontBehavior" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="DefaultAppFont" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="DPIAwarenessMode" serializeAs="String">
+ <value></value>
+ </setting>
+ <setting name="CustomPaletteCollection" serializeAs="Xml">
+ <value />
+ </setting>
+ </DevExpress.LookAndFeel.Design.AppSettings>
+ </applicationSettings>
</configuration>
\ No newline at end of file
diff --git a/HStation.PBS.sln b/HStation.PBS.sln
index ffb6fac..a574100 100644
--- a/HStation.PBS.sln
+++ b/HStation.PBS.sln
@@ -29,8 +29,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dto", "Dto", "{929B3BD5-B817-4EAF-ADA4-3DFBD1580DA6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Xhs.Core", "BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj", "{B9AA9E07-4D8C-4642-8346-581DF9F6AB16}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hydro", "Hydro", "{9F4F9ECE-9C4C-4796-91A1-69805F823EA5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Hydro.Core", "Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj", "{7A40BC5F-BD1B-40EE-A8C1-232BF7C14F3C}"
@@ -40,8 +38,6 @@
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Core", "BLL\HStation.BLL.Core\HStation.BLL.Core.csproj", "{5D082C0C-FD9B-4BEE-B57F-6C3D1B9F0BB3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{276C57AF-5A9C-4A50-A79E-A5098D322FE9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Application.Xhs.Core", "Application\HStation.Application.Xhs.Core\HStation.Application.Xhs.Core.csproj", "{784A568F-A01F-45FC-AACB-B80F87EA3ABA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Application.Core", "Application\HStation.Application.Core\HStation.Application.Core.csproj", "{4724474E-66CD-4237-B3A0-085125AD2D8F}"
EndProject
@@ -326,24 +322,6 @@
{76F63C63-046C-4AC5-8732-9A889CC183E3}.Release|x64.Build.0 = Release|Any CPU
{76F63C63-046C-4AC5-8732-9A889CC183E3}.Release|x86.ActiveCfg = Release|Any CPU
{76F63C63-046C-4AC5-8732-9A889CC183E3}.Release|x86.Build.0 = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|x64.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|x64.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Debug|x86.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|Any CPU.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|x64.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|x64.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|x86.ActiveCfg = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.dll_test|x86.Build.0 = Debug|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|Any CPU.Build.0 = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|x64.ActiveCfg = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|x64.Build.0 = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|x86.ActiveCfg = Release|Any CPU
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16}.Release|x86.Build.0 = Release|Any CPU
{7A40BC5F-BD1B-40EE-A8C1-232BF7C14F3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A40BC5F-BD1B-40EE-A8C1-232BF7C14F3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A40BC5F-BD1B-40EE-A8C1-232BF7C14F3C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -398,24 +376,6 @@
{5D082C0C-FD9B-4BEE-B57F-6C3D1B9F0BB3}.Release|x64.Build.0 = Release|Any CPU
{5D082C0C-FD9B-4BEE-B57F-6C3D1B9F0BB3}.Release|x86.ActiveCfg = Release|Any CPU
{5D082C0C-FD9B-4BEE-B57F-6C3D1B9F0BB3}.Release|x86.Build.0 = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|x64.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|x64.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Debug|x86.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|Any CPU.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|x64.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|x64.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|x86.ActiveCfg = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.dll_test|x86.Build.0 = Debug|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|Any CPU.Build.0 = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|x64.ActiveCfg = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|x64.Build.0 = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|x86.ActiveCfg = Release|Any CPU
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA}.Release|x86.Build.0 = Release|Any CPU
{4724474E-66CD-4237-B3A0-085125AD2D8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4724474E-66CD-4237-B3A0-085125AD2D8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4724474E-66CD-4237-B3A0-085125AD2D8F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1490,11 +1450,9 @@
{87956CDB-364B-4FD6-8E57-3E1C33D73046} = {1C729ADD-9928-43EA-876B-3D783D45CA0A}
{0446EFFD-7AD1-4C0A-A91A-A2E163DA2EAD} = {1C729ADD-9928-43EA-876B-3D783D45CA0A}
{76F63C63-046C-4AC5-8732-9A889CC183E3} = {E27E21BB-A9BD-4F2E-9713-22A1DD2C2F0E}
- {B9AA9E07-4D8C-4642-8346-581DF9F6AB16} = {5F0D2CDB-F911-4FFC-965B-F303D739712C}
{7A40BC5F-BD1B-40EE-A8C1-232BF7C14F3C} = {9F4F9ECE-9C4C-4796-91A1-69805F823EA5}
{CB331919-7FFB-4D38-B9E0-D47E412A3904} = {9F4F9ECE-9C4C-4796-91A1-69805F823EA5}
{5D082C0C-FD9B-4BEE-B57F-6C3D1B9F0BB3} = {5F0D2CDB-F911-4FFC-965B-F303D739712C}
- {784A568F-A01F-45FC-AACB-B80F87EA3ABA} = {8592F739-4B08-4B0F-B0D5-FAB10D60B2A2}
{4724474E-66CD-4237-B3A0-085125AD2D8F} = {8592F739-4B08-4B0F-B0D5-FAB10D60B2A2}
{D6D805ED-C848-4403-97AB-E86715B9E2DB} = {0469F9DE-F12C-4B83-A871-A77A82DCB4C8}
{454B8C89-EFF0-42E2-B569-C211F0168F5D} = {E27E21BB-A9BD-4F2E-9713-22A1DD2C2F0E}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index ad0dcf9..db64a61 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -224,7 +224,6 @@
<ItemGroup>
<ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
- <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Auth.Core\HStation.WinFrmUI.Auth.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj
index 2d08877..552dbcb 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Yw.WinFrmUI.Hydro.Q3d.Core.csproj
@@ -44,7 +44,7 @@
<Content Include="blur_paintsoftselection.ico" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="MathNet.Numerics" Version="4.1.0" />
+ <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3