项目提交

TestProject/TaskTEST.Designer.cs

@@ -137,7 +137,6 @@
             this.Controls.Add(this.label2);
             this.Name = "TaskTEST";
             this.Text = "Form3";
-            this.Load += new System.EventHandler(this.TaskTEST_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.ResumeLayout(false);

TestProject/TestProject.csproj

@@ -103,9 +103,6 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form2.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="TaskTEST.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -114,12 +111,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QQButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="QQButton.Designer.cs">
-      <DependentUpon>QQButton.cs</DependentUpon>
-    </Compile>
     <Compile Include="UserPanel.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -129,9 +120,6 @@
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form2.resx">
-      <DependentUpon>Form2.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="TaskTEST.resx">
       <DependentUpon>TaskTEST.cs</DependentUpon>
     </EmbeddedResource>
@@ -145,9 +133,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="QQButton.resx">
-      <DependentUpon>QQButton.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="UserPanel.resx">
       <DependentUpon>UserPanel.cs</DependentUpon>
     </EmbeddedResource>

UAS-MES/App.config

@@ -44,7 +44,7 @@
   <applicationSettings>
     <UAS_MES.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES.Properties.Settings>
   </applicationSettings>

UAS-MES/Login.cs

@@ -108,7 +108,7 @@ namespace UAS_MES
             //设置选中数据库的链接
             string DBUser = DB.SelectedValue.ToString().Split('#')[0];
             string Address = DB.SelectedValue.ToString().Split('#')[1];
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + Address + ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;
             //设置屏幕的宽高信息
             SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;

UAS-MES/Properties/Settings.Designer.cs

@@ -109,9 +109,9 @@ namespace UAS_MES.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false" +
-            ";Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230" +
-            ".200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=fa" +
+            "lse;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.1" +
+            "80.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS-MES/Properties/Settings.settings

@@ -24,7 +24,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
       <Value Profile="(Default)">\\172.16.11.99\ShareTest</Value>

UAS-MES/UAS-MES.csproj

@@ -503,6 +503,12 @@
     <Compile Include="FunctionCode\Make\Make_Decompose.Designer.cs">
       <DependentUpon>Make_Decompose.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_Decompose_Ex.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_Decompose_Ex.Designer.cs">
+      <DependentUpon>Make_Decompose_Ex.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_FuselageLabelPrint.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -599,6 +605,18 @@
     <Compile Include="FunctionCode\Make\Make_SeqProgramTransform.Designer.cs">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStockStencil.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStockStencil.Designer.cs">
+      <DependentUpon>Make_SMTStockStencil.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStencil.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SMTStencil.Designer.cs">
+      <DependentUpon>Make_SMTStencil.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SmtTestCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -617,6 +635,12 @@
     <Compile Include="FunctionCode\Make\Make_SpiTestCollection.Designer.cs">
       <DependentUpon>Make_SpiTestCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_StencilScrapReason.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_StencilScrapReason.Designer.cs">
+      <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_UpdateCollectCode.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1163,6 +1187,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_Decompose.resx">
       <DependentUpon>Make_Decompose.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_Decompose_Ex.resx">
+      <DependentUpon>Make_Decompose_Ex.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_FuselageLabelPrint.resx">
       <DependentUpon>Make_FuselageLabelPrint.cs</DependentUpon>
     </EmbeddedResource>
@@ -1211,6 +1238,12 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SMTStockStencil.resx">
+      <DependentUpon>Make_SMTStockStencil.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SMTStencil.resx">
+      <DependentUpon>Make_SMTStencil.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SmtTestCollection.resx">
       <DependentUpon>Make_SmtTestCollection.cs</DependentUpon>
     </EmbeddedResource>
@@ -1220,6 +1253,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SpiTestCollection.resx">
       <DependentUpon>Make_SpiTestCollection.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_StencilScrapReason.resx">
+      <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_UpdateCollectCode.resx">
       <DependentUpon>Make_UpdateCollectCode.cs</DependentUpon>
     </EmbeddedResource>

UAS_CheckWork/Form1.cs

@@ -112,7 +112,7 @@ namespace UAS_CheckWork
                 int year = 0;//记录考勤年份
                 int month = 0;//记录考勤月份
                 int day = 0;//记录考勤日期
-                int hour = 0;//记录考勤小时
+                int hour = 0;//记录考勤小时                                                                                                                                                     
                 int minute = 0;//记录考勤分钟
                 int second = 0;//记录考勤秒
                 int workCode = 0; //记录workCode

UAS_DLLTest/UAS_DLLTest.csproj

@@ -70,7 +70,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BenQGuru.eMES.DLLService, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

UAS_Web/UAS_Web.csproj

@@ -59,7 +59,7 @@
     <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -86,7 +86,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FastReport">
-      <HintPath>..\..\..\..\Users\Hcsy\Documents\Visual Studio 2015\Projects\WinformT\WinformT\FastReport.dll</HintPath>
+      <HintPath>tool\FastReport.dll</HintPath>
     </Reference>
     <Reference Include="FastReport.Bars">
       <HintPath>..\..\..\..\Users\Hcsy\Documents\Visual Studio 2015\Projects\WinformT\WinformT\FastReport.Bars.dll</HintPath>

UAS_WinForm.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES", "UAS-MES\UAS-MES.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_XmlAnalysor", "UAS_XmlAnalysor\UAS_XmlAnalysor.csproj", "{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_KanBan", "UAS_KanBan\UAS_KanBan.csproj", "{13FB3DAF-E684-4B04-9F35-710F925A64C3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_DLLTest", "UAS_DLLTest\UAS_DLLTest.csproj", "{B37433F6-7066-4D60-8A54-4AAD5D0F3D41}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_AutoPass", "UAS_AutoPass\UAS_AutoPass.csproj", "{00071CA1-0410-4E55-BC92-2FF6B160C3AC}"
@@ -21,14 +19,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MesDllService(3.5)", "U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_AutoUpdate", "UAS_AutoUpdate\UAS_AutoUpdate.csproj", "{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_DeviceMonitor", "UAS_DeviceMonitor\UAS_DeviceMonitor.csproj", "{F65E07C6-E843-45F2-872F-6C7F6428332E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{92488A73-91D7-4797-9794-67C4D9D86D09}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_Web", "UAS_Web\UAS_Web.csproj", "{7293045C-D6EE-4454-B822-E296AD9E758B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理(泽天)", "UAS-出货标签管理(泽天)\UAS-出货标签管理(泽天).csproj", "{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理(吉利通)", "UAS-出货标签管理(吉利通)\UAS-出货标签管理(吉利通).csproj", "{9520C162-69BE-41D0-BE89-3E702B746A48}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_PLCDataReader", "PLCDataReader\UAS_PLCDataReader.csproj", "{1144A2FC-0A07-4F8C-97E0-F2913601D466}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_CheckWork", "UAS_CheckWork\UAS_CheckWork.csproj", "{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理(贸易版)", "UAS-出货标签管理(贸易版)\UAS-出货标签管理(贸易版).csproj", "{B44AD0C1-6ED9-4811-8381-B0549B554194}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_PRINT", "UAS_PRINT\UAS_PRINT.csproj", "{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-特殊解析规则", "UAS-特殊解析规则\UAS-特殊解析规则.csproj", "{7D199649-095F-4280-BD82-9481BCAB85B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理(标签复核)", "UAS-出货标签管理(标签复核)\UAS-出货标签管理(标签复核).csproj", "{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,18 +73,6 @@ Global
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x64.Build.0 = Release|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x86.ActiveCfg = Release|Any CPU
 		{7767BBB5-6E7E-4687-A9D6-6C6E9B6F4EA3}.Release|x86.Build.0 = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x64.Build.0 = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Debug|x86.Build.0 = Debug|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x64.ActiveCfg = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x64.Build.0 = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x86.ActiveCfg = Release|Any CPU
-		{13FB3DAF-E684-4B04-9F35-710F925A64C3}.Release|x86.Build.0 = Release|Any CPU
 		{B37433F6-7066-4D60-8A54-4AAD5D0F3D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B37433F6-7066-4D60-8A54-4AAD5D0F3D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B37433F6-7066-4D60-8A54-4AAD5D0F3D41}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -147,18 +145,6 @@ Global
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|x64.Build.0 = Release|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|x86.ActiveCfg = Release|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|x86.Build.0 = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|x64.Build.0 = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|x64.ActiveCfg = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|x64.Build.0 = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|x86.ActiveCfg = Release|Any CPU
-		{F65E07C6-E843-45F2-872F-6C7F6428332E}.Release|x86.Build.0 = Release|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -195,6 +181,90 @@ Global
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|x64.Build.0 = Release|Any CPU
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|x86.ActiveCfg = Release|Any CPU
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|x86.Build.0 = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x64.Build.0 = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x86.Build.0 = Debug|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x64.ActiveCfg = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x64.Build.0 = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x86.ActiveCfg = Release|Any CPU
+		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x86.Build.0 = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|x64.Build.0 = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Debug|x86.Build.0 = Debug|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|x64.ActiveCfg = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|x64.Build.0 = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|x86.ActiveCfg = Release|Any CPU
+		{1144A2FC-0A07-4F8C-97E0-F2913601D466}.Release|x86.Build.0 = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|x64.Build.0 = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{28F8D16E-0332-4430-B0DC-E1E4C7DA0BD1}.Release|x86.Build.0 = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|x64.Build.0 = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Debug|x86.Build.0 = Debug|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|x64.ActiveCfg = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|x64.Build.0 = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|x86.ActiveCfg = Release|Any CPU
+		{B44AD0C1-6ED9-4811-8381-B0549B554194}.Release|x86.Build.0 = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|x64.Build.0 = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}.Release|x86.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x64.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|x86.Build.0 = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x64.Build.0 = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x86.Build.0 = Debug|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x64.ActiveCfg = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x64.Build.0 = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x86.ActiveCfg = Release|Any CPU
+		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE