From c9b292915996bc094a2369e4f34831b25b13a1ef Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 25 八月 2021 22:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
ProM/ProM.csproj | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index d7efe53..6ceecc4 100644
--- a/ProM/ProM.csproj
+++ b/ProM/ProM.csproj
@@ -67,8 +67,15 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.grdes6Lib">
+ <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
+ </Reference>
<Reference Include="AxInterop.gregn6Lib">
<HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.grdes6Lib">
+ <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.gregn6Lib">
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
@@ -497,22 +504,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgrdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="grdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1