From 3c583b1091133e4af23c2534ae96bd094c132d58 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 24 五月 2021 08:46:47 +0800
Subject: [PATCH] 1. 更新dll引用地址 2. 主界面PLC操作安全屏蔽功能添加密码输入界面
---
M423project.csproj | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/M423project.csproj b/M423project.csproj
index 3330d3b..43b877d 100644
--- a/M423project.csproj
+++ b/M423project.csproj
@@ -72,38 +72,30 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AutoRunCard, Version=2017.1.19.1, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\AutoRunCard.dll</HintPath>
+ <Reference Include="AutoRunCard">
+ <HintPath>libs\AutoRunCard.dll</HintPath>
</Reference>
- <Reference Include="DownloadDLL, Version=2015.7.6.1, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Release\DownloadDLL.dll</HintPath>
+ <Reference Include="DownloadDLL">
+ <HintPath>libs\DownloadDLL.dll</HintPath>
</Reference>
- <Reference Include="EventTool, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\EventTool.dll</HintPath>
+ <Reference Include="EventTool">
+ <HintPath>libs\EventTool.dll</HintPath>
</Reference>
- <Reference Include="FileToolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\FileToolkit.dll</HintPath>
+ <Reference Include="FileToolkit">
+ <HintPath>libs\FileToolkit.dll</HintPath>
</Reference>
- <Reference Include="FlyCapture2Managed_v100, Version=2.10.3.169, Culture=neutral, PublicKeyToken=76c6583b4a4585f4, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Program Files\Point Grey Research\FlyCapture2\bin\FlyCapture2Managed_v100.dll</HintPath>
+ <Reference Include="FlyCapture2Managed_v100">
+ <HintPath>libs\FlyCapture2Managed_v100.dll</HintPath>
</Reference>
- <Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\halcondotnet.dll</HintPath>
+ <Reference Include="halcondotnet">
+ <HintPath>libs\halcondotnet.dll</HintPath>
</Reference>
- <Reference Include="hdevenginedotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Release\hdevenginedotnet.dll</HintPath>
+ <Reference Include="hdevenginedotnet">
+ <HintPath>libs\hdevenginedotnet.dll</HintPath>
</Reference>
- <Reference Include="Interop.OPCAutomation, Version=1.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="Interop.OPCAutomation">
+ <HintPath>libs\Interop.OPCAutomation.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
- <HintPath>bin\Release\Interop.OPCAutomation.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -115,13 +107,11 @@
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
- <Reference Include="ReduceMemory, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\ReduceMemory.dll</HintPath>
+ <Reference Include="ReduceMemory">
+ <HintPath>libs\ReduceMemory.dll</HintPath>
</Reference>
- <Reference Include="SperateData, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\M423Release\SperateData.dll</HintPath>
+ <Reference Include="SperateData">
+ <HintPath>libs\SperateData.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
--
Gitblit v1.8.0