luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change projects to .net 6.0

Browse Source
This commit is contained in:
luosheng
2023-02-11 09:52:13 +08:00
parent 30a8b54245
commit 371ee48a7b
506 changed files with 337 additions and 112340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/Modbus.Net.PersistedTests/Modbus.Net.PersistedTests.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net45</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

8
Tests/Modbus.Net.PersistedTests/Properties/launchSettings.json Normal file
View File

@@ -0,0 +1,8 @@
{
"profiles": {
"WSL": {
"commandName": "WSL2",
"distributionName": ""
}
}
}

127
Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
View File

@@ -1,115 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3BB01E98-3D45-454A-A1BD-49D7B2C83B74}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Modbus.Net.Tests</RootNamespace>
<AssemblyName>Modbus.Net.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
</ItemGroup>
<Choose>
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
<Private>False</Private>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<Compile Include="EndianTest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ModbusTest.cs" />
<Compile Include="SiemensTest.cs" />
<Compile Include="BaseTest.cs" />
<Compile Include="OpcTest.cs" />
<Compile Include="MachineMethodTest.cs" />
<Compile Include="ModbusMultiStationTest.cs" />
<Compile Include="TaskManagerTest.cs" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Siemens\Modbus.Net.Siemens.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net\Modbus.Net.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj">
<Project>{fdca72ba-6d06-4de0-b873-c11c4ac853ad}</Project>
<Name>Modbus.Net.Modbus</Name>
</ProjectReference>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.OPC\Modbus.Net.OPC.csproj">
<Project>{97f5a329-357a-4813-baae-58e71cc6fa87}</Project>
<Name>Modbus.Net.OPC</Name>
</ProjectReference>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Siemens\Modbus.Net.Siemens.csproj">
<Project>{6258f9d9-0df4-497f-9f3b-6d2f6f752a21}</Project>
<Name>Modbus.Net.Siemens</Name>
</ProjectReference>
<ProjectReference Include="..\..\Modbus.Net\ModBus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>Modbus.Net</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Modbus.Net.orderedtest">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
</ItemGroup>
</When>
</Choose>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

106
Tests/Modbus.Net.Tests/OpcTest.cs
View File

@@ -1,106 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.OPC;
using Modbus.Net.OPC.FBox;
namespace Modbus.Net.Tests
{
[TestClass]
public class OpcTest
{
private BaseMachine _opcMachine;
[TestInitialize]
public void Init()
{
_opcMachine = new FBoxOpcDaMachine("1", "1", "德联科技测试", null, true);
}
[TestMethod]
public async Task OpcSingle()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
}
};
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
}
[TestMethod]
public async Task OpcMultiple()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
},
new AddressUnit()
{
Id = "2",
Name = "蒸汽压力目标",
Area = "0",
Address = 2,
DataType = typeof(ushort)
},
new AddressUnit()
{
Id = "3",
Name = "蒸汽压力上限",
Area = "0",
Address = 3,
DataType = typeof(ushort)
}
};
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
Assert.AreEqual(ans["2"].PlcValue, 600);
Assert.AreEqual(ans["3"].PlcValue, 650);
}
[TestMethod]
public async Task OpcWrite()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
}
};
var success = await _opcMachine.SetDatasAsync(MachineSetDataType.Id, new Dictionary<string, double>
{
{
"1", 525
}
});
Assert.AreEqual(success, true);
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
}
[TestCleanup]
public void MachineClean()
{
_opcMachine.Disconnect();
}
}
}

36
Tests/Modbus.Net.Tests/Properties/AssemblyInfo.cs
View File

@@ -1,36 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("Modbus.Net.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Modbus.Net.Tests")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//将 ComVisible 设置为 false 将使此程序集中的类型
//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型，
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("3bb01e98-3d45-454a-a1bd-49d7b2c83b74")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]