修改上传记录显示异常

FileWatcher/UploadMakePlan.cs

@@ -14,21 +14,15 @@ namespace FileWatcher
 
         string connectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
-
         StringBuilder sql = new StringBuilder();
 
         DataHelper dh;
 
-        string imaster;
-
         public UploadMakePlan()
         {
             InitializeComponent();
             StartPosition = FormStartPosition.CenterScreen;
         }
-
-        string fieltype = "";
-        string ftpulr = "";
         private void Form1_Load(object sender, EventArgs e)
         {
             dh = new DataHelper(connectionString);
@@ -37,7 +31,7 @@ namespace FileWatcher
 
         private void Upload_Click(object sender, EventArgs e)
         {
-           
+
             DateTime today = DateTime.Value;
             string todayDate = today.ToString("MMdd");
             string code = "";
@@ -57,7 +51,7 @@ namespace FileWatcher
                 id = dt.Rows[0]["mp_id"].ToString();
                 dh.ExecuteSql("delete from MakePlandetail where mpd_mpid=" + id, "delete");
             }
-
+            string ErrMessage = "";
             using (FileStream file = new FileStream(FilePath.Text, FileMode.Open, FileAccess.Read))
             {
                 XSSFWorkbook workbook = new XSSFWorkbook(file);
@@ -127,7 +121,6 @@ namespace FileWatcher
                                 }
                             }
                         }
-
                         if (orderdetnoIndex == -1 || ordercodeIndex == -1 || planqtyIndex == -1 || remarkIndex == -1 || stepcodeIndex == -1)
                         {
                             OperateResult.AppendText("列头缺少，请检查表结构");
@@ -157,30 +150,27 @@ namespace FileWatcher
                                         string day = today.ToString("yyyy-MM-dd");
                                         if (dh.CheckExist("MakePlanDetail left join makeplan on mpd_mpid=mp_id ", "trunc(mp_begintime)=to_date('" + day + "','yyyy-mm-dd') and mpd_orderdetno='" + orderdetno + "' and mpd_ordercode='" + ordercode + "' and mpd_wccode='" + wccode + "'"))
                                         {
-                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "' 工作中心'" + wccode + "' 重复");
-                                            return;
+                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "' 工作中心'" + wccode + "' 重复\n";
                                         }
                                         //销售订单 + 订单序号存在ERP中，才允许上传
                                         if (!dh.CheckExist("saledetail@ERP left join sale@ERP on sa_id=sd_said", "SD_DETNO='" + orderdetno + "' and sa_code='" + ordercode + "'"))
                                         {
-                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在");
-                                            return;
+                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在\n";
                                         }
                                         if (!dh.CheckExist("make", "ma_saledetno='" + orderdetno + "' and ma_salecode='" + ordercode + "'"))
                                         {
-                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'未匹配到工单号");
-                                            return;
-                                        }
-                                        dt = (System.Data.DataTable)dh.ExecuteSql("select * from saledetail@ERP left join sale@ERP on sa_id=sd_said left join " +
-                                            "(select min(mpd_outqty)mpd_outqty, mpd_ordercode,mpd_orderdetno  from(select mpd_stepcode,nvl(sum(mpd_outqty),0)mpd_outqty, " +
-                                            "mpd_ordercode, mpd_orderdetno from MakePlanDetail where mpd_wccode='" + wccode + "' and nvl(mpd_stepcode,' ')='" + stepcode + "' group by mpd_ordercode, mpd_orderdetno,mpd_stepcode)group " +
-                                            "by mpd_ordercode, mpd_orderdetno,mpd_stepcode) on sa_code = mpd_ordercode and sd_detno =mpd_orderdetno " +
-                                            "where sd_qty<nvl(mpd_outqty,0)+" + planqty + " and sa_code='" + ordercode + "' and sd_detno='" + orderdetno + "'", "select");
-                                        if (dt.Rows.Count > 0)
-                                        {
-                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'工序" + stepcode + "累计排产数量超出");
-                                            return;
+                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "'未匹配到工单号\n";
                                         }
+                                        //dt = (System.Data.DataTable)dh.ExecuteSql("select * from saledetail@ERP left join sale@ERP on sa_id=sd_said left join " +
+                                        //    "(select min(mpd_outqty)mpd_outqty, mpd_ordercode,mpd_orderdetno  from(select mpd_stepcode,nvl(sum(mpd_outqty),0)mpd_outqty, " +
+                                        //    "mpd_ordercode, mpd_orderdetno from MakePlanDetail where mpd_wccode='" + wccode + "' and nvl(mpd_stepcode,' ')='" + stepcode + "' group by mpd_ordercode, mpd_orderdetno,mpd_stepcode)group " +
+                                        //    "by mpd_ordercode, mpd_orderdetno,mpd_stepcode) on sa_code = mpd_ordercode and sd_detno =mpd_orderdetno " +
+                                        //    "where sd_qty<nvl(mpd_outqty,0)+" + planqty + " and sa_code='" + ordercode + "' and sd_detno='" + orderdetno + "'", "select");
+                                        //if (dt.Rows.Count > 0)
+                                        //{
+                                        //    OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'工序" + stepcode + "累计排产数量超出");
+                                        //    return;
+                                        //}
                                         string insertQuery = "INSERT INTO MakePlanDetail (mpd_mpid,mpd_detno,mpd_id,mpd_wccode, mpd_orderdetno, mpd_ordercode,mpd_outqty,mpd_remark,mpd_stepcode) VALUES (" + id + "," + detno + ",MakePlanDetail_seq.nextval,:1, :2, :3,:4,:5,:6)";
                                         using (OracleCommand cmd = new OracleCommand(insertQuery, conn))
                                         {
@@ -211,8 +201,15 @@ namespace FileWatcher
                 }
                 string Error = "";
                 param = new string[] { id, "0", Error };
-                dh.CallProcedure("USER_PLANSPLIT_COMMIT", ref param);
-                dh.CallProcedure("USER_PLANINSERT_WORK", ref param);
+                if (ErrMessage == "")
+                {
+                    dh.CallProcedure("USER_PLANSPLIT_COMMIT", ref param);
+                    dh.CallProcedure("USER_PLANINSERT_WORK", ref param);
+                }
+                else
+                {
+                    OperateResult.AppendText(ErrMessage);
+                }
             }
         }
 

UAS_WinForm.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES", "UAS-MES\UAS-MES.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_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_MES_JH", "UAS_MES_JH\UAS_MES_JH.csproj", "{DCF126DE-2A41-459C-B1F4-C38F66FA7E58}"
@@ -35,418 +33,252 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_PNE", "UAS_MES_PNE\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_HYSX", "UAS_MES_HYSX\UAS_MES_HYSX.csproj", "{9E3D3539-7AA8-489C-BED7-DAA9C22CD7FE}"
 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_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
-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-出货标签管理(标签复核)", "UAS-出货标签管理(标签复核)\UAS-出货标签管理(标签复核).csproj", "{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理(吉利通)", "UAS-出货标签管理(吉利通)\UAS-出货标签管理(吉利通).csproj", "{9520C162-69BE-41D0-BE89-3E702B746A48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_PW", "UAS_MES_PW\UAS_MES_PW.csproj", "{8450D22A-338F-4202-BC8B-EB5DFDF1AFD5}"
 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
 		{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
 		{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
 		{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
 		{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
-		{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
-		{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|Default.ActiveCfg = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|Default.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}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Debug|x86.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|Default.ActiveCfg = Release|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|Default.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
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|x86.ActiveCfg = Release|Any CPU
-		{7FA72759-6D1C-484E-8C00-5AD2620B3C43}.Release|x86.Build.0 = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|Default.Build.0 = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x64.Build.0 = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Debug|x86.Build.0 = Debug|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Default.ActiveCfg = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|Default.Build.0 = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x64.ActiveCfg = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x64.Build.0 = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x86.ActiveCfg = Release|Any CPU
-		{13F2B4BC-3765-4259-9D5E-ECA4DBBAA099}.Release|x86.Build.0 = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Default.ActiveCfg = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|Default.Build.0 = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x64.Build.0 = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Debug|x86.Build.0 = Debug|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Default.ActiveCfg = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|Default.Build.0 = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x64.ActiveCfg = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x64.Build.0 = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x86.ActiveCfg = Release|Any CPU
-		{9520C162-69BE-41D0-BE89-3E702B746A48}.Release|x86.Build.0 = Release|Any CPU
+		{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|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
@@ -455,6 +287,21 @@ Global
 		SolutionGuid = {9115B5C1-046B-49C0-9E73-10B974D0C04C}
 		VisualSVNWorkingCopyRoot = .
 	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Default = Debug|Default
+		Debug|x64 = Debug|x64
+	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
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Default = Debug|Default