Skip to content

Commit

Permalink
组件移除,改为nuget安装模式,新增一个同步网络测试项目,可快速测试数据通信,v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dathlin committed Oct 21, 2017
1 parent ae87e23 commit 1673136
Show file tree
Hide file tree
Showing 39 changed files with 1,450 additions and 14,197 deletions.
11 changes: 10 additions & 1 deletion C-S软件系统模版.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
VisualStudioVersion = 15.0.27004.2005
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonLibrary", "CommonLibrary\CommonLibrary.csproj", "{8C97F322-4306-40FC-AFCF-753384D80046}"
EndProject
Expand All @@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientsLibrary", "ClientsLi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "软件系统浏览器模版", "软件系统浏览器模版\软件系统浏览器模版.csproj", "{9F528713-4869-4CD2-B76B-38AE5FEE6E7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HslCommunicationNetTestTool", "HslCommunicationNetTestTool\HslCommunicationNetTestTool.csproj", "{1ACA04D4-BBC0-417D-B06C-14EE030239F2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -45,8 +47,15 @@ Global
{9F528713-4869-4CD2-B76B-38AE5FEE6E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F528713-4869-4CD2-B76B-38AE5FEE6E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F528713-4869-4CD2-B76B-38AE5FEE6E7F}.Release|Any CPU.Build.0 = Release|Any CPU
{1ACA04D4-BBC0-417D-B06C-14EE030239F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1ACA04D4-BBC0-417D-B06C-14EE030239F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1ACA04D4-BBC0-417D-B06C-14EE030239F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1ACA04D4-BBC0-417D-B06C-14EE030239F2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EF185E57-0FE8-4992-A83A-1905262134CC}
EndGlobalSection
EndGlobal
9 changes: 5 additions & 4 deletions ClientsLibrary/ClientsLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<Reference Include="CommonLibrary">
<HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
</Reference>
<Reference Include="HslCommunication">
<HintPath>..\Public\HslCommunication.dll</HintPath>
<Reference Include="HslCommunication, Version=3.17.10.20, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HslCommunication.3.17.11\lib\HslCommunication.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Public\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -257,6 +257,7 @@
</ItemGroup>
<ItemGroup>
<None Include="img\ExtensionManager_vsix_OSReg_16x.png" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<None Include="img\Flagthread_7317.png" />
Expand Down
5 changes: 5 additions & 0 deletions ClientsLibrary/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HslCommunication" version="3.17.11" targetFramework="net35" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
</packages>
5 changes: 2 additions & 3 deletions CommonLibrary/CommonLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="HslCommunication, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Public\HslCommunication.dll</HintPath>
<Reference Include="HslCommunication, Version=3.17.10.20, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HslCommunication.3.17.11\lib\HslCommunication.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
Expand Down
3 changes: 2 additions & 1 deletion CommonLibrary/UserSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ static UserSystem()
* 时间:2017年9月19日 22:06:27 版本号:1.4.0
* 时间:2017年10月1日 16:00:13 版本号:1.5.0
* 时间:2017年10月6日 19:23:09 版本号:1.6.0
* 时间:2017年10月21日 11:55:41 版本号:1.7.0
*
**************************************************************************/


SoftBasic.FrameworkVersion = new SystemVersion("1.6.25");
SoftBasic.FrameworkVersion = new SystemVersion("1.7.0");

}

Expand Down
1 change: 1 addition & 0 deletions CommonLibrary/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HslCommunication" version="3.17.11" targetFramework="net35" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
</packages>
16 changes: 16 additions & 0 deletions HslCommunicationNetTestTool/ClassNetSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace HslCommunicationNetTestTool
{
public class ClassNetSettings
{
public string Guid { get; set; }
public string IpAddress { get; set; }
public string IpPort { get; set; }
public string Token { get; set; }
public string TimeOut { get; set; }
}
}
5 changes: 5 additions & 0 deletions HslCommunicationNetTestTool/Document/instruction.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@



本项目是一个测试项目,生成一个exe文件,可以用来测试远程的同步网络通信的功能,
在你开发完成服务器的几个后台指令的时候,可以采用本测试项目来快速的查看并验证网络通信是否成功
Loading

0 comments on commit 1673136

Please sign in to comment.