DESKTOP-9BSQTIA\bowinuser 2 vuotta sitten
vanhempi
commit
29e18b0495

+ 6 - 0
.gitignore

@@ -360,3 +360,9 @@ FodyWeavers.xsd
 /EMIS.Web/Logs
 /EMIS.Web/Content/DownFile/2022-09-19
 /EMIS.Web/App_Data/SenparcTraceLog
+Lib/EntityFramework.Extended.dll.config
+Lib/EntityFramework.Extended.xml
+Lib/EntityFramework.SqlServer.xml
+Lib/EntityFramework.xml
+Lib/zh-Hans/EntityFramework.resources.dll
+Lib/zh-Hans/EntityFramework.SqlServer.resources.dll

+ 3 - 3
EMIS.CommonLogic/EMIS.CommonLogic.csproj

@@ -42,7 +42,7 @@
       <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper">
-      <HintPath>..\..\Lib\AutoMapper.dll</HintPath>
+      <HintPath>..\Lib\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="Bowin.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -120,7 +120,7 @@
     </Reference>
     <Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
+      <HintPath>..\Lib\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -221,7 +221,7 @@
       <Name>EMIS.Entities.HRServices</Name>
     </ProjectReference>
     <ProjectReference Include="..\EMIS.Entities.Log\EMIS.Entities.Log.csproj">
-      <Project>{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}</Project>
+      <Project>{db95178f-587b-4f96-88da-d4fd8ef75bff}</Project>
       <Name>EMIS.Entities.Log</Name>
     </ProjectReference>
     <ProjectReference Include="..\EMIS.Entities.LYDataCenter\EMIS.Entities.LYDataCenter.csproj">

+ 1 - 1
EMIS.Service/EMIS.Service.csproj

@@ -39,7 +39,7 @@
       <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Bowin.Common">
-      <HintPath>..\..\源代码New\Lib\Bowin.Common.dll</HintPath>
+      <HintPath>..\Lib\Bowin.Common.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 4 - 5
EMIS.Utility/EMIS.Utility.csproj

@@ -53,7 +53,7 @@
       <HintPath>..\packages\BouncyCastle.NetFramework.1.8.5.2\lib\net20\BouncyCastle.dll</HintPath>
     </Reference>
     <Reference Include="Bowin.Common">
-      <HintPath>..\EMIS.Web\bin\Bowin.Common.dll</HintPath>
+      <HintPath>..\Lib\Bowin.Common.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll</HintPath>
@@ -88,9 +88,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Senparc.Weixin.6.3.10.2\lib\net45\Senparc.Weixin.dll</HintPath>
     </Reference>
-    <Reference Include="Senparc.Weixin.MP, Version=16.6.15.15965, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Senparc.Weixin.MP.16.10.601\lib\net45\Senparc.Weixin.MP.dll</HintPath>
+    <Reference Include="Senparc.Weixin.MP">
+      <HintPath>..\Lib\Senparc.Weixin.MP.dll</HintPath>
     </Reference>
     <Reference Include="Senparc.Weixin.MP.MvcExtension, Version=7.2.7.2, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Senparc.Weixin.MP.MVC.7.2.7.2\lib\net40\Senparc.Weixin.MP.MvcExtension.dll</HintPath>
@@ -171,7 +170,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EMIS.Entities.Log\EMIS.Entities.Log.csproj">
-      <Project>{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}</Project>
+      <Project>{db95178f-587b-4f96-88da-d4fd8ef75bff}</Project>
       <Name>EMIS.Entities.Log</Name>
     </ProjectReference>
     <ProjectReference Include="..\EMIS.Entities\EMIS.Entities.csproj">

+ 2 - 2
EMIS.ViewModel/EMIS.ViewModel.csproj

@@ -36,10 +36,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Bowin.Common">
-      <HintPath>..\EMIS.Web\bin\Bowin.Common.dll</HintPath>
+      <HintPath>..\Lib\Bowin.Common.dll</HintPath>
     </Reference>
     <Reference Include="Bowin.Common.Mvc">
-      <HintPath>..\EMIS.Web\bin\Bowin.Common.Mvc.dll</HintPath>
+      <HintPath>..\Lib\Bowin.Common.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 7 - 8
EMiS.DataLogic/EMIS.DataLogic.csproj

@@ -42,9 +42,8 @@
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EntityFramework.Extended, Version=6.0.0.0, Culture=neutral, PublicKeyToken=05b7e29bdd433584, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.Extended.6.1.0.168\lib\net40\EntityFramework.Extended.dll</HintPath>
+    <Reference Include="EntityFramework.Extended">
+      <HintPath>..\Lib\EntityFramework.Extended.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
@@ -452,7 +451,11 @@
     <Compile Include="LogUnitOfWork.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\LxlWork\Bowindll\Bowin.Common\Bowin.Common.csproj">
+    <ProjectReference Include="..\EMIS.Entities.Log\EMIS.Entities.Log.csproj">
+      <Project>{db95178f-587b-4f96-88da-d4fd8ef75bff}</Project>
+      <Name>EMIS.Entities.Log</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Framework\Bowin.Common\Bowin.Common.csproj">
       <Project>{8a4c1c47-63ba-481b-b1ff-8175a91b2d32}</Project>
       <Name>Bowin.Common</Name>
     </ProjectReference>
@@ -464,10 +467,6 @@
       <Project>{7EB62FAF-C70F-4EED-AE7E-F3AD03F8824D}</Project>
       <Name>EMIS.Entities.HRServices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EMIS.Entities.Log\EMIS.Entities.Log.csproj">
-      <Project>{DB95178F-587B-4F96-88DA-D4FD8EF75BFF}</Project>
-      <Name>EMIS.Entities.Log</Name>
-    </ProjectReference>
     <ProjectReference Include="..\EMIS.Entities.LYDataCenter\EMIS.Entities.LYDataCenter.csproj">
       <Project>{7893159a-b2a7-40dd-85ba-df93f9e7aee1}</Project>
       <Name>EMIS.Entities.LYDataCenter</Name>

+ 3 - 3
Framework/Bowin.Common/Bowin.Common.csproj

@@ -116,9 +116,9 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Lib\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog">
       <HintPath>..\..\Lib\NLog.dll</HintPath>

+ 0 - 3
Framework/Senparc.Weixin.MP/Senparc.Weixin.MP.csproj

@@ -55,9 +55,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>F:\岭南职业学院考试系统新\Lib\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

+ 7 - 7
Framework/Senparc.Weixin/Senparc.Weixin.csproj

@@ -74,16 +74,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>F:\岭南职业学院考试系统新\Lib\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Senparc.CO2NET">
-      <HintPath>F:\岭南职业学院考试系统新\packages\Senparc.CO2NET.0.5.2\lib\net45\Senparc.CO2NET.dll</HintPath>
+    <Reference Include="Senparc.CO2NET, Version=0.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Senparc.CO2NET.0.5.2\lib\net45\Senparc.CO2NET.dll</HintPath>
     </Reference>
-    <Reference Include="Senparc.CO2NET.APM">
-      <HintPath>F:\岭南职业学院考试系统新\packages\Senparc.CO2NET.APM.0.2.5\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
+    <Reference Include="Senparc.CO2NET.APM, Version=0.2.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Senparc.CO2NET.APM.0.2.5\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
     </Reference>
-    <Reference Include="Senparc.NeuChar">
-      <HintPath>F:\岭南职业学院考试系统新\packages\Senparc.NeuChar.0.6.4\lib\net40\Senparc.NeuChar.dll</HintPath>
+    <Reference Include="Senparc.NeuChar, Version=0.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Senparc.NeuChar.0.6.2\lib\net45\Senparc.NeuChar.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

+ 4 - 4
Framework/Senparc.Weixin/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
-  <package id="Senparc.CO2NET" version="0.5.2" targetFramework="net45" />
-  <package id="Senparc.CO2NET.APM" version="0.2.5" targetFramework="net45" />
-  <package id="Senparc.NeuChar" version="0.6.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
+  <package id="Senparc.CO2NET" version="0.5.2" targetFramework="net452" />
+  <package id="Senparc.CO2NET.APM" version="0.2.5" targetFramework="net452" />
+  <package id="Senparc.NeuChar" version="0.6.2" targetFramework="net452" />
 </packages>

BIN
Lib/Bowin.Common.Mvc.dll


BIN
Lib/Bowin.Common.dll


BIN
Lib/Bowin.Web.Controls.Mvc.dll


BIN
Lib/Newtonsoft.Json.dll