From bfc6b3908f276dcbb95a1e1f668ff2af124952fc Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 30 五月 2022 15:27:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-SCM
---
BaseSet/app.config | 2 +-
DAL/app.config | 2 +-
SCM/app.config | 2 +-
DAL/DAL.csproj | 2 +-
NETSCM/app.config | 2 +-
Model/Model.csproj | 4 ++--
SCM/SCM.csproj | 13 ++-----------
Model/app.config | 2 +-
BaseSet/BaseSet.csproj | 5 +++--
NETSCM/NETSCM.csproj | 2 +-
SCM/公用类/ClsPub1.cs | 2 +-
11 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 414e86b..4450041 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -31,18 +31,19 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
diff --git a/BaseSet/app.config b/BaseSet/app.config
index e020c31..10f3e96 100644
--- a/BaseSet/app.config
+++ b/BaseSet/app.config
@@ -12,4 +12,4 @@
</setting>
</BaseSet.Properties.Settings>
</applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 53ce618..2e56815 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -14,7 +14,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
diff --git a/DAL/app.config b/DAL/app.config
index 16e0f08..07f0040 100644
--- a/DAL/app.config
+++ b/DAL/app.config
@@ -12,4 +12,4 @@
</setting>
</DAL.Properties.Settings>
</applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 67ed26c..7943d95 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -16,7 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -38,7 +38,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/Model/app.config b/Model/app.config
index c956b35..b55726c 100644
--- a/Model/app.config
+++ b/Model/app.config
@@ -12,4 +12,4 @@
</setting>
</Model.Properties.Settings>
</applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/NETSCM/NETSCM.csproj b/NETSCM/NETSCM.csproj
index adc3e1f..73aa818 100644
--- a/NETSCM/NETSCM.csproj
+++ b/NETSCM/NETSCM.csproj
@@ -16,7 +16,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
diff --git a/NETSCM/app.config b/NETSCM/app.config
index 6452b7d..98c4e55 100644
--- a/NETSCM/app.config
+++ b/NETSCM/app.config
@@ -12,4 +12,4 @@
</setting>
</NETSCM.Properties.Settings>
</applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/SCM/SCM.csproj b/SCM/SCM.csproj
index 719fadb..b1a260e 100644
--- a/SCM/SCM.csproj
+++ b/SCM/SCM.csproj
@@ -15,7 +15,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -67,8 +67,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="BLL">
<HintPath>..\DLL\BLL.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
@@ -795,14 +794,6 @@
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="stdole">
- <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
- <VersionMajor>2</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
diff --git a/SCM/app.config b/SCM/app.config
index cac7290..35e43f7 100644
--- a/SCM/app.config
+++ b/SCM/app.config
@@ -12,4 +12,4 @@
</setting>
</SCM.Properties.Settings>
</applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs" "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
index ca04c4c..eabd8bf 100644
--- "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
+++ "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
@@ -17,7 +17,7 @@
//public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 澶栫綉
//public static string WEBSURL = "http://192.168.0.66/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鍐呯綉
//public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS-TEST/WebService1.asmx"; //鍥涚淮灏旀祴璇�
- //public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 澶栫綉
+ public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 澶栫綉
//public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鏂颁腑闂村眰 鍐呯綉
//public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx"; //闊╃數 澶栫綉JIT锛堜笉鐢級
//public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx"; //闊╃數 澶栫綉
--
Gitblit v1.9.1