diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 3364e96f0c..33e9c3d45b 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -43,7 +43,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Cecil", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp.Refactoring", "src\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj", "{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}"
EndProject
@@ -89,7 +89,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "sr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "src\AddIns\BackendBindings\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{CAD4D128-5A67-444B-88AE-37E0AF79C57E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBBinding", "src\AddIns\BackendBindings\VBBinding\Project\VBBinding.vbproj", "{6D209CBB-D8C1-478A-BC30-D3FC87B7858F}"
EndProject
@@ -125,7 +125,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\Ad
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SharpDevelop.EnvDTE", "src\AddIns\Misc\PackageManagement\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj", "{C3F15E22-5793-4129-AF8C-6229112B86D2}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SharpDevelop.EnvDTE", "src\AddIns\Misc\PackageManagement\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj", "{1B753D7F-7C77-4D5E-B928-02982690879C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Tests", "src\AddIns\Misc\PackageManagement\Test\PackageManagement.Tests.csproj", "{56E98A01-8398-4A08-9578-C7337711A52B}"
EndProject
@@ -141,15 +141,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2.Tests", "src\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{FEDD3FD9-0480-43CC-913C-4E0876DDA852}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{62033CC6-01CD-47A2-ADFD-188E9C524C0A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2EE63FDD-7F49-40BD-8A2E-240848B9FA83}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{0884566C-E013-4185-B223-47547AA75167}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{1491E558-9C19-4EAC-9406-868AB8181F38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{47B2D204-C993-4489-8B83-6DA7321CFAE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
EndProject
@@ -193,7 +193,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\Ad
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}"
EndProject
@@ -211,7 +211,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\Ad
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{C16BEA37-FEE8-4792-B860-48F5BFBD39A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
EndProject
@@ -221,21 +221,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications.Tests
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications", "src\AddIns\Analysis\MachineSpecifications\MachineSpecifications\MachineSpecifications.csproj", "{D1DA3B8F-7313-4BDA-8880-461C5F007751}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQuality", "src\AddIns\Analysis\CodeQuality\CodeQuality.csproj", "{0A029008-4973-4256-9150-9AF12845C547}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQuality", "src\AddIns\Analysis\CodeQuality\CodeQuality.csproj", "{3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{7D16E1F9-0F9F-4A05-A162-A59C05E88B68}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{CEFF8221-95D8-4F60-9D14-687019D0B2E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BD38E43B-947F-474B-8F6C-8BDAA9EE99A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortSD4AddInToSD5", "samples\PortSD4AddInToSD5\PortSD4AddInToSD5.csproj", "{E2FD63DA-8478-4066-934C-DA82A852C83A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
EndProject
Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
EndProject
@@ -309,10 +307,10 @@ Global
{63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
{63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
- {B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
- {B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
- {B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
- {B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
+ {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
+ {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
+ {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
+ {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
@@ -389,10 +387,10 @@ Global
{85C09AD8-183B-403A-869A-7226646218A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85C09AD8-183B-403A-869A-7226646218A9}.Release|Any CPU.Build.0 = Release|Any CPU
- {CAD4D128-5A67-444B-88AE-37E0AF79C57E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CAD4D128-5A67-444B-88AE-37E0AF79C57E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CAD4D128-5A67-444B-88AE-37E0AF79C57E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CAD4D128-5A67-444B-88AE-37E0AF79C57E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F390DA70-1FE1-4715-81A0-389AB010C130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F390DA70-1FE1-4715-81A0-389AB010C130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F390DA70-1FE1-4715-81A0-389AB010C130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F390DA70-1FE1-4715-81A0-389AB010C130}.Release|Any CPU.Build.0 = Release|Any CPU
{6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -449,10 +447,10 @@ Global
{A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|Any CPU.Build.0 = Release|Any CPU
- {C3F15E22-5793-4129-AF8C-6229112B86D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C3F15E22-5793-4129-AF8C-6229112B86D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C3F15E22-5793-4129-AF8C-6229112B86D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C3F15E22-5793-4129-AF8C-6229112B86D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|Any CPU.Build.0 = Release|Any CPU
{56E98A01-8398-4A08-9578-C7337711A52B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56E98A01-8398-4A08-9578-C7337711A52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56E98A01-8398-4A08-9578-C7337711A52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -473,26 +471,26 @@ Global
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}.Release|Any CPU.Build.0 = Release|Any CPU
- {62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Debug|Any CPU.ActiveCfg = Debug|x86
- {62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Debug|Any CPU.Build.0 = Debug|x86
- {62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Release|Any CPU.ActiveCfg = Release|x86
- {62033CC6-01CD-47A2-ADFD-188E9C524C0A}.Release|Any CPU.Build.0 = Release|x86
- {2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2EE63FDD-7F49-40BD-8A2E-240848B9FA83}.Release|Any CPU.Build.0 = Release|Any CPU
- {0884566C-E013-4185-B223-47547AA75167}.Debug|Any CPU.ActiveCfg = Debug|x86
- {0884566C-E013-4185-B223-47547AA75167}.Debug|Any CPU.Build.0 = Debug|x86
- {0884566C-E013-4185-B223-47547AA75167}.Release|Any CPU.ActiveCfg = Release|x86
- {0884566C-E013-4185-B223-47547AA75167}.Release|Any CPU.Build.0 = Release|x86
- {1491E558-9C19-4EAC-9406-868AB8181F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1491E558-9C19-4EAC-9406-868AB8181F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1491E558-9C19-4EAC-9406-868AB8181F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1491E558-9C19-4EAC-9406-868AB8181F38}.Release|Any CPU.Build.0 = Release|Any CPU
- {47B2D204-C993-4489-8B83-6DA7321CFAE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {47B2D204-C993-4489-8B83-6DA7321CFAE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {47B2D204-C993-4489-8B83-6DA7321CFAE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {47B2D204-C993-4489-8B83-6DA7321CFAE0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {35D002D7-C78B-44FB-92AA-104BEB431678}.Debug|Any CPU.Build.0 = Debug|x86
+ {35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.ActiveCfg = Release|x86
+ {35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Any CPU.Build.0 = Release|x86
+ {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|x86
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|x86
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|x86
+ {E16B73CA-3603-47EE-915E-6F8B2A07304B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E16B73CA-3603-47EE-915E-6F8B2A07304B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -565,10 +563,10 @@ Global
{85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.Build.0 = Release|Any CPU
- {9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.Build.0 = Release|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -593,10 +591,10 @@ Global
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.Build.0 = Release|Any CPU
- {DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|Any CPU.Build.0 = Release|Any CPU
{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -613,34 +611,30 @@ Global
{D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|Any CPU
- {0A029008-4973-4256-9150-9AF12845C547}.Debug|Any CPU.ActiveCfg = Debug|x86
- {0A029008-4973-4256-9150-9AF12845C547}.Debug|Any CPU.Build.0 = Debug|x86
- {0A029008-4973-4256-9150-9AF12845C547}.Release|Any CPU.ActiveCfg = Release|x86
- {0A029008-4973-4256-9150-9AF12845C547}.Release|Any CPU.Build.0 = Release|x86
- {DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}.Release|Any CPU.Build.0 = Release|Any CPU
- {0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7}.Release|Any CPU.Build.0 = Release|Any CPU
- {CEFF8221-95D8-4F60-9D14-687019D0B2E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CEFF8221-95D8-4F60-9D14-687019D0B2E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CEFF8221-95D8-4F60-9D14-687019D0B2E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CEFF8221-95D8-4F60-9D14-687019D0B2E8}.Release|Any CPU.Build.0 = Release|Any CPU
- {BD38E43B-947F-474B-8F6C-8BDAA9EE99A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BD38E43B-947F-474B-8F6C-8BDAA9EE99A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BD38E43B-947F-474B-8F6C-8BDAA9EE99A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BD38E43B-947F-474B-8F6C-8BDAA9EE99A6}.Release|Any CPU.Build.0 = Release|Any CPU
- {D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3}.Release|Any CPU.Build.0 = Release|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|Any CPU.Build.0 = Debug|x86
+ {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|Any CPU.ActiveCfg = Release|x86
+ {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|Any CPU.Build.0 = Release|x86
+ {068F9531-5D29-49E0-980E-59982A3A0469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {068F9531-5D29-49E0-980E-59982A3A0469}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {068F9531-5D29-49E0-980E-59982A3A0469}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {068F9531-5D29-49E0-980E-59982A3A0469}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|Any CPU.Build.0 = Release|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -667,7 +661,7 @@ Global
{53DCA265-3C3C-42F9-B647-F72BA678122B} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{63D3B27A-D966-4902-90B3-30290E1692F1} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
- {B2BBC7BC-837C-40ED-A6DB-D5AE8626212F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+ {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
@@ -689,7 +683,7 @@ Global
{388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94}
{7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94}
{85C09AD8-183B-403A-869A-7226646218A9} = {E0646C25-36F2-4524-969F-FA621353AB94}
- {CAD4D128-5A67-444B-88AE-37E0AF79C57E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+ {F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94}
{6D209CBB-D8C1-478A-BC30-D3FC87B7858F} = {E0646C25-36F2-4524-969F-FA621353AB94}
{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
@@ -707,7 +701,7 @@ Global
{485A4CCF-55CF-49F4-BD6D-A22B788C67DA} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
{A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
- {C3F15E22-5793-4129-AF8C-6229112B86D2} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
+ {1B753D7F-7C77-4D5E-B928-02982690879C} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
{56E98A01-8398-4A08-9578-C7337711A52B} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
{11115C83-3DB1-431F-8B98-59040359238D} = {485A4CCF-55CF-49F4-BD6D-A22B788C67DA}
@@ -715,11 +709,11 @@ Global
{60480C2F-F228-4D86-B98F-AF75A7DCEC34} = {1F88F080-AD7C-4B03-9895-20C26282429D}
{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5} = {1F88F080-AD7C-4B03-9895-20C26282429D}
{FEDD3FD9-0480-43CC-913C-4E0876DDA852} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
- {62033CC6-01CD-47A2-ADFD-188E9C524C0A} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
- {2EE63FDD-7F49-40BD-8A2E-240848B9FA83} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
- {0884566C-E013-4185-B223-47547AA75167} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
- {1491E558-9C19-4EAC-9406-868AB8181F38} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
- {47B2D204-C993-4489-8B83-6DA7321CFAE0} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
+ {35D002D7-C78B-44FB-92AA-104BEB431678} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
+ {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
+ {4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
+ {E16B73CA-3603-47EE-915E-6F8B2A07304B} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
+ {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {FEDD3FD9-0480-43CC-913C-4E0876DDA852}
{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
@@ -741,7 +735,7 @@ Global
{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}
{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}
{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
- {9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+ {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{AF5E0DC1-1FA0-4346-A436-0C817C68F7C1} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}
@@ -750,18 +744,17 @@ Global
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
- {DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
+ {C16BEA37-FEE8-4792-B860-48F5BFBD39A9} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{172AE35D-2051-4977-AC13-0BF1B76374D5} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{D1DA3B8F-7313-4BDA-8880-461C5F007751} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
- {0A029008-4973-4256-9150-9AF12845C547} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
+ {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{7D16E1F9-0F9F-4A05-A162-A59C05E88B68} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
- {DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
- {0D08CEB7-B051-43CF-BBE2-8FD3C43DB0B7} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
- {CEFF8221-95D8-4F60-9D14-687019D0B2E8} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
- {BD38E43B-947F-474B-8F6C-8BDAA9EE99A6} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
- {D7DB55CF-58F8-4164-A6C9-AE7456E5BEF3} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
- {E2FD63DA-8478-4066-934C-DA82A852C83A} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+ {068F9531-5D29-49E0-980E-59982A3A0469} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
+ {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
+ {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
+ {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
+ {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {7D16E1F9-0F9F-4A05-A162-A59C05E88B68}
EndGlobalSection
EndGlobal
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 131abcccfd..e4a9a90f01 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -95,8 +95,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Mi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortSD4AddInToSD5", "samples\PortSD4AddInToSD5\PortSD4AddInToSD5.csproj", "{E2FD63DA-8478-4066-934C-DA82A852C83A}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D}"
@@ -347,10 +345,6 @@ Global
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.Build.0 = Release|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2FD63DA-8478-4066-934C-DA82A852C83A}.Release|Any CPU.Build.0 = Release|Any CPU
{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -558,7 +552,6 @@ Global
{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
- {E2FD63DA-8478-4066-934C-DA82A852C83A} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {87D549AF-8FCD-4E84-9C33-3DB6E42FEF6D}
diff --git a/samples/PortSD4AddInToSD5/Configuration/AssemblyInfo.cs b/samples/PortSD4AddInToSD5/Configuration/AssemblyInfo.cs
deleted file mode 100644
index 5c67a9af8c..0000000000
--- a/samples/PortSD4AddInToSD5/Configuration/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#region Using directives
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#endregion
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PortSD4AddInToSD5")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PortSD4AddInToSD5")]
-[assembly: AssemblyCopyright("Copyright 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all the values or you can use the default the Revision and
-// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.addin b/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.addin
deleted file mode 100644
index 878ea3cb8c..0000000000
--- a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.addin
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj b/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj
deleted file mode 100644
index af80f14189..0000000000
--- a/samples/PortSD4AddInToSD5/PortSD4AddInToSD5.csproj
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- {E2FD63DA-8478-4066-934C-DA82A852C83A}
- Debug
- AnyCPU
- Library
- PortSD4AddInToSD5
- PortSD4AddInToSD5
- v4.5
- False
- False
- 4
- false
- ..\..\AddIns\
-
-
- AnyCPU
- False
- Auto
- 4194304
- 4096
-
-
- true
- Full
- False
- True
- DEBUG;TRACE
-
-
- False
- None
- True
- False
- TRACE
-
-
-
-
-
-
- 3.5
-
-
-
- 3.5
-
-
-
-
-
-
- 3.5
-
-
-
-
-
- Always
-
-
-
-
-
-
-
-
- {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}
- ICSharpCode.NRefactory.CSharp.Refactoring
- False
-
-
- {53DCA265-3C3C-42F9-B647-F72BA678122B}
- ICSharpCode.NRefactory.CSharp
- False
-
-
- {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}
- ICSharpCode.NRefactory
- False
-
-
- {2748AD25-9C63-4E12-877B-4DCE96FBED54}
- ICSharpCode.SharpDevelop
- False
-
-
- {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
- ICSharpCode.Core
- False
-
-
-
-
\ No newline at end of file
diff --git a/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs b/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs
deleted file mode 100644
index f54b6b6740..0000000000
--- a/samples/PortSD4AddInToSD5/WorkbenchSingletonIssueProvider.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: Daniel
- * Date: 9/22/2012
- * Time: 12:42 PM
- *
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.CSharp.Refactoring;
-using ICSharpCode.NRefactory.PatternMatching;
-using ICSharpCode.NRefactory.Refactoring;
-using ICSharpCode.NRefactory.Semantics;
-using ICSharpCode.NRefactory.CSharp.Resolver;
-using ICSharpCode.SharpDevelop;
-
-namespace PortSD4AddInToSD5
-{
- [IssueDescription ("Usage of SD4 WorkbenchSingleton",
- Description = "Usage of SD4 WorkbenchSingleton",
- Category = "SD4->SD5",
- Severity = Severity.Warning)]
- public class WorkbenchSingletonIssueProvider : CodeIssueProvider
- {
- public override IEnumerable GetIssues(BaseRefactoringContext context, string subIssue = null)
- {
- foreach (var mre in context.RootNode.Descendants.OfType()) {
- var rr = context.Resolve(mre);
- var mrr = rr as MemberResolveResult;
- if (mrr == null)
- continue;
- switch (mrr.Member.FullName) {
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window":
- yield return Issue(
- mre,
- script => {
- script.Replace(mre, new IdentifierExpression("SD").Member("WinForms").Member("MainWin32Window"));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench":
- yield return Issue(
- mre,
- script => {
- script.Replace(mre, new IdentifierExpression("SD").Member("Workbench"));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.StatusBar":
- yield return Issue(
- mre,
- script => {
- script.Replace(mre, new IdentifierExpression("SD").Member("StatusBar"));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.InvokeRequired":
- yield return Issue(
- mre,
- script => {
- script.Replace(mre, new IdentifierExpression("SD").Member("MainThread").Member("InvokeRequired"));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWindow":
- yield return Issue(
- mre,
- script => {
- script.Replace(mre, new IdentifierExpression("SD").Member("Workbench").Member("MainWindow"));
- });
- break;
- }
- }
- foreach (var invocationExpression in context.RootNode.Descendants.OfType()) {
- var rr = context.Resolve(invocationExpression);
- var irr = rr as CSharpInvocationResolveResult;
- if (irr == null)
- continue;
- switch (irr.Member.FullName) {
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.CallLater":
- yield return Issue(
- invocationExpression,
- script => {
- script.Replace(invocationExpression,
- new IdentifierExpression("SD").Member("MainThread").Invoke("CallLater", invocationExpression.Arguments.Select(e => e.Clone())));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.AssertMainThread":
- yield return Issue(
- invocationExpression,
- script => {
- script.Replace(invocationExpression,
- new IdentifierExpression("SD").Member("MainThread").Invoke("VerifyAccess"));
- });
- break;
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.SafeThreadAsyncCall":
- {
- // SD.MainThread.InvokeAsync(argument).FireAndForget();
- Expression arg = invocationExpression.Arguments.First().Clone();
- if (invocationExpression.Arguments.Count > 1)
- arg = new LambdaExpression { Body = arg.Invoke(invocationExpression.Arguments.Skip(1).Select(a => a.Clone())) };
- yield return Issue(
- invocationExpression,
- script => {
- script.Replace(invocationExpression,
- new IdentifierExpression("SD").Member("MainThread")
- .Invoke("InvokeAsyncAndForget", arg));
- });
- break;
- }
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.SafeThreadCall":
- case "ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.SafeThreadFunction":
- {
- // SD.MainThread.InvokeIfRequired(argument);
- Expression arg = invocationExpression.Arguments.First().Clone();
- if (invocationExpression.Arguments.Count > 1)
- arg = new LambdaExpression { Body = arg.Invoke(invocationExpression.Arguments.Skip(1).Select(a => a.Clone())) };
- yield return Issue(
- invocationExpression,
- script => {
- script.Replace(invocationExpression,
- new IdentifierExpression("SD").Member("MainThread").Invoke("InvokeIfRequired", arg));
- });
- break;
- }
- case "ICSharpCode.SharpDevelop.IMessageLoop.InvokeAsync":
- // We used to recommend SD.MainThread.InvokeAsync(...).FireAndForget(),
- // but it's better to use SD.MainThread.InvokeAsyncAndForget(...)
- if (invocationExpression.Clone().Invoke("FireAndForget").IsMatch(invocationExpression.Parent.Parent)) {
- var ident = invocationExpression.Parent.GetChildByRole(Roles.Identifier);
- yield return new CodeIssue(
- ident.StartLocation, ident.EndLocation,
- "Use InvokeAsyncAndForget() instead",
- new CodeAction("Use InvokeAsyncAndForget() instead",
- script => {
- var newInvocation = (InvocationExpression)invocationExpression.Clone();
- ((MemberReferenceExpression)newInvocation.Target).MemberName = "InvokeAsyncAndForget";
- script.Replace(invocationExpression.Parent.Parent, newInvocation);
- },
- ident));
- }
- break;
- }
- }
- }
-
- CodeIssue Issue(AstNode node, Action