diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index 150ae015f9..568a25b586 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.1806
+# SharpDevelop 2.1.0.1900
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -56,6 +56,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleDbToolsProvider", "AddIns\Misc\SharpServerTools\OracleDbToolsProvider\OracleDbToolsProvider.csproj", "{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDbTools", "AddIns\Misc\SharpServerTools\SharpDbTools\SharpDbTools.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}"
@@ -378,6 +388,18 @@ Global
 		{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.Build.0 = Release|Any CPU
 		{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D721EAA4-8A40-4EF0-A011-5862159BE621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D721EAA4-8A40-4EF0-A011-5862159BE621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D721EAA4-8A40-4EF0-A011-5862159BE621}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D721EAA4-8A40-4EF0-A011-5862159BE621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@@ -420,6 +442,10 @@ Global
 		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
 		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
+		{D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
+		{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}
 		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
 		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}
 		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}