UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -481,6 +481,10 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 returnstr = returnstr.Substring(0, 1000);
             }
+            JObject deviceObj = JObject.Parse(returnstr);
+            string pallet_no = deviceObj["pallet_no"].ToString();
+            string palltecode = deviceObj["pallet_no"].ToString();
+            dh.ExecuteSql("update package set pa_zxcode ='" + palltecode + "',pa_detno='"+ pallet_no + "' where pa_outboxcode='" + iBox + "'", "update");
             dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GetPalletInfo')", "insert");
         }
 

UAS_MES_YD/FunctionCode/Packing/Packing_PackageCollectionWeigh_HAOQ.cs

@@ -84,6 +84,7 @@ namespace UAS_MES_NEW.Packing
             thread = new Thread(NewPrint);
             SetLoadingWindow stw = new SetLoadingWindow(thread, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
+            pa_outboxcode.Enabled = false;
             stw.ShowDialog();
             try
             {
@@ -1065,11 +1066,13 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Enabled = false;
                 PreFix.Enabled = false;
+                pa_outboxcode.Enabled = false;
             }
             else
             {
                 OutBoxLength.Enabled = true;
                 PreFix.Enabled = true;
+                pa_outboxcode.Enabled = true;
             }
         }
     }

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_NEW.cs

@@ -147,36 +147,36 @@ namespace UAS_MES_NEW.OQC
                 dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
                 dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
-                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "良品采集", "OK", User.UserCode, out ErrorMessage))
-                {
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", ms_sncode.Text, "");
-                }
-                else
-                {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                }
+                //if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "良品采集", "OK", User.UserCode, out ErrorMessage))
+                //{
+                OperateResult.AppendText(">>" + ms_sncode.Text + "良品采集成功\n", Color.Green, ms_sncode);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", ms_sncode.Text, "");
+                //}
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                //}
             }
             else
             {
-                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "不良品采集", "NG", User.UserCode, out ErrorMessage))
-                {
-                    sql.Clear();
-                    //when () then 
-                    sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
-                    sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
-                    sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
-                    sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
-                    dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
-                        oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
-                    dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");
-                }
-                else
-                {
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                }
+                //if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "不良品采集", "NG", User.UserCode, out ErrorMessage))
+                //{
+                sql.Clear();
+                //when () then 
+                sql.Append("insert into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
+                sql.Append("ois_ifng,ois_defectlevel,ois_remark,ois_indate)select OQCItemSamples_seq.nextval,'','" + oMakeCode + "'");
+                sql.Append(",'" + ms_sncode.Text + "','" + pr_code.Text + "',:ois_itemcode,:ois_ifng,'','',sysdate from dual ");
+                sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
+                dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
+                    oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
+                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
+                OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");
+                //}
+                //else
+                //{
+                //    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                //}
             }
             BaseUtil.CleanDGVData(CheckTypeDGV);
             ms_prodcode.Clear();

UAS_MES_YDCY/FunctionCode/Packing/Packing_BigBoxWeight.cs

@@ -1,4 +1,5 @@
 using LabelManager2;
+using Seagull.BarTender.Print;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -34,6 +35,8 @@ namespace UAS_MES_NEW.Packing
 
         Thread thread;
 
+        Engine engine;
+
         Thread InitPrint;
 
         //打印计数
@@ -85,8 +88,7 @@ namespace UAS_MES_NEW.Packing
         {
             try
             {
-                lbl = new ApplicationClass();
-                BaseUtil.WriteLbl();
+                engine = new Engine(true);
             }
             catch
             {
@@ -113,6 +115,16 @@ namespace UAS_MES_NEW.Packing
                 if (dt.Rows.Count > 0)
                 {
                     BaseUtil.SetFormValue(this.Controls, dt);
+                    if (pr_change)
+                    {
+                        String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
+                        if (dialog != "OK")
+                        {
+                            OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
+                            return;
+                        }
+                        else pr_change = false;
+                    }
                     pa_outboxcode.Text = outboxcode;
                 }
                 else
@@ -140,7 +152,7 @@ namespace UAS_MES_NEW.Packing
                         {
                             //doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                             string ErrorMessage = "";
-                            if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                            if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
                             {
                                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                             }
@@ -181,6 +193,8 @@ namespace UAS_MES_NEW.Packing
             showResult.Items.Add(lvi);
         }
 
+        bool pr_change = false;
+
         private void pa_prodcode_TextChanged(object sender, EventArgs e)
         {
             DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='大箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
@@ -188,10 +202,7 @@ namespace UAS_MES_NEW.Packing
             PrintLabel.DisplayMember = "la_name";
             PrintLabel.ValueMember = "la_id";
             ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
+            pr_change = true;
         }
 
         private void StartWeight_Click(object sender, EventArgs e)

UAS_MES_ZDXW/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -95,7 +95,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 

UAS_MES_ZDXW/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -79,7 +79,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 

UAS_MES_ZDXW/FunctionCode/Make/Make_ColorBoxLoadPrintBZ.cs

@@ -78,7 +78,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -507,7 +507,7 @@ namespace UAS_MES_NEW.Make
                     //刷新数据
                     EventArgs e = new EventArgs();
                     object sender = null;
-                    if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode, int.Parse(PrintNum.Text), ma_code, ma_prodcode.Text, "彩盒标", "0", out ErrorMessage))
+                    if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode, int.Parse(PrintNum.Text), ma_code, ma_prodcode.Text, "彩盒标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }

UAS_MES_ZDXW/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -108,7 +108,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -299,7 +299,7 @@ namespace UAS_MES_NEW.Make
             if (PrintLabel.Items.Count != 0)
             {
                 string oErrorMessage;
-                if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
+                if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
                 {
                     OperateResult.AppendText(oErrorMessage + "\n", Color.Red);
                 }

UAS_MES_ZDXW/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -10,6 +10,7 @@ using LabelManager2;
 using System.IO;
 using System.Threading;
 using UAS_MES_NEW.PublicForm;
+using Seagull.BarTender.Print;
 
 namespace UAS_MES_NEW.Make
 {
@@ -28,8 +29,6 @@ namespace UAS_MES_NEW.Make
 
         string ma_unlimitin = "";
 
-        ApplicationClass lbl;
-
         string oMakeCode = "";
         string oMsId = "";
 
@@ -89,17 +88,17 @@ namespace UAS_MES_NEW.Make
             //    BaseUtil.SetFormValue(this.Controls, dt);
             //}
         }
+        public BarTender.Application engine;
 
         private void InPrint()
         {
             try
             {
-                lbl = new ApplicationClass();
-                BaseUtil.WriteLbl();
+                engine = new BarTender.Application();
             }
             catch (Exception ex)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -179,7 +178,7 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
                             //按照打印张数打印
                             //doc = lbl.Documents.Open(PrintLabel.Text);
-                            if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                            if (Print.Bartender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
                             {
                                 //提示用户打印成功
                                 OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
@@ -263,7 +262,6 @@ namespace UAS_MES_NEW.Make
 
         private void Make_FuselageLabelPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
-            BaseUtil.ClosePrint(lbl);
         }
 
         private void Make_FuselageLabelPrint_SizeChanged(object sender, EventArgs e)

UAS_MES_ZDXW/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -50,7 +50,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception ex)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -330,7 +330,7 @@ namespace UAS_MES_NEW.Make
                                     {
                                         OperateResult.AppendText(">>打印序列号" + sn_code.Text + "\n", Color.Black);
                                         //doc = lbl.Documents.Open(PrintLabel.Text);
-                                        if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
+                                        if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
                                         {
                                             OperateResult.AppendText(ErrMessage + "\n", Color.Red);
                                             return;

UAS_MES_ZDXW/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -64,7 +64,7 @@ namespace UAS_MES_NEW.Make
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -191,7 +191,7 @@ namespace UAS_MES_NEW.Make
                     dh.ExecuteSql("update package set pa_printcount=pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                     OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
                     //doc = lbl.Documents.Open(PrintLabel.Text);
-                    if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), ms_makecode.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
+                    if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), ms_makecode.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                     }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_BigBoxCollection.cs

@@ -51,7 +51,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -432,7 +432,7 @@ namespace UAS_MES_NEW.Packing
             {
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
-                    if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                    if (Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
                     }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_BigBoxWeight.cs

@@ -90,7 +90,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -140,7 +140,7 @@ namespace UAS_MES_NEW.Packing
                         {
                             //doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
                             string ErrorMessage = "";
-                            if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
+                            if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "大箱标", "0", out ErrorMessage))
                             {
                                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                             }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_CartonBoxSNWeigh.cs

@@ -106,7 +106,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -255,7 +255,7 @@ namespace UAS_MES_NEW.Packing
         {
             //doc = lbl.Documents.Open(PrintLabel.Text);
             string ErrorMessage = "";
-            if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
+            if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
             {
                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
             }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_CartonBoxWeigh.cs

@@ -94,7 +94,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch (Exception)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -232,7 +232,7 @@ namespace UAS_MES_NEW.Packing
         {
             //doc = lbl.Documents.Open(PrintLabel.Text);
             string ErrorMessage = "";
-            if (!Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
+            if (!Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
             {
                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
             }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -52,7 +52,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch (Exception ex)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n" + ex.Message, Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n" + ex.Message, Color.Red);
             }
         }
 

UAS_MES_ZDXW/FunctionCode/Packing/Packing_PalletCollection.cs

@@ -56,7 +56,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -423,7 +423,7 @@ namespace UAS_MES_NEW.Packing
                         outboxcode.SelectAll();
                     }
                     //doc = lbl.Documents.Open(PrintLabel.Text);
-                    if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
+                    if (Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + "\n", Color.Black);
                     }

UAS_MES_ZDXW/FunctionCode/Packing/Packing_PalletWeigh.cs

@@ -79,7 +79,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch (Exception ex)
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 
@@ -167,7 +167,7 @@ namespace UAS_MES_NEW.Packing
                                 }
                                 //doc = lbl.Documents.Open(PrintLabel.Text);
                                 string ErrorMessage = "";
-                                if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
+                                if (Print.Bartender(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                                 {
                                     //打印成功，请输入栈板号
                                     OperateResult.AppendText("<<打印成功\n", Color.Green);

UAS_MES_ZDXW/FunctionCode/Packing/Packing_PalletWightCollection.cs

@@ -75,7 +75,7 @@ namespace UAS_MES_NEW.Packing
             }
             catch
             {
-                OperateResult.AppendText("未正确安装CodeSoft软件\n", Color.Red);
+                OperateResult.AppendText("未正确安装Bartender软件\n", Color.Red);
             }
         }
 

UAS_MES_ZDXW/FunctionCode/Query/Query_SpecialReport.cs

@@ -100,7 +100,7 @@ namespace UAS_MES_NEW.Query
             }
             catch (Exception)
             {
-                MessageBox.Show("未正确安装CodeSoft软件");
+                MessageBox.Show("未正确安装Bartender软件");
             }
         }
 

UAS_MES_ZDXW/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.Designer.cs

@@ -34,7 +34,7 @@
             this.pr_spec_label = new System.Windows.Forms.Label();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.CodeSoft = new System.Windows.Forms.RadioButton();
+            this.Bartender = new System.Windows.Forms.RadioButton();
             this.labelSoft_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.la_name = new System.Windows.Forms.TextBox();
@@ -115,18 +115,18 @@
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
             // 
-            // CodeSoft
+            // Bartender
             // 
-            this.CodeSoft.AutoSize = true;
-            this.CodeSoft.Checked = true;
-            this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CodeSoft.Location = new System.Drawing.Point(968, 12);
-            this.CodeSoft.Name = "CodeSoft";
-            this.CodeSoft.Size = new System.Drawing.Size(99, 25);
-            this.CodeSoft.TabIndex = 161;
-            this.CodeSoft.TabStop = true;
-            this.CodeSoft.Text = "CodeSoft";
-            this.CodeSoft.UseVisualStyleBackColor = true;
+            this.Bartender.AutoSize = true;
+            this.Bartender.Checked = true;
+            this.Bartender.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Bartender.Location = new System.Drawing.Point(968, 12);
+            this.Bartender.Name = "Bartender";
+            this.Bartender.Size = new System.Drawing.Size(99, 25);
+            this.Bartender.TabIndex = 161;
+            this.Bartender.TabStop = true;
+            this.Bartender.Text = "Bartender";
+            this.Bartender.UseVisualStyleBackColor = true;
             // 
             // labelSoft_label
             // 
@@ -642,7 +642,7 @@
             this.Controls.Add(this.LabelDataGridView);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.labelSoft_label);
-            this.Controls.Add(this.CodeSoft);
+            this.Controls.Add(this.Bartender);
             this.Controls.Add(this.pr_code);
             this.Controls.Add(this.UpdateGrid);
             this.Controls.Add(this.Screen);
@@ -677,7 +677,7 @@
         private System.Windows.Forms.OpenFileDialog openFileDialog1;
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
         private CustomControl.TextBoxWithIcon.SearchTextBox pr_code;
-        private System.Windows.Forms.RadioButton CodeSoft;
+        private System.Windows.Forms.RadioButton Bartender;
         private System.Windows.Forms.Label labelSoft_label;
         private System.Windows.Forms.Label label1;
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum LabelDataGridView;

UAS_MES_ZDXW/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -26,7 +26,7 @@ namespace UAS_MES_NEW.SystemSetting
         //用于拼接条件查询
         StringBuilder condition = new StringBuilder();
         LogStringBuilder sql = new LogStringBuilder();
-        /*CodeSoft新建打印机引擎*/
+        /*Bartender新建打印机引擎*/
         ApplicationClass lbl;
         Document doc;
         /*BarTender新建打印机引擎*/
@@ -136,7 +136,7 @@ namespace UAS_MES_NEW.SystemSetting
             }
             catch (Exception ex)
             {
-                MessageBox.Show("未正确安装codesoft");
+                MessageBox.Show("未正确安装Bartender");
             }
         }
         private void La_code_DbChange(object sender, EventArgs e)
@@ -162,7 +162,7 @@ namespace UAS_MES_NEW.SystemSetting
                     LabelCode = LabelDataGridView.Rows[e.RowIndex].Cells["pl_labelcode"].Value.ToString();
                     pl_id1 = LabelDataGridView.Rows[e.RowIndex].Cells["pl_id"].Value.ToString();
                     La_id1 = LabelDataGridView.Rows[e.RowIndex].Cells["la_id"].Value.ToString();
-                    if (CodeSoft.Checked)
+                    if (Bartender.Checked)
                     {
                         string LabelName = LabelDataGridView.Rows[e.RowIndex].Cells["pl_labelname"].Value.ToString();
                         doc = lbl.Documents.Open(BaseUtil.GetLabelUrl(LabelPath, LabelName));
@@ -256,9 +256,9 @@ namespace UAS_MES_NEW.SystemSetting
         {
             string LabelSoft = "";
             //需要处理新增的行和原有数据然后更新的行
-            if (CodeSoft.Checked)
+            if (Bartender.Checked)
             {
-                LabelSoft = "CodeSoft";
+                LabelSoft = "Bartender";
             }
             DataTable dt = (DataTable)LabelDataGridView.DataSource;
             //如果有改变的行才传递到后台
@@ -323,7 +323,7 @@ namespace UAS_MES_NEW.SystemSetting
         private void OpenFolder_Click(object sender, EventArgs e)
         {
             //根据勾选的不同设置不同的文件后缀过滤
-            if (CodeSoft.Checked)
+            if (Bartender.Checked)
             {
                 openFileDialog1.Filter = "(*.lab)|*.lab";
             }
@@ -453,7 +453,7 @@ namespace UAS_MES_NEW.SystemSetting
             {
                 if (FTPShare.Checked)
                 {
-                    string SoftWare = "CodeSoft";
+                    string SoftWare = "Bartender";
                   
                     ftp.UpLoadFile(FolderPath.Text, la_name.Text,SavePath.Text);
                     if (pl_id2 != "")

UAS_MES_ZDXW/PublicMethod/Print.cs

@@ -7,15 +7,16 @@ using UAS_MES_NEW.Entity;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Seagull.BarTender.Print;
+using System;
 
 namespace UAS_MES_NEW.PublicMethod
 {
     class Print
     {
         static DataHelper dh = SystemInf.dh;
-        //CodeSoft打印的驱动和文件
+        //Bartender打印的驱动和文件
         static Document doc;
-        ////CodeSoft的打印机
+        ////Bartender的打印机
         //string CodeSpft_Printer;
 
         static LabelFormatDocument format;
@@ -134,7 +135,8 @@ namespace UAS_MES_NEW.PublicMethod
             lbl.Quit(BarTender.BtSaveOptions.btDoNotSaveChanges);
             return true;
         }
-        public static bool CodeSoft(string iCaller, Document doc, string LabelName, string LaID, string PrinterName, string SnCode, int PrintNum, string MakeCode, string ProdCode, string LabelType, string IfRePrint, out string ErrorMessage)
+
+        public static bool Bartender(string iCaller, ref BarTender.Application doc, string LabelName, string LaID, string PrinterName, string SnCode, int PrintNum, string MakeCode, string ProdCode, string LabelType, string IfRePrint, out string ErrorMessage)
         {
             ErrorMessage = "";
             DataTable dt = new DataTable();
@@ -159,6 +161,16 @@ namespace UAS_MES_NEW.PublicMethod
             //查询模板对应的取值SQL和参数名称
             dt = (DataTable)dh.ExecuteSql("select lp_name,lp_sql from label left join LABELPARAMETER on la_id=lp_laid where la_id='" + LaID + "'", "select");
             StringBuilder sb = new StringBuilder();
+
+            try
+            {
+                doc2 = doc.Formats.Open(LabelName);
+            }
+            catch (System.Exception)
+            {
+                doc2 = doc.Formats.Open(LabelName);
+            }
+
             if (doc == null)
             {
                 MessageBox.Show("打印文件不存在");
@@ -182,44 +194,47 @@ namespace UAS_MES_NEW.PublicMethod
                     //查询的结果的参数个数大于1需要给标签的多个参数赋值
                     if (Param.Rows.Count > 0)
                     {
-                        int LoopTime = Param.Rows.Count > 100 ? 100 : Param.Rows.Count;
+                        int LoopTime = Param.Rows.Count > 200 ? 200 : Param.Rows.Count;
                         for (int j = 0; j < LoopTime; j++)
                         {
-                            for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
+                            for (int k = 0; k < doc2.NamedSubStrings.Count; k++)
                             {
-                                if (j == 0 & doc.Variables.FormVariables.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper())
+                                if (j == 0 & doc2.NamedSubStrings.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper())
                                 {
-                                    doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[0][0].ToString();
+                                    doc2.SetNamedSubStringValue(doc2.NamedSubStrings.Item(k + 1).Name, Param.Rows[0][0].ToString());
                                 }
                                 //使用SN开头的参数赋值SN1,SN2,SN3等参数
-                                if (doc.Variables.FormVariables.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1))
+                                //if (j != 0 & doc2.NamedSubStrings.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j))
+                                //{
+                                //    doc2.SetNamedSubStringValue(doc2.NamedSubStrings.Item(k + 1).Name, Param.Rows[j][0].ToString());
+                                //}
+                                if (doc2.NamedSubStrings.Item(k + 1).Name.ToUpper() == dt.Rows[i]["lp_name"].ToString().ToUpper() + (j + 1))
                                 {
-                                    doc.Variables.FormVariables.Item(k + 1).Value = Param.Rows[j][0].ToString();
+                                    doc2.SetNamedSubStringValue(doc2.NamedSubStrings.Item(k + 1).Name, Param.Rows[j][0].ToString());
                                 }
                             }
                         }
                     }
                 }
-                catch (System.Exception)
+                catch (Exception)
                 {
                     MessageBox.Show("SQL维护不正确");
                 }
             }
             LogManager.DoLog(sb.ToString());
-            //保存本次赋值进行打印
-            doc.Printer.SwitchTo(PrinterName);
-            doc.PrintDocument(PrintNum);
+            //保存本次赋值进行打印a
+            doc2.PrintSetup.IdenticalCopiesOfLabel = PrintNum;
+            // 序列标签数 
+            doc2.PrintSetup.NumberSerializedLabels = 1;
+            doc2.PrintSetup.Printer = PrinterName;
+            doc2.PrintOut(false, false);
             LogicHandler.DoCommandLog(iCaller, User.UserCode, "", User.UserLineCode, User.UserSourceCode, "打印", "成功打印", SnCode, "");
-            for (int k = 0; k < doc.Variables.FormVariables.Count; k++)
-            {
-                doc.Variables.FormVariables.Item(k + 1).Value = null;
-            }
             LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
             return true;
         }
 
 
-        public static bool CodeSoft(string iCaller, ref ApplicationClass lbl, string LabelName, string LaID, string PrinterName, string SnCode, int PrintNum, string MakeCode, string ProdCode, string LabelType, string IfRePrint, out string ErrorMessage)
+        public static bool Bartender(string iCaller, ref ApplicationClass lbl, string LabelName, string LaID, string PrinterName, string SnCode, int PrintNum, string MakeCode, string ProdCode, string LabelType, string IfRePrint, out string ErrorMessage)
         {
             ErrorMessage = "";
             DataTable dt = new DataTable();

UAS_WinForm.sln

@@ -5,22 +5,16 @@ VisualStudioVersion = 17.14.36202.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES", "UAS-MES\UAS-MES.csproj", "{411DEE44-B893-47E0-A0C2-797A3DAE2466}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理", "UAS-出货标签管理\UAS-出货标签管理.csproj", "{AF6321B6-3B55-4756-8B0B-110354A7BC1E}"
-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_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", "{B44AD0C1-6ED9-4811-8381-B0549B554194}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_JH", "UAS_MES_JH\UAS_MES_JH.csproj", "{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileWatcher", "FileWatcher\FileWatcher.csproj", "{DB114F68-6E53-4F84-9EF6-088419D1F9A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MesInterface(ODLF)", "UAS_MesInterface(ODLF)\UAS_MesInterface(ODLF).csproj", "{7FA72759-6D1C-484E-8C00-5AD2620B3C43}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_ODLF", "UAS_MES_ODLF\UAS_MES_ODLF.csproj", "{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_JWS", "UAS_MES_JWS\UAS_MES_JWS.csproj", "{AF54EC25-011C-4023-8236-A62C017B55D2}"
@@ -35,10 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_BG", "UAS_MES_BG\UA
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_ZT", "UAS_MES_ZT\UAS_MES_ZT.csproj", "{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MesInterface(LGDZ)", "UAS_MesInterface(LGDZ)\UAS_MesInterface(LGDZ).csproj", "{153AE7F6-661B-4854-9215-AF83DE7BB97C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_BARCODEIO", "UAS_BARCODEIO\UAS_BARCODEIO.csproj", "{01C2A10B-D6AF-4417-B189-E85466BE08B9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_LGDZ", "UAS_MES_LGDZ\UAS_MES_LGDZ.csproj", "{110A05D5-D5D7-461B-B48D-46FD52E8692E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_PNE", "UAS_MES_PNE\UAS_MES_PNE.csproj", "{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}"
@@ -47,207 +37,369 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_HYSX", "UAS_MES_HYS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_ZJT", "UAS_MES_ZJT\UAS_MES_ZJT.csproj", "{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_PRINT", "UAS_PRINT\UAS_PRINT.csproj", "{B8BBF7C9-BCCA-49B0-BC22-6519B594AB19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_XZC", "UAS_MES_XZC\UAS_MES_XZC.csproj", "{53E3A804-52BA-4E22-BBF0-172A96938DD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_HGS", "UAS_MES_HGS\UAS_MES_HGS.csproj", "{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_XMW", "UAS_MES_XMW\UAS_MES_XMW.csproj", "{6B45E923-32AA-47FB-A57F-F3FC3A650B79}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_ZDXW", "UAS_MES_ZDXW\UAS_MES_ZDXW.csproj", "{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}"
 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|Default = Release|Default
 		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|Default.ActiveCfg = Release|Any CPU
+		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Default.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
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|x64.Build.0 = Debug|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|x64.ActiveCfg = Release|Any CPU
-		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.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|Default.ActiveCfg = Release|Any CPU
+		{C360004D-8D2C-4633-B8B8-3DD1C2D4AAB6}.Release|Default.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
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|Default.Build.0 = Debug|Any CPU
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|x64.ActiveCfg = Debug|x64
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|x64.Build.0 = Debug|x64
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|x86.ActiveCfg = Debug|x86
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Debug|x86.Build.0 = Debug|x86
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|Default.ActiveCfg = Release|Any CPU
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|Default.Build.0 = Release|Any CPU
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|x64.ActiveCfg = Release|x64
 		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|x64.Build.0 = Release|x64
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|x86.ActiveCfg = Release|x86
+		{7293045C-D6EE-4454-B822-E296AD9E758B}.Release|x86.Build.0 = Release|x86
 		{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|Default.ActiveCfg = Release|Any CPU
+		{8F565F5E-3C9C-4CDD-8DDB-96B1247D1B47}.Release|Default.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
-		{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}.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
+		{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|Default.ActiveCfg = Release|Any CPU
+		{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{DB114F68-6E53-4F84-9EF6-088419D1F9A2}.Release|Default.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
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|x64.Build.0 = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|x64.ActiveCfg = Release|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.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|Default.ActiveCfg = Release|Any CPU
+		{E67FB990-BD42-44DF-BF8E-3E4DDE3035DD}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{AF54EC25-011C-4023-8236-A62C017B55D2}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{2F0ED1F7-F24A-45EF-BE1E-B7960A5A1A2F}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{72798723-9EA6-450B-AF07-D4F50EF6468D}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{BFFE47DD-2569-4E6C-BE6C-FC50A77911E5}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{0D5D213A-3898-4696-85F3-4A153548CC67}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{C2ADEB8E-C8D6-44D7-BD30-EBB279673FF8}.Release|Default.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
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Debug|x64.Build.0 = Debug|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Release|x64.ActiveCfg = Release|Any CPU
-		{153AE7F6-661B-4854-9215-AF83DE7BB97C}.Release|x64.Build.0 = Release|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Debug|x64.Build.0 = Debug|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{01C2A10B-D6AF-4417-B189-E85466BE08B9}.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|Default.ActiveCfg = Release|Any CPU
+		{110A05D5-D5D7-461B-B48D-46FD52E8692E}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{4C922E88-77C5-4CF7-BFF3-C1F260ADCF4A}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}.Release|Default.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
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|Default.Build.0 = Debug|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Debug|x86.Build.0 = Debug|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|Default.ActiveCfg = Release|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|Default.Build.0 = Release|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|x64.ActiveCfg = Release|Any CPU
 		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|x64.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}.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
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D998C5A-C9D0-4481-92C4-BCDCFC4EEA30}.Release|x86.Build.0 = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Default.ActiveCfg = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|Default.Build.0 = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|x64.Build.0 = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Debug|x86.Build.0 = Debug|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Default.ActiveCfg = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|Default.Build.0 = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|x64.ActiveCfg = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|x64.Build.0 = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.Release|x86.ActiveCfg = Release|Any CPU
+		{53E3A804-52BA-4E22-BBF0-172A96938DD4}.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|Default.ActiveCfg = Release|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{6B45E923-32AA-47FB-A57F-F3FC3A650B79}.Release|Default.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|Default.ActiveCfg = Release|Any CPU
+		{C2201B4A-3D50-4FE8-A32B-DAF1C1652A63}.Release|Default.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = .
 		SolutionGuid = {9115B5C1-046B-49C0-9E73-10B974D0C04C}
+		VisualSVNWorkingCopyRoot = .
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -259,9 +411,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
-	EndGlobalSection
 EndGlobal