From 713d5218ee2b47c0c92f75c19c49bb7e883cd214 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 25 七月 2024 13:35:51 +0800
Subject: [PATCH] nuget包升级
---
Library/Newtonsoft.Json.dll | 0
DAL/IStation.DAL.Project/IStation.DAL.Project.csproj | 17 ++++----
Desktop/IStation.Desktop.ChCalc/App.config | 4 +-
DAL/IStation.DAL.Project/App.config | 12 ++++++
WinFrmUI/IStation.WinFrmUI.CalcErQu/app.config | 18 +++++++-
WinFrmUI/IStation.WinFrmUI.Monitor/app.config | 8 ++++
Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj | 1
Desktop/IStation.MainPanel.ChCalc/IStation.MainPanel.ChCalc.csproj | 1
BLL/IStation.BLL.Connect/app.config | 15 +++++++
DAL/IStation.DAL.Project/packages.config | 12 +++---
WinFrmUI/IStation.WinFrmUI.River/app.config | 8 ++++
Desktop/IStation.MainPanel.ChCalc/App.config | 6 ++
BLL/IStation.BLL.Connect/IStation.BLL.Connect.csproj | 4 +
13 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/BLL/IStation.BLL.Connect/IStation.BLL.Connect.csproj b/BLL/IStation.BLL.Connect/IStation.BLL.Connect.csproj
index 40092ae..d22c3b8 100644
--- a/BLL/IStation.BLL.Connect/IStation.BLL.Connect.csproj
+++ b/BLL/IStation.BLL.Connect/IStation.BLL.Connect.csproj
@@ -119,6 +119,8 @@
<Name>IStation.BLL.Basic</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
diff --git a/BLL/IStation.BLL.Connect/app.config b/BLL/IStation.BLL.Connect/app.config
new file mode 100644
index 0000000..a88d315
--- /dev/null
+++ b/BLL/IStation.BLL.Connect/app.config
@@ -0,0 +1,15 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/DAL/IStation.DAL.Project/App.config b/DAL/IStation.DAL.Project/App.config
index 3138c41..df153bc 100644
--- a/DAL/IStation.DAL.Project/App.config
+++ b/DAL/IStation.DAL.Project/App.config
@@ -11,6 +11,18 @@
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
</providers>
</entityFramework>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6" />
diff --git a/DAL/IStation.DAL.Project/IStation.DAL.Project.csproj b/DAL/IStation.DAL.Project/IStation.DAL.Project.csproj
index 1f8d7c1..e7b5651 100644
--- a/DAL/IStation.DAL.Project/IStation.DAL.Project.csproj
+++ b/DAL/IStation.DAL.Project/IStation.DAL.Project.csproj
@@ -41,8 +41,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
- <Reference Include="SqlSugar, Version=5.1.3.1, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\..\packages\SqlSugar.5.1.3.1\lib\SqlSugar.dll</HintPath>
+ <Reference Include="SqlSugar, Version=5.1.4.166, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\SqlSugar.5.1.4.166\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System">
<Private>True</Private>
@@ -56,14 +56,14 @@
<Reference Include="System.Core">
<Private>True</Private>
</Reference>
- <Reference Include="System.Data.SQLite, Version=1.0.116.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
- <HintPath>..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net46\System.Data.SQLite.dll</HintPath>
+ <Reference Include="System.Data.SQLite, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll</HintPath>
</Reference>
- <Reference Include="System.Data.SQLite.EF6, Version=1.0.116.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Data.SQLite.EF6.1.0.116.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+ <Reference Include="System.Data.SQLite.EF6, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
</Reference>
- <Reference Include="System.Data.SQLite.Linq, Version=1.0.116.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Data.SQLite.Linq.1.0.116.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+ <Reference Include="System.Data.SQLite.Linq, Version=1.0.118.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Numerics">
<Private>True</Private>
@@ -128,5 +128,4 @@
<Import Project="..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
<Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
- <Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
</Project>
\ No newline at end of file
diff --git a/DAL/IStation.DAL.Project/packages.config b/DAL/IStation.DAL.Project/packages.config
index ef81d33..8cd1462 100644
--- a/DAL/IStation.DAL.Project/packages.config
+++ b/DAL/IStation.DAL.Project/packages.config
@@ -1,10 +1,10 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.4.4" targetFramework="net472" />
- <package id="SqlSugar" version="5.1.3.1" targetFramework="net472" />
- <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net472" />
- <package id="System.Data.SQLite" version="1.0.116.0" targetFramework="net472" />
- <package id="System.Data.SQLite.Core" version="1.0.116.0" targetFramework="net472" />
- <package id="System.Data.SQLite.EF6" version="1.0.116.0" targetFramework="net472" />
- <package id="System.Data.SQLite.Linq" version="1.0.116.0" targetFramework="net472" />
+ <package id="SqlSugar" version="5.1.4.166" targetFramework="net472" />
+ <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.118.0" targetFramework="net472" />
+ <package id="System.Data.SQLite" version="1.0.118.0" targetFramework="net472" />
+ <package id="System.Data.SQLite.Core" version="1.0.118.0" targetFramework="net472" />
+ <package id="System.Data.SQLite.EF6" version="1.0.118.0" targetFramework="net472" />
+ <package id="System.Data.SQLite.Linq" version="1.0.118.0" targetFramework="net472" />
</packages>
\ No newline at end of file
diff --git a/Desktop/IStation.Desktop.ChCalc/App.config b/Desktop/IStation.Desktop.ChCalc/App.config
index 96dfd81..a27640b 100644
--- a/Desktop/IStation.Desktop.ChCalc/App.config
+++ b/Desktop/IStation.Desktop.ChCalc/App.config
@@ -27,7 +27,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -36,7 +36,7 @@
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-1.0.116.0" newVersion="1.0.116.0" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
</dependentAssembly>
diff --git a/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj b/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
index 1a7dae9..add466d 100644
--- a/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
+++ b/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
@@ -109,6 +109,7 @@
<DependentUpon>frmMain.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
diff --git a/Desktop/IStation.MainPanel.ChCalc/App.config b/Desktop/IStation.MainPanel.ChCalc/App.config
index 30ccc75..d1b55b5 100644
--- a/Desktop/IStation.MainPanel.ChCalc/App.config
+++ b/Desktop/IStation.MainPanel.ChCalc/App.config
@@ -28,12 +28,16 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git a/Desktop/IStation.MainPanel.ChCalc/IStation.MainPanel.ChCalc.csproj b/Desktop/IStation.MainPanel.ChCalc/IStation.MainPanel.ChCalc.csproj
index 96a4ca2..a54d3f0 100644
--- a/Desktop/IStation.MainPanel.ChCalc/IStation.MainPanel.ChCalc.csproj
+++ b/Desktop/IStation.MainPanel.ChCalc/IStation.MainPanel.ChCalc.csproj
@@ -102,6 +102,7 @@
<DependentUpon>MainPanel.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
diff --git a/Library/Newtonsoft.Json.dll b/Library/Newtonsoft.Json.dll
index 7af125a..341d08f 100644
--- a/Library/Newtonsoft.Json.dll
+++ b/Library/Newtonsoft.Json.dll
Binary files differ
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/app.config b/WinFrmUI/IStation.WinFrmUI.CalcErQu/app.config
index b9df22d..b9e3cf9 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/app.config
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+ <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="IStation.WinFrmUI.CalcErQu.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup><userSettings>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup><userSettings>
<IStation.WinFrmUI.CalcErQu.Properties.Settings>
<setting name="IsTimeBlockCtrl" serializeAs="String">
<value>True</value>
@@ -18,4 +18,16 @@
</setting>
</IStation.WinFrmUI.CalcErQu.Properties.Settings>
</userSettings>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/app.config b/WinFrmUI/IStation.WinFrmUI.Monitor/app.config
index 9524d37..d8ea860 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/app.config
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/app.config
@@ -14,6 +14,14 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
diff --git a/WinFrmUI/IStation.WinFrmUI.River/app.config b/WinFrmUI/IStation.WinFrmUI.River/app.config
index 3b88d73..70743ea 100644
--- a/WinFrmUI/IStation.WinFrmUI.River/app.config
+++ b/WinFrmUI/IStation.WinFrmUI.River/app.config
@@ -22,6 +22,14 @@
<assemblyIdentity name="NPOI.OpenXml4Net" publicKeyToken="0df73ec7942b34e1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.2.0" newVersion="2.6.2.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.0.118.0" newVersion="1.0.118.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
--
Gitblit v1.9.3