From fcecf7fef3ebb13d68e93e7761bf0652324ed0b3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 九月 2024 18:10:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PlanM/PlanM.csproj | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 0a55294..ffe5dd7 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlanM</RootNamespace>
<AssemblyName>PlanM</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.gregn6Lib">
@@ -189,12 +193,6 @@
<Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.designer.cs">
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
</Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.Designer.cs">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
- </Compile>
<Compile Include="璁″垝绠＄悊\Gy_ICBomBill.cs">
<SubType>Form</SubType>
</Compile>
@@ -291,9 +289,6 @@
<DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
- <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="璁″垝绠＄悊\Gy_ICBomBill.resx">
<DependentUpon>Gy_ICBomBill.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -360,6 +355,9 @@
<Name>SQLHelper</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="ClassDiagram1.cd" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\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.9.1