feat(release): 更新HslCommunication库为v5.7.3版本 · fredatgithub/ClientServerProject@06bbf95 · GitHub
Skip to content

Commit 06bbf95

Browse files
dathlindathlin
committed
feat(release): 更新HslCommunication库为v5.7.3版本
1 parent 2e95f1e commit 06bbf95

21 files changed

Lines changed: 69 additions & 49 deletions

‎ClientsLibrary/ClientsLibrary.csproj‎

Lines changed: 4 additions & 4 deletions

‎ClientsLibrary/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎ClientsLibrary/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HslCommunication" version="5.2.0" targetFramework="net35" />
4-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
3+
<package id="HslCommunication" version="5.7.3" targetFramework="net35" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
55
</packages>

‎CommonLibrary/CommonLibrary.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="HslCommunication, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\HslCommunication.5.2.0\lib\net35\HslCommunication.dll</HintPath>
33+
<Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
34+
<HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
3535
</Reference>
36-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
36+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
3838
</Reference>
3939
<Reference Include="System" />
4040
<Reference Include="System.Core" />
@@ -166,6 +166,7 @@
166166
</EmbeddedResource>
167167
</ItemGroup>
168168
<ItemGroup>
169+
<None Include="app.config" />
169170
<None Include="packages.config" />
170171
</ItemGroup>
171172
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎CommonLibrary/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎CommonLibrary/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HslCommunication" version="5.2.0" targetFramework="net35" />
4-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
3+
<package id="HslCommunication" version="5.7.3" targetFramework="net35" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
55
</packages>

‎HslCommunicationNetTestTool/HslCommunicationNetTestTool.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="HslCommunication, Version=5.2.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\HslCommunication.5.2.0\lib\net35\HslCommunication.dll</HintPath>
34+
<Reference Include="HslCommunication, Version=5.7.3.0, Culture=neutral, PublicKeyToken=cdb2261fa039ed67, processorArchitecture=MSIL">
35+
<HintPath>..\packages\HslCommunication.5.7.3\lib\net35\HslCommunication.dll</HintPath>
3636
</Reference>
37-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
37+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
3939
</Reference>
4040
<Reference Include="System" />
4141
<Reference Include="System.Core" />

‎HslCommunicationNetTestTool/app.config‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
55
<section name="HslCommunicationNetTestTool.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
@@ -12,4 +12,12 @@
1212
</setting>
1313
</HslCommunicationNetTestTool.Settings1>
1414
</userSettings>
15+
<runtime>
16+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
17+
<dependentAssembly>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
20+
</dependentAssembly>
21+
</assemblyBinding>
22+
</runtime>
1523
</configuration>

‎HslCommunicationNetTestTool/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HslCommunication" version="5.2.0" targetFramework="net35" />
4-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net35" />
3+
<package id="HslCommunication" version="5.7.3" targetFramework="net35" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net35" />
55
</packages>

‎软件系统客户端Wpf/App.config‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)