去除截取80位限制

UAS_MES_ZDXW/FunctionCode/Make/Make_FeedingCollection.cs

@@ -183,7 +183,7 @@ namespace UAS_MES_NEW.Make
                                         return;
                                     }
                                 }
-                                TSN.Add(code.Text.Substring(0, code.Text.Length > 80 ? 80 : code.Text.Length));
+                                TSN.Add(code.Text);
                                 if (sp_barcoderule == "BARCODE")
                                 {
                                     sp_soncode = ErrorMessage;
@@ -322,7 +322,7 @@ namespace UAS_MES_NEW.Make
                                     {
                                         CollectDataSonCode.Add(sp_soncode);
                                         SPID.Add(sp_id);
-                                        CollectData.Add(code.Text.Substring(0, code.Text.Length > 80 ? 80 : code.Text.Length));
+                                        CollectData.Add(code.Text);
                                         sn_code.Text = code.Text;
                                         OperateResult.AppendText(">>序列号" + code.Text + ",物料" + sp_soncode + "上料成功\n", Color.Green);
                                         RemainIndex = RemainIndex + 1;
@@ -427,16 +427,16 @@ namespace UAS_MES_NEW.Make
             CollectDataSonCode.Add(sp_soncode);
             //采集成功提示
 
-            CollectData.Add(code.Text.Substring(0, code.Text.Length > 80 ? 80 : code.Text.Length));
+            CollectData.Add(code.Text);
             if (!CheckBarcode.ContainsKey(sp_fsoncode))
             {
-                CheckBarcode.Add(sp_fsoncode, code.Text.Substring(0, code.Text.Length > 80 ? 80 : code.Text.Length));
+                CheckBarcode.Add(sp_fsoncode, code.Text);
             }
             SPID.Add(sp_id);
             OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
             LabelDataGridView.Rows[RemainIndex].Cells["BarCode"].Value = code.Text;
-            if (code.Text.Length > 80)
-                OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80，内容截取前80位进行采集\n", Color.Red);
+            //if (code.Text.Length > 80)
+            //    OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80，内容截取前80位进行采集\n", Color.Red);
             code.Clear();
             RemainIndex = RemainIndex + 1;
             //如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了

UAS_WinForm.sln

@@ -44,248 +44,131 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Default = Debug|Default
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Default.Build.0 = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x64.Build.0 = Debug|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|x86.Build.0 = Debug|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.Build.0 = Release|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x64.ActiveCfg = Release|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x64.Build.0 = Release|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x86.ActiveCfg = Release|Any CPU
-		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|x86.Build.0 = Release|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|Default.Build.0 = Debug|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|x64.Build.0 = Debug|Any CPU
-		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Debug|x86.Build.0 = Debug|Any CPU
-		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|x64.ActiveCfg = Release|Any CPU
-		{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
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|Default.Build.0 = Debug|Any CPU
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|x64.Build.0 = Debug|Any CPU
-		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Debug|x86.Build.0 = Debug|Any CPU
-		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|x64.ActiveCfg = Release|Any CPU
-		{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
 		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|Default.Build.0 = Debug|Any CPU
 		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|x64.Build.0 = Debug|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Debug|x86.Build.0 = Debug|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|x64.ActiveCfg = Release|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|x64.Build.0 = Release|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|x86.ActiveCfg = Release|Any CPU
-		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|x86.Build.0 = Release|Any CPU
 		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|Default.Build.0 = Debug|Any CPU
 		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|x64.Build.0 = Debug|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Debug|x86.Build.0 = Debug|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|x64.ActiveCfg = Release|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|x64.Build.0 = Release|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|x86.ActiveCfg = Release|Any CPU
-		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|x86.Build.0 = Release|Any CPU
 		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|Default.Build.0 = Debug|Any CPU
 		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|x64.Build.0 = Debug|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Debug|x86.Build.0 = Debug|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|x64.ActiveCfg = Release|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|x64.Build.0 = Release|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|x86.ActiveCfg = Release|Any CPU
-		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|x86.Build.0 = Release|Any CPU
 		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|Default.Build.0 = Debug|Any CPU
 		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|x64.Build.0 = Debug|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Debug|x86.Build.0 = Debug|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|x64.ActiveCfg = Release|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|x64.Build.0 = Release|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|x86.ActiveCfg = Release|Any CPU
-		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|x86.Build.0 = Release|Any CPU
 		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|Default.Build.0 = Debug|Any CPU
 		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|x64.Build.0 = Debug|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Debug|x86.Build.0 = Debug|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|x64.ActiveCfg = Release|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|x64.Build.0 = Release|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|x86.ActiveCfg = Release|Any CPU
-		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|x86.Build.0 = Release|Any CPU
 		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|Default.Build.0 = Debug|Any CPU
 		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|x64.Build.0 = Debug|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Debug|x86.Build.0 = Debug|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|x64.ActiveCfg = Release|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|x64.Build.0 = Release|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|x86.ActiveCfg = Release|Any CPU
-		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|x86.Build.0 = Release|Any CPU
 		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|Default.Build.0 = Debug|Any CPU
 		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|x64.Build.0 = Release|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|x86.Build.0 = Release|Any CPU
 		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|Default.Build.0 = Debug|Any CPU
 		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|x64.Build.0 = Debug|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Debug|x86.Build.0 = Debug|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|x64.ActiveCfg = Release|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|x64.Build.0 = Release|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|x86.ActiveCfg = Release|Any CPU
-		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|x86.Build.0 = Release|Any CPU
 		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|Default.Build.0 = Debug|Any CPU
 		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|x64.Build.0 = Release|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|x86.Build.0 = Release|Any CPU
 		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|Default.Build.0 = Debug|Any CPU
 		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|x64.Build.0 = Debug|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Debug|x86.Build.0 = Debug|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|x64.ActiveCfg = Release|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|x64.Build.0 = Release|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|x86.ActiveCfg = Release|Any CPU
-		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|x86.Build.0 = Release|Any CPU
 		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|Default.Build.0 = Debug|Any CPU
 		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|x64.Build.0 = Debug|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|x64.ActiveCfg = Release|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|x64.Build.0 = Release|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|x86.Build.0 = Release|Any CPU
 		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|Default.Build.0 = Debug|Any CPU
 		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|x64.Build.0 = Release|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|x86.Build.0 = Release|Any CPU
 		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Default.Build.0 = Debug|Any CPU
 		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|x64.Build.0 = Debug|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|x86.Build.0 = Debug|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|x64.ActiveCfg = Release|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|x64.Build.0 = Release|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|x86.ActiveCfg = Release|Any CPU
-		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|x86.Build.0 = Release|Any CPU
 		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|Default.Build.0 = Debug|Any CPU
 		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|x64.Build.0 = Debug|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Debug|x86.Build.0 = Debug|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|x64.ActiveCfg = Release|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|x64.Build.0 = Release|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|x86.ActiveCfg = Release|Any CPU
-		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|x86.Build.0 = Release|Any CPU
 		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|Default.Build.0 = Debug|Any CPU
 		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|x64.Build.0 = Release|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|x86.Build.0 = Release|Any CPU
 		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|Default.Build.0 = Debug|Any CPU
 		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|x64.Build.0 = Debug|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Debug|x86.Build.0 = Debug|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|x64.ActiveCfg = Release|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|x64.Build.0 = Release|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|x86.ActiveCfg = Release|Any CPU
-		{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9115B5C1-046B-49C0-9E73-10B974D0C04C}
 		VisualSVNWorkingCopyRoot = .
+		SolutionGuid = {9115B5C1-046B-49C0-9E73-10B974D0C04C}
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -302,14 +185,4 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Default = Debug|Default
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Default = Release|Default
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
 EndGlobal