820498063@qq.com 4 months ago
parent
commit
35c0641553
4 changed files with 25 additions and 26 deletions
  1. 22 22
      FocasCncCollect.sln
  2. 3 4
      FocasCncCollect/FocasCncCollect.csproj
  3. BIN
      dll/RemoteCnc.dll
  4. BIN
      dll/Syntec.RemoteCNC.dll

+ 22 - 22
FocasCncCollect.sln

@@ -11,10 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MazakCnc", "MazakCnc\MazakC
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Haas", "Haas\Haas.csproj", "{02A76D02-F3D8-492E-BC11-A477CA4E5EB3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OPCUA", "OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\OPCUA.csproj", "{1BE4982C-F29F-4352-A1E4-7D07F0651902}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FocasCnc", "FocasCnc\FocasCnc.csproj", "{9E6EA82A-48F8-4B72-8F01-C3037C101B17}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OPCUA", "OPCUA\OPCUA.csproj", "{1BE4982C-F29F-4352-A1E4-7D07F0651902}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -105,26 +105,6 @@ Global
 		{02A76D02-F3D8-492E-BC11-A477CA4E5EB3}.Release|x64.Build.0 = Release|Any CPU
 		{02A76D02-F3D8-492E-BC11-A477CA4E5EB3}.Release|x86.ActiveCfg = Release|Any CPU
 		{02A76D02-F3D8-492E-BC11-A477CA4E5EB3}.Release|x86.Build.0 = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM.Build.0 = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x64.Build.0 = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x86.Build.0 = Debug|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM.Build.0 = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM64.Build.0 = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x64.ActiveCfg = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x64.Build.0 = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x86.ActiveCfg = Release|Any CPU
-		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x86.Build.0 = Release|Any CPU
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -145,6 +125,26 @@ Global
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Release|x64.Build.0 = Release|Any CPU
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Release|x86.ActiveCfg = Release|Any CPU
 		{9E6EA82A-48F8-4B72-8F01-C3037C101B17}.Release|x86.Build.0 = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x64.Build.0 = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Debug|x86.Build.0 = Debug|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM.Build.0 = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|ARM64.Build.0 = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x64.ActiveCfg = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x64.Build.0 = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x86.ActiveCfg = Release|Any CPU
+		{1BE4982C-F29F-4352-A1E4-7D07F0651902}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 3 - 4
FocasCncCollect/FocasCncCollect.csproj

@@ -62,9 +62,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Syntec.RemoteCNC, Version=1.0.12.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\Syntec.RemoteCNC.dll</HintPath>
+    <Reference Include="Syntec.RemoteCNC">
+      <HintPath>..\dll\Syntec.RemoteCNC.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -236,7 +235,7 @@
       <Project>{81ff1a64-83e0-4dd1-8c0e-cc4a7c251a46}</Project>
       <Name>MazakCnc</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OPCUAClient\OPCUAClient\OPCUAClient\OPCUA\OPCUA.csproj">
+    <ProjectReference Include="..\OPCUA\OPCUA.csproj">
       <Project>{1be4982c-f29f-4352-a1e4-7d07f0651902}</Project>
       <Name>OPCUA</Name>
     </ProjectReference>

BIN
dll/RemoteCnc.dll


BIN
dll/Syntec.RemoteCNC.dll