From 6b5d94e8697f0e73ea7430b1d7041cca18e76de7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 28 八月 2024 15:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
ProM/ProM.csproj | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index 6ceecc4..1a5c6aa 100644
--- a/ProM/ProM.csproj
+++ b/ProM/ProM.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProM</RootNamespace>
<AssemblyName>ProM</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -41,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -65,6 +68,7 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AxInterop.grdes6Lib">
@@ -118,6 +122,12 @@
</Compile>
<Compile Include="濮斿绠＄悊\WW_EntrustOrderBillQuery.designer.cs">
<DependentUpon>WW_EntrustOrderBillQuery.cs</DependentUpon>
+ </Compile>
+ <Compile Include="濮斿绠＄悊\WW_PPBomBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="濮斿绠＄悊\WW_PPBomBillList.Designer.cs">
+ <DependentUpon>WW_PPBomBillList.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Cg_CgDetailReport.cs">
<SubType>Form</SubType>
@@ -358,6 +368,9 @@
<DependentUpon>WW_EntrustOrderBillQuery.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="濮斿绠＄悊\WW_PPBomBillList.resx">
+ <DependentUpon>WW_PPBomBillList.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Cg_CgDetailReport.resx">
<DependentUpon>Cg_CgDetailReport.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1