From f71a02229c1ba00fbecaead19256593ffb052753 Mon Sep 17 00:00:00 2001
From: duan <dante@isaints.net>
Date: 星期三, 21 八月 2024 17:18:40 +0800
Subject: [PATCH] 1
---
src/DIXWeb.Web/DIXWeb.Web.csproj | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/DIXWeb.Web/DIXWeb.Web.csproj b/src/DIXWeb.Web/DIXWeb.Web.csproj
index 617e357..f782573 100644
--- a/src/DIXWeb.Web/DIXWeb.Web.csproj
+++ b/src/DIXWeb.Web/DIXWeb.Web.csproj
@@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ERPWeb.Web</RootNamespace>
<AssemblyName>ERPWeb.Web</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -25,6 +25,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -61,6 +62,9 @@
<ItemGroup>
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
+ </Reference>
+ <Reference Include="DMC">
+ <HintPath>DLL\DMC.dll</HintPath>
</Reference>
<Reference Include="DotNetty.Buffers, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetty.Buffers.0.6.0\lib\net45\DotNetty.Buffers.dll</HintPath>
@@ -132,6 +136,7 @@
<Reference Include="System.ComponentModel" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Configuration.Install" />
+ <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.IO.Compression" />
@@ -161,16 +166,14 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Data" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
- <Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
+ <Reference Include="System.Xml.Linq" />
<Reference Include="zxing, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.9\lib\net45\zxing.dll</HintPath>
</Reference>
@@ -770,6 +773,7 @@
<Content Include="Scripts\Bill\PartialInspectFalseDetail.js" />
<Content Include="Scripts\Bill\ReckUpdateHistory.js" />
<Content Include="Scripts\Bill\StartDIX.js" />
+ <Content Include="Scripts\Bill\StartDIXQuality.js" />
<Content Include="Scripts\Bill\StartFCDIX.js" />
<Content Include="Scripts\Bill\StartIndex.js" />
<Content Include="Scripts\bootstrap.js" />
@@ -806,6 +810,8 @@
<Content Include="Areas\GlobalM\Views\Bill\StartDIXFireControl.cshtml" />
<Content Include="Areas\GlobalM\Views\Bill\InspectFalseDetail.cshtml" />
<Content Include="Areas\GlobalM\Views\Statement\ObjectInspectDetail.cshtml" />
+ <Content Include="Areas\GlobalM\Views\WorkflowRoute\EntrustIndex.cshtml" />
+ <Content Include="Areas\GlobalM\Views\Bill\StartDIXQuality.cshtml" />
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
<Content Include="Scripts\Download\TwoDCodeView.js" />
<Content Include="Scripts\echarts.common.min.js" />
@@ -1367,6 +1373,7 @@
<Content Include="Static\All.css" />
<Content Include="Static\Css\All.css" />
<Content Include="Static\Css\MinMaxImg.css" />
+ <Content Include="Template\InspectObjectTemplate.xls" />
<Content Include="Upload\FIle\_.txt" />
<Content Include="Upload\Img\_.txt" />
<Content Include="Upload\_.txt" />
@@ -1648,7 +1655,6 @@
<Content Include="Views\User\Search.cshtml" />
<Content Include="Scripts\jquery-1.10.2.min.map" />
<Content Include="Views\UserInRole\Index.cshtml" />
- <Content Include="Template\InspectObjectTemplate.xls" />
<Content Include="Views\MotifInfo\Form.cshtml" />
<Content Include="Views\MotifInfo\Index.cshtml" />
<Content Include="Views\MotifInfo\warningForm.cshtml" />
--
Gitblit v1.8.0