From 45a1c9f2540754e7cea2b58cd736bc677b2d4fdc Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期四, 28 七月 2022 17:45:28 +0800
Subject: [PATCH] 海康相机测试修改
---
LLMF/LLMF.csproj | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/LLMF/LLMF.csproj b/LLMF/LLMF.csproj
index 1c67bb5..9898c40 100644
--- a/LLMF/LLMF.csproj
+++ b/LLMF/LLMF.csproj
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LLMF</RootNamespace>
<AssemblyName>LLMF</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationIcon>ico.ico</ApplicationIcon>
<FileUpgradeFlags>
@@ -28,7 +28,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -44,17 +44,11 @@
<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>
- <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="hdevenginedotnet">
+ <HintPath>..\Lib\halcon\hdevenginedotnet.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -163,18 +157,33 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EventTool\EventTool.csproj">
- <Project>{2EBB374F-7C87-4A83-8AF4-503CDF0D1B0E}</Project>
+ <Project>{2ebb374f-7c87-4a83-8af4-503cdf0d1b0e}</Project>
<Name>EventTool</Name>
</ProjectReference>
<ProjectReference Include="..\FileToolkit\FileToolkit.csproj">
- <Project>{EC3A7C8F-C3FB-461C-9AF1-2456E1CBEC46}</Project>
+ <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>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <COMReference Include="OPCAutomation">
+ <Guid>{28E68F91-8D75-11D1-8DC3-3C302A000000}</Guid>
+ <VersionMajor>1</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>tlbimp</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </COMReference>
+ </ItemGroup>
<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.
--
Gitblit v1.8.0