Forráskód Böngészése

修改支持版本

callm 1 hete
szülő
commit
bf8ac93d89
2 módosított fájl, 21 hozzáadás és 21 törlés
  1. 19 19
      UAS_MES_ZKLH/App.config
  2. 2 2
      UAS_MES_ZKLH/packages.config

+ 19 - 19
UAS_MES_ZKLH/App.config

@@ -2,17 +2,17 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup useLegacyV2RuntimeActivationPolicy="true"> 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <userSettings>
     <UAS_MES_NEW.Properties.Settings>
@@ -20,22 +20,22 @@
         <value>优软科技MES</value>
       </setting>
       <setting name="LastLoginUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginSob" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginResource" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultCollectionValue" serializeAs="String">
         <value>DefaultValue</value>
       </setting>
       <setting name="PortName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="BaudRate" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="FTPAddress" serializeAs="String">
         <value>ftp://10.8.0.82|vsftpd|vsftpd</value>
@@ -46,22 +46,22 @@
         <value>优软科技MES</value>
       </setting>
       <setting name="LastLoginUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginSob" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginResource" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultCollectionValue" serializeAs="String">
         <value>DefaultValue</value>
       </setting>
       <setting name="PortName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="BaudRate" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="FTPAddress" serializeAs="String">
         <value>\\172.16.66.51\lable</value>
@@ -71,8 +71,8 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
   </applicationSettings>
-</configuration>
+</configuration>

+ 2 - 2
UAS_MES_ZKLH/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="9.7.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+  <package id="HslCommunication" version="9.7.0" targetFramework="net40" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" requireReinstallation="true" />
 </packages>