From 18ca81b6dd7ad6cc89b07c8865be2b9b4a30e258 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 29 三月 2021 17:03:31 +0800
Subject: [PATCH] nothing
---
WebAPI/WebAPI.csproj | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a103539..d57c83a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -22,6 +22,7 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
+ <WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,8 +57,7 @@
<HintPath>DLL\DAL.dll</HintPath>
</Reference>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Dapper.dll</HintPath>
+ <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -116,9 +116,8 @@
<Reference Include="System.Net.Http">
<Private>True</Private>
</Reference>
- <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Net.Http.Formatting.dll</HintPath>
+ <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
@@ -159,37 +158,37 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\System.Web.Helpers.dll</HintPath>
</Reference>
- <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Http.dll</HintPath>
+ <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Http.Cors.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
- <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\System.Web.Http.WebHost.dll</HintPath>
+ <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\System.Web.Optimization.dll</HintPath>
+ <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="System.Xml">
<Private>True</Private>
@@ -208,14 +207,14 @@
</Reference>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
- <Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
+ <Content Include="Content\bootstrap-theme.css" />
+ <Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site.css" />
@@ -231,13 +230,27 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Index.html" />
+ <Content Include="fonts\glyphicons-halflings-regular.woff" />
+ <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+ <Content Include="fonts\glyphicons-halflings-regular.eot" />
+ <None Include="Scripts\jquery-1.10.2.intellisense.js" />
+ <Content Include="Scripts\bootstrap.js" />
+ <Content Include="Scripts\bootstrap.min.js" />
+ <Content Include="Scripts\jquery-1.10.2.js" />
+ <Content Include="Scripts\jquery-1.10.2.min.js" />
+ <None Include="Scripts\jquery.validate-vsdoc.js" />
+ <Content Include="Scripts\jquery.validate.js" />
+ <Content Include="Scripts\jquery.validate.min.js" />
+ <Content Include="Scripts\jquery.validate.unobtrusive.js" />
+ <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
+ <Content Include="Scripts\modernizr-2.6.2.js" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
- <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
+ <Content Include="Scripts\jquery-1.10.2.min.map" />
<None Include="Views\Scripts\jquery-1.10.2.intellisense.js" />
<Content Include="Views\Scripts\jquery-1.10.2.js" />
<Content Include="Views\Scripts\jquery-1.10.2.min.js" />
@@ -316,12 +329,11 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
- <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
<Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
<Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
<Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
- <Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
<Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
@@ -354,7 +366,6 @@
</Compile>
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
- <Compile Include="Service\BaseSetService.cs" />
<Compile Include="Service\YqnQbService.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
@@ -396,9 +407,6 @@
</Content>
<Content Include="Metadata\deploymentTemplates\apiappconfig.azureresource.json" />
<Content Include="apiapp.json" />
- <Content Include="fonts\glyphicons-halflings-regular.woff" />
- <Content Include="fonts\glyphicons-halflings-regular.ttf" />
- <Content Include="fonts\glyphicons-halflings-regular.eot" />
<None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
<None Include="Properties\PublishProfiles\WEBAPI.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
--
Gitblit v1.9.1