Skip to content

T
Thick-Common
Commit b4dcc970 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

升级库版本

parent 06cedd2e
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 32 deletions
MultiLayout/MultiLayout.csproj
View file @ b4dcc970
...@@ -307,13 +307,13 @@ ...@@ -307,13 +307,13 @@
<Version>4.8.0</Version> <Version>4.8.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>4.6.8</Version> <Version>5.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Unity"> <PackageReference Include="Unity">
<Version>5.11.2</Version> <Version>5.11.2</Version>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
View file @ b4dcc970
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
<Version>1.10.0</Version> <Version>1.10.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
Project.FLY.FObjSys/FObjBaseReflect/FObjBase.Reflect.csproj
View file @ b4dcc970
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
Project.FLY.FObjSys/FObjBaseReflect/Reflect_Proxy.cs
View file @ b4dcc970
...@@ -5,9 +5,6 @@ using System.Collections.Generic; ...@@ -5,9 +5,6 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.ServiceModel.Security;
using System.Text;
using System.Threading.Tasks;
namespace FObjBase.Reflect namespace FObjBase.Reflect
{ {
...@@ -337,8 +334,8 @@ namespace FObjBase.Reflect ...@@ -337,8 +334,8 @@ namespace FObjBase.Reflect
string json = JsonConvert.SerializeObject(rData); string json = JsonConvert.SerializeObject(rData);
CurrObjSys.PushCallFunctionEx( CurrObjSys.PushCallFunctionEx(
cc.from, cc.srcid, ID, cc.magic, cc.from, cc.srcid, ID, cc.magic,
Reflect_OBJ_INTERFACE.CALL_GetAllProperties, Reflect_OBJ_INTERFACE.CALL_GetAllProperties,
Misc.Converter.StringToBytes(json)); Misc.Converter.StringToBytes(json));
} }
...@@ -350,10 +347,10 @@ namespace FObjBase.Reflect ...@@ -350,10 +347,10 @@ namespace FObjBase.Reflect
{ {
var rData = request_CALL_GetAllProperties(); var rData = request_CALL_GetAllProperties();
reponse_CALL_GetAllProperties(rData, new CC() { from = from, srcid = srcid, magic = magic}); reponse_CALL_GetAllProperties(rData, new CC() { from = from, srcid = srcid, magic = magic });
} }
break; break;
case Reflect_OBJ_INTERFACE.CALL_SetProperty: case Reflect_OBJ_INTERFACE.CALL_SetProperty:
{ {
string json = Misc.Converter.BytesToString(infodata); string json = Misc.Converter.BytesToString(infodata);
......
Project.FLY.FObjSys/FObjSys/FObjBase.csproj
View file @ b4dcc970
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>4.6.8</Version> <Version>5.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.FlyADBase/FlyADBase/FlyADBase.csproj
View file @ b4dcc970
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
<Version>10.1.1</Version> <Version>10.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>4.6.8</Version> <Version>5.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.Misc/MISC/Misc.csproj
View file @ b4dcc970
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.ModbusMapper/FLY.ModbusMapper/FLY.ModbusMapper.csproj
View file @ b4dcc970
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.OBJComponents/OBJComponents/FLY.OBJComponents.csproj
View file @ b4dcc970
...@@ -124,13 +124,13 @@ ...@@ -124,13 +124,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>4.6.8</Version> <Version>5.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
View file @ b4dcc970
...@@ -652,7 +652,9 @@ ...@@ -652,7 +652,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Costura.Fody"> <PackageReference Include="Costura.Fody">
<Version>4.1.0</Version> <Version>5.7.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="EPPlus"> <PackageReference Include="EPPlus">
<Version>4.5.3.2</Version> <Version>4.5.3.2</Version>
...@@ -670,7 +672,7 @@ ...@@ -670,7 +672,7 @@
<Version>5.4.1.1</Version> <Version>5.4.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Unity"> <PackageReference Include="Unity">
<Version>5.11.2</Version> <Version>5.11.2</Version>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/FodyWeavers.xsd
View file @ b4dcc970
...@@ -66,6 +66,16 @@ ...@@ -66,6 +66,16 @@
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation> <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:element> </xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string"> <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation> <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
...@@ -92,6 +102,16 @@ ...@@ -92,6 +102,16 @@
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation> <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
<xs:annotation>
<xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
<xs:annotation>
<xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCompression" type="xs:boolean"> <xs:attribute name="DisableCompression" type="xs:boolean">
<xs:annotation> <xs:annotation>
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation> <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
...@@ -122,6 +142,16 @@ ...@@ -122,6 +142,16 @@
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation> <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string"> <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation> <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
......
Project.FLY.Thick.Base/FLY.Thick.Base/FLY.Thick.Base.csproj
View file @ b4dcc970
...@@ -152,10 +152,10 @@ ...@@ -152,10 +152,10 @@
<Version>10.1.1</Version> <Version>10.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="PropertyChanged.Fody"> <PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version> <Version>4.0.5</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GetSample.cs
View file @ b4dcc970
...@@ -771,7 +771,7 @@ namespace FLY.Thick.Base.Server ...@@ -771,7 +771,7 @@ namespace FLY.Thick.Base.Server
/// <param name="idx">序号</param> /// <param name="idx">序号</param>
/// <param name="buf">数据</param> /// <param name="buf">数据</param>
/// <returns></returns> /// <returns></returns>
public void DoFix(int idx, int[] buf) public void DoFix(int idx, IEnumerable<int> buf)
{ {
if (idx >= Samples.Count()) if (idx >= Samples.Count())
return; return;
......
Project.SQLiteHelper/SQLiteHelper/SQLiteHelper.csproj
View file @ b4dcc970
...@@ -57,10 +57,10 @@ ...@@ -57,10 +57,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NLog"> <PackageReference Include="NLog">
<Version>4.6.8</Version> <Version>5.0.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Data.SQLite"> <PackageReference Include="System.Data.SQLite">
<Version>1.0.112</Version> <Version>1.0.112</Version>
......
UnityConfigurationTree/UnityConfigurationTree.csproj
View file @ b4dcc970
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version> <Version>13.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Unity"> <PackageReference Include="Unity">
<Version>5.11.2</Version> <Version>5.11.2</Version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment