From 18a29824a66de5bdd26bb8d16f4b6b4380740120 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期六, 28 三月 2020 16:42:18 +0800
Subject: [PATCH] 1. 部分dll更新 2. Config文件添加到git仓库
---
LLMF/LLMF.csproj | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/LLMF/LLMF.csproj b/LLMF/LLMF.csproj
index 1c67bb5..c3a63f3 100644
--- a/LLMF/LLMF.csproj
+++ b/LLMF/LLMF.csproj
@@ -44,17 +44,15 @@
<Reference Include="dog_net_windows">
<HintPath>..\Lib\SuperDog\dog_net_windows.dll</HintPath>
</Reference>
- <Reference Include="halcondotnet, Version=11.0.1.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="halcondotnet">
<HintPath>..\Lib\halcon\halcondotnet.dll</HintPath>
</Reference>
- <Reference Include="HalconTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\HalconTools\bin\Debug\HalconTools.dll</HintPath>
+ <Reference Include="hdevenginedotnet">
+ <HintPath>..\Lib\halcon\hdevenginedotnet.dll</HintPath>
</Reference>
- <Reference Include="Interop.OPCAutomation, Version=1.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files\KEPServerEx\Examples\Simple VB .NET OPC Example\bin\Interop.OPCAutomation.dll</HintPath>
+ <Reference Include="Interop.OPCAutomation">
+ <HintPath>..\Lib\Interop.OPCAutomation.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -170,6 +168,10 @@
<Project>{EC3A7C8F-C3FB-461C-9AF1-2456E1CBEC46}</Project>
<Name>FileToolkit</Name>
</ProjectReference>
+ <ProjectReference Include="..\HalconTools\HalconTools.csproj">
+ <Project>{461f5de4-f558-41b7-9494-f76854e0e7c7}</Project>
+ <Name>HalconTools</Name>
+ </ProjectReference>
<ProjectReference Include="..\PointGreyAndHalcon\PointGreyAndHalcon\PointGreyAndHalcon.csproj">
<Project>{91b96d0b-f745-4850-9166-63a07917ac04}</Project>
<Name>PointGreyAndHalcon</Name>
--
Gitblit v1.8.0