覆盖

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.421</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.465</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>422</ApplicationRevision>
+    <ApplicationRevision>466</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -364,6 +364,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\SNCodeEnterTextBox.Designer.cs">
       <DependentUpon>SNCodeEnterTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SnCollectionBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SnCollectionBox.Designer.cs">
+      <DependentUpon>SnCollectionBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\TextAreaForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -485,6 +491,12 @@
     <Compile Include="FunctionCode\Make\Make_GetReMakeSN.Designer.cs">
       <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_ImeiCheck.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ImeiCheck.Designer.cs">
+      <DependentUpon>Make_ImeiCheck.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_LabelCheck.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1087,6 +1099,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_GetReMakeSN.resx">
       <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ImeiCheck.resx">
+      <DependentUpon>Make_ImeiCheck.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_LabelCheck.resx">
       <DependentUpon>Make_LabelCheck.cs</DependentUpon>
     </EmbeddedResource>

UAS_AutoPass/UAS_AutoPass.csproj

@@ -28,10 +28,10 @@
     <ProductName>UAS自动过站解析器</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>UAS自动过站解析器</SuiteName>
-    <MinimumRequiredVersion>1.0.0.15</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.20</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>16</ApplicationRevision>
+    <ApplicationRevision>21</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -100,6 +100,12 @@
     <Compile Include="AutoAnalysisXml.Designer.cs">
       <DependentUpon>AutoAnalysisXml.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form2.Designer.cs">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </Compile>
     <Compile Include="LoadingCircle.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -129,6 +135,9 @@
     <EmbeddedResource Include="AutoAnalysisXml.resx">
       <DependentUpon>AutoAnalysisXml.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form2.resx">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Login.resx">
       <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>

UAS_DLLTest/UAS_DLLTest.csproj

@@ -14,7 +14,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <PublishUrl>E:\s_user_site\DllTest\</PublishUrl>
     <Install>true</Install>
@@ -32,7 +31,7 @@
     <SuiteName>DLLTest</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>