From 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 09:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 9f56f75..fbbbdb8 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1,5 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,6 +22,8 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode>true</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
+ <NuGetPackageImportStamp>
+ </NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,6 +59,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\CKEditor.NET.dll</HintPath>
</Reference>
+ <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.6.4.4\lib\net40\EntityFramework.dll</HintPath>
+ </Reference>
+ <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.6.4.4\lib\net40\EntityFramework.SqlServer.dll</HintPath>
+ </Reference>
<Reference Include="LIMS.MessageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\CY.Dlls\LIMS.MessageBox.dll</HintPath>
@@ -78,6 +87,7 @@
<HintPath>..\CY.Dlls\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
@@ -107,6 +117,10 @@
<Content Include="css\base.css" />
<Content Include="css\Calculator.css" />
<Content Include="css\Common.css" />
+ <Content Include="css\crumbs.css">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>crumbs.Designer.cs</LastGenOutput>
+ </Content>
<Content Include="css\Dialog.css" />
<Content Include="App_Themes\Public\fla\camera.swf" />
<Content Include="App_Themes\Public\fla\locale.xml" />
@@ -1864,7 +1878,9 @@
<Content Include="Pages\business\CorporateClientsMerger.aspx" />
<Content Include="Pages\business\CorporateClientsPrint.aspx" />
<Content Include="Pages\business\CorporateClientsPrint2.aspx" />
+ <Content Include="Pages\business\CorporateClientsUpLoadContract.aspx" />
<Content Include="Pages\business\CorporateClientsVisit.aspx" />
+ <Content Include="Pages\business\CorporateClientsWiFuTiXingList.aspx" />
<Content Include="Pages\business\CuikuanjiluList.aspx" />
<Content Include="Pages\business\CustomerAccessRecordDetailList.aspx" />
<Content Include="Pages\business\CustomerAccessRecordList.aspx" />
@@ -1886,6 +1902,7 @@
<Content Include="Pages\business\DemandDescribeDeatil.aspx" />
<Content Include="Pages\business\DemandOrderCreate.aspx" />
<Content Include="Pages\business\EvaluationBuyer.aspx" />
+ <Content Include="Pages\business\kaipiaoConfirm.aspx" />
<Content Include="Pages\business\EvaluationSeller.aspx" />
<Content Include="Pages\business\FileUpload.aspx" />
<Content Include="Pages\business\FollowRecord.aspx" />
@@ -2832,6 +2849,7 @@
<Compile Include="Close.aspx.designer.cs">
<DependentUpon>Close.aspx</DependentUpon>
</Compile>
+ <Compile Include="cs\EFDate.cs" />
<Compile Include="cs\FixedInfo.cs" />
<Compile Include="cs\clsWinrar.cs" />
<Compile Include="cs\UploadCS.cs" />
@@ -2861,6 +2879,8 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="Helper\TimeTaskHelper.cs" />
+ <Compile Include="Helper\upLoadContractFile.cs" />
<Compile Include="Index.aspx.cs">
<DependentUpon>Index.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3308,12 +3328,26 @@
<Compile Include="Pages\business\CorporateClientsPrint2.aspx.designer.cs">
<DependentUpon>CorporateClientsPrint2.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\CorporateClientsUpLoadContract.aspx.cs">
+ <DependentUpon>CorporateClientsUpLoadContract.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsUpLoadContract.aspx.designer.cs">
+ <DependentUpon>CorporateClientsUpLoadContract.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\CorporateClientsVisit.aspx.cs">
<DependentUpon>CorporateClientsVisit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\business\CorporateClientsVisit.aspx.designer.cs">
<DependentUpon>CorporateClientsVisit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsWiFuTiXingList.aspx.cs">
+ <DependentUpon>CorporateClientsWiFuTiXingList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsWiFuTiXingList.aspx.designer.cs">
+ <DependentUpon>CorporateClientsWiFuTiXingList.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\CuikuanjiluList.aspx.cs">
<DependentUpon>CuikuanjiluList.aspx</DependentUpon>
@@ -3461,6 +3495,13 @@
</Compile>
<Compile Include="Pages\business\EvaluationBuyer.aspx.designer.cs">
<DependentUpon>EvaluationBuyer.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoConfirm.aspx.designer.cs">
+ <DependentUpon>kaipiaoConfirm.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\EvaluationSeller.aspx.cs">
<DependentUpon>EvaluationSeller.aspx</DependentUpon>
@@ -8666,7 +8707,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="bin\" />
<Folder Include="CacheFiles\" />
<Folder Include="images\HtmlEditor\ProcessRequest\" />
<Folder Include="images\HtmlEditor\UploadImage\" />
@@ -8788,6 +8828,7 @@
<None Include="myPagination\js\table\Thumbs.db" />
<Content Include="Pages\business\SendAllCorEmail.aspx" />
<Content Include="OnlineAdviserLOGO.ashx" />
+ <None Include="packages.config" />
<None Include="Pages\common\skin\Thumbs.db" />
<Content Include="Pages\sysInquiry\CalculatePaperPriceHandler.ashx" />
<Content Include="Pages\Templet\Default\Shared\Company.Master" />
@@ -8821,6 +8862,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+ </Target>
+ <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.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.
<Target Name="BeforeBuild">
--
Gitblit v1.9.1