Merge branch 'newNR' of github.com:icsharpcode/SharpDevelop into newNR

SharpDevelop.Tests.sln

@@ -1,8 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 5.0
+# SharpDevelop 4.3
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
 EndProject
@@ -25,6 +27,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
 EndProject
@@ -54,14 +58,20 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "src\Libraries\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{39327899-ED91-4F7F-988C-4FE4E17C014D}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 EndProject
@@ -90,6 +100,8 @@ EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBBinding", "src\AddIns\BackendBindings\VBBinding\Project\VBBinding.vbproj", "{6D209CBB-D8C1-478A-BC30-D3FC87B7858F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
 EndProject
@@ -104,6 +116,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 EndProject
@@ -116,6 +130,8 @@ 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", "{485A4CCF-55CF-49F4-BD6D-A22B788C67DA}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}"
 EndProject
@@ -130,12 +146,16 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets.Tests", "src\AddIns\Misc\PackageManagement\Cmdlets\Test\PackageManagement.Cmdlets.Tests.csproj", "{11115C83-3DB1-431F-8B98-59040359238D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddInManager2", "AddInManager2", "{1F88F080-AD7C-4B03-9895-20C26282429D}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2", "src\AddIns\Misc\AddInManager2\Project\AddInManager2.csproj", "{60480C2F-F228-4D86-B98F-AF75A7DCEC34}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager2.Tests", "src\AddIns\Misc\AddInManager2\AddInManager2.Tests\AddInManager2.Tests.csproj", "{0D0CB6E5-1EAD-471F-96B9-BFF84057BCF5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{FEDD3FD9-0480-43CC-913C-4E0876DDA852}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 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}"
 EndProject
@@ -148,6 +168,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{47B2D204-C993-4489-8B83-6DA7321CFAE0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 EndProject
@@ -162,6 +184,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyAddIn", "src\AddIns\DisplayBindings\ILSpyAddIn\ILSpyAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{0F5192F2-0744-4BA9-A074-6BE82D111B8D}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 EndProject
@@ -176,6 +200,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 EndProject
@@ -192,6 +218,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 EndProject
@@ -200,6 +228,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 EndProject
@@ -220,6 +250,8 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQuality", "src\AddIns\Analysis\CodeQuality\CodeQuality.csproj", "{0A029008-4973-4256-9150-9AF12845C547}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{7D16E1F9-0F9F-4A05-A162-A59C05E88B68}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{DAEA4E6C-02CD-47DA-806B-1FCE1E9675EC}"
 EndProject
@@ -651,19 +683,24 @@ Global
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{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}
 		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{984CC812-9470-4A13-AFF9-CC44068D666C} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{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}
 		{F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{AF5E0DC1-1FA0-4346-A436-0C817C68F7C1} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{B3352C08-3CB4-4DD9-996F-B9DCE4356BB9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{E2FD63DA-8478-4066-934C-DA82A852C83A} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
 		{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
 		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
 		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
 		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
 		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
@@ -677,7 +714,6 @@ Global
 		{85C09AD8-183B-403A-869A-7226646218A9} = {E0646C25-36F2-4524-969F-FA621353AB94}
 		{CAD4D128-5A67-444B-88AE-37E0AF79C57E} = {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}
 		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
@@ -685,28 +721,27 @@ Global
 		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{5186325C-DD7F-4246-9BE7-3F384EFBF5A6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{485A4CCF-55CF-49F4-BD6D-A22B788C67DA} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{1F88F080-AD7C-4B03-9895-20C26282429D} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{FEDD3FD9-0480-43CC-913C-4E0876DDA852} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{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}
 		{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}
-		{1F88F080-AD7C-4B03-9895-20C26282429D} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
 		{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}
-		{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}
 		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
@@ -714,25 +749,23 @@ Global
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{0F5192F2-0744-4BA9-A074-6BE82D111B8D} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{83BAB756-1010-4A2F-9B9D-7F9EBCB288F5} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
 		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
 		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
 		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
 		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
 		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D}
-		{83BAB756-1010-4A2F-9B9D-7F9EBCB288F5} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}
 		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}
 		{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5}
 		{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}
-		{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}
 		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}
-		{B3352C08-3CB4-4DD9-996F-B9DCE4356BB9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
 		{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}
@@ -748,6 +781,5 @@ Global
 		{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}
 	EndGlobalSection
 EndGlobal

data/resources/StringResources.fr.resx

@@ -229,6 +229,146 @@ Téléchargez un AddIn depuis l'Internet, cliquez ensuite sur 'Installer un AddI
   <data name="AddInManager.UnknownFileFormat" xml:space="preserve">
     <value>Format de fichier inconnu:</value>
   </data>
+  <data name="AddInManager2.AddInsView.InstallFromArchive" xml:space="preserve">
+    <value>Installer depuis un fichier...</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Repository" xml:space="preserve">
+    <value>Dépôt:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.Search" xml:space="preserve">
+    <value>Rechercher:</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPreinstalledAddIns" xml:space="preserve">
+    <value>Voir les Add-Ins pré-installés</value>
+  </data>
+  <data name="AddInManager2.AddInsView.ShowPrereleaseAddIns" xml:space="preserve">
+    <value>Voir les pré-releases</value>
+  </data>
+  <data name="AddInManager2.CannotRemoveAddInManager" xml:space="preserve">
+    <value>Impossible de désinstaller le gestionnaire d'Add-In, car il est nécessaire pour ré-installer des Add-Ins.</value>
+  </data>
+  <data name="AddInManager2.DefaultRepository" xml:space="preserve">
+    <value>Dépôt des Add-Ins SharpDevelop</value>
+  </data>
+  <data name="AddInManager2.Details.CreatedBy" xml:space="preserve">
+    <value>Auteur:</value>
+  </data>
+  <data name="AddInManager2.Details.Dependencies" xml:space="preserve">
+    <value>Dépendances:</value>
+  </data>
+  <data name="AddInManager2.Details.DownloadCount" xml:space="preserve">
+    <value>Téléchargements:</value>
+  </data>
+  <data name="AddInManager2.Details.FileName" xml:space="preserve">
+    <value>Nom de fichier:</value>
+  </data>
+  <data name="AddInManager2.Details.InstalledVersion" xml:space="preserve">
+    <value>Version installée:</value>
+  </data>
+  <data name="AddInManager2.Details.LastUpdated" xml:space="preserve">
+    <value>Dernière mise à jour:</value>
+  </data>
+  <data name="AddInManager2.Details.MoreInformation" xml:space="preserve">
+    <value>Plus d'informations</value>
+  </data>
+  <data name="AddInManager2.Details.NewVersion" xml:space="preserve">
+    <value>Nouvelle version:</value>
+  </data>
+  <data name="AddInManager2.Details.Rating" xml:space="preserve">
+    <value>Evaluation:</value>
+  </data>
+  <data name="AddInManager2.Details.ReportAbuse" xml:space="preserve">
+    <value>Signaler un abus</value>
+  </data>
+  <data name="AddInManager2.Details.Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+  <data name="AddInManager2.Details.ViewLicenseTerms" xml:space="preserve">
+    <value>Voir le contrat de license</value>
+  </data>
+  <data name="AddInManager2.DisableDependentWarning" xml:space="preserve">
+    <value>Les Add-Ins installés suivant sont dépendant de "{0}"
+
+{1}
+
+Ils ne fonctionneront plus si vous désactivez cet Add-In! Souhaitez-vous continuer?</value>
+  </data>
+  <data name="AddInManager2.InstallDependentMessage" xml:space="preserve">
+    <value>Package "{0}" nécessite au moins une dépendance:
+
+{1}
+
+L'application va essayer de les télécharger et de les installer. Souhaitez-vous continuer?</value>
+  </data>
+  <data name="AddInManager2.InvalidPackage" xml:space="preserve">
+    <value>Le package sélectionné ne contient pas un Add-In SharpDevelop.</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.AcceptButton" xml:space="preserve">
+    <value>J'&amp;Accepte</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.DeclineButton" xml:space="preserve">
+    <value>Je &amp;Décline</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Package" xml:space="preserve">
+    <value>En cliquant "J'accepte", vous êtes d'accord pour la license du package suivant.
+Si vous ne le souhaitez pas, veuillez cliquer "Je décline".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Explanation.Packages" xml:space="preserve">
+    <value>En cliquant "J'accepte", vous êtes d'accord pour la license des packages suivant.
+Si vous ne le souhaitez pas, veuillez cliquer "Je décline".</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Package" xml:space="preserve">
+    <value>Le package suivant nécessite que vous acceptiez sa license:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Introduction.Packages" xml:space="preserve">
+    <value>Le package suivant nécessite que vous acceptiez sa license:</value>
+  </data>
+  <data name="AddInManager2.LicenseAcceptance.Title" xml:space="preserve">
+    <value>Contrat de license</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Add" xml:space="preserve">
+    <value>Ajouter</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveDown" xml:space="preserve">
+    <value>Descendre</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.MoveUp" xml:space="preserve">
+    <value>Monter</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Name" xml:space="preserve">
+    <value>Nom:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Remove" xml:space="preserve">
+    <value>Supprimer</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Source" xml:space="preserve">
+    <value>Source:</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.AddIns" xml:space="preserve">
+    <value>Add-Ins</value>
+  </data>
+  <data name="AddInManager2.OptionPanel.Tree.Repositories" xml:space="preserve">
+    <value>Dépots</value>
+  </data>
+  <data name="AddInManager2.RemoveDependentWarning" xml:space="preserve">
+    <value>Les Add-Ins installés suivant sont dépendant de "{0}"
+
+{1}
+
+Ils ne fonctionneront plus si vous désinstallez cet Add-In! Souhaitez-vous continuer?</value>
+  </data>
+  <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
+    <value>SharpDevelop Add-Ins|*.sdaddin;*.addin|Tous les fichiers|*.*</value>
+  </data>
+  <data name="AddInManager2.Views.Available" xml:space="preserve">
+    <value>Disponible</value>
+  </data>
+  <data name="AddInManager2.Views.Installed" xml:space="preserve">
+    <value>Installées</value>
+  </data>
+  <data name="AddInManager2.Views.Updates" xml:space="preserve">
+    <value>Mises à jour</value>
+  </data>
   <data name="AddIns.AvalonEdit.InconsistentNewlines.Description" xml:space="preserve">
     <value>Ce fichier contient des retour-chariots inconsistents.</value>
   </data>
@@ -4467,6 +4607,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>Extension du framework .NET</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX n'est pas installé. Téléchargez le depuis http://wixtoolset.org/</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>Aucune différence n'a été trouvée.</value>
   </data>
@@ -5745,6 +5888,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Générateur de code ressource: aucune propriété de ressource ne peut être générée pour la ressource '{0}'.</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Commentaire</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Contenu</value>
   </data>
@@ -5757,6 +5903,12 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
     <value>Copier le nom de la ressource</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
+    <value>Editer le commentaire</value>
+  </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Saisissez le nouveau texte pour le commentaire de cette ressource:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Renommer</value>
   </data>
@@ -5772,6 +5924,9 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace
   <data name="SharpDevelop.FileFilter.AllFiles" xml:space="preserve">
     <value>Tous les fichiers (*.*)</value>
   </data>
+  <data name="SharpDevelop.FileFilter.AllKnownFiles" xml:space="preserve">
+    <value>Toutes les extensions connues</value>
+  </data>
   <data name="SharpDevelop.FileFilter.AssemblyFiles" xml:space="preserve">
     <value>Fichiers d'Assemblies (*.exe;*.dll)</value>
   </data>

data/resources/StringResources.nl.resx

@@ -4608,6 +4608,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="ICSharpCode.WixBinding.WixNetFxExtensionTitle" xml:space="preserve">
     <value>.NET Raamwerk uitbreiding</value>
   </data>
+  <data name="ICSharpCode.WixBinding.WixNotInstalled" xml:space="preserve">
+    <value>WiX is niet geïnstalleerd. Download a.u.b. WiX van http://wixtoolset.org/</value>
+  </data>
   <data name="ICSharpCode.WixBinding.WixPackageFilesDiffControl.NoDiffFound" xml:space="preserve">
     <value>Geen verschil gevonden.</value>
   </data>
@@ -5886,6 +5889,9 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="ResourceEditor.ResourceCodeGeneratorTool.CouldNotGenerateResourceProperty" xml:space="preserve">
     <value>Hulpbron code generator: er kon geen eigenschap gegenereerd worden voor hulpbron '{0}',</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.CommentColumn" xml:space="preserve">
+    <value>Commentaar</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContentColumn" xml:space="preserve">
     <value>Inhoud</value>
   </data>
@@ -5898,6 +5904,12 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie</v
   <data name="ResourceEditor.ResourceEdit.ContextMenu.CopyResourceName" xml:space="preserve">
     <value>Kopieer naam van hulpbron</value>
   </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditComment" xml:space="preserve">
+    <value>Commentaar redigeren</value>
+  </data>
+  <data name="ResourceEditor.ResourceEdit.ContextMenu.EditCommentText" xml:space="preserve">
+    <value>Voer de nieuwe tekst voor het hulpbron commentaar in:</value>
+  </data>
   <data name="ResourceEditor.ResourceEdit.ContextMenu.Rename" xml:space="preserve">
     <value>&amp;Hernoemen</value>
   </data>

data/resources/StringResources.resx

@@ -360,6 +360,12 @@ They will stop working after removing this AddIn! Are you sure you want to conti
   <data name="AddInManager2.SDAddInFileFilter" xml:space="preserve">
     <value>SharpDevelop AddIns|*.sdaddin;*.addin|All files|*.*</value>
   </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleText" xml:space="preserve">
+    <value>Click here to see the updates.</value>
+  </data>
+  <data name="AddInManager2.UpdateNotifier.BubbleTitle" xml:space="preserve">
+    <value>Updates for SharpDevelop are available</value>
+  </data>
   <data name="AddInManager2.Views.Available" xml:space="preserve">
     <value>Available</value>
   </data>

data/resources/image/BitmapResources/BitmapList.txt

@@ -417,41 +417,41 @@ backendicons\Ruby\Ruby.Template.EmptyFile.png
 backendicons\Ruby\Ruby.Template.Form.png
 backendicons\Ruby\Ruby.Template.LibraryProject.png
 backendicons\Ruby\Ruby.Template.WinFormsProject.png
-backendicons\VBNet.\file\Interface.png
+backendicons\VB\file\Interface.png
-backendicons\VBNet\SmallFile.png
+backendicons\VB\SmallFile.png
-backendicons\VBNet\SmallProject.png
+backendicons\VB\SmallProject.png
-backendicons\VBNet\file\EmptyFile.png
+backendicons\VB\file\EmptyFile.png
-backendicons\VBNet\file\Form.png
+backendicons\VB\file\Form.png
-backendicons\VBNet\file\FullFile.png
+backendicons\VB\file\FullFile.png
-backendicons\VBNet\file\NewClass.png
+backendicons\VB\file\NewClass.png
-backendicons\VBNet\file\MvcRazorFile.png
+backendicons\VB\file\MvcRazorFile.png
-backendicons\VBNet\file\MvcRazorFile.Small.png
+backendicons\VB\file\MvcRazorFile.Small.png
-backendicons\VBNet\file\WPFCustomControl.png
+backendicons\VB\file\WPFCustomControl.png
-backendicons\VBNet\file\WPFFlowDocument.png
+backendicons\VB\file\WPFFlowDocument.png
-backendicons\VBNet\file\WPFPage.png
+backendicons\VB\file\WPFPage.png
-backendicons\VBNet\file\WPFPageFunction.png
+backendicons\VB\file\WPFPageFunction.png
-backendicons\VBNet\file\WPFResourceDictionary.png
+backendicons\VB\file\WPFResourceDictionary.png
-backendicons\VBNet\file\WPFUserControl.png
+backendicons\VB\file\WPFUserControl.png
-backendicons\VBNet\file\WPFWindow.png
+backendicons\VB\file\WPFWindow.png
-backendicons\VBNet\file\WebFile.png
+backendicons\VB\file\WebFile.png
-backendicons\VBNet\project\ASPProject.png
+backendicons\VB\project\ASPProject.png
-backendicons\VBNet\project\ControlLibrary.png
+backendicons\VB\project\ControlLibrary.png
-backendicons\VBNet\project\DOSProject.png
+backendicons\VB\project\DOSProject.png
-backendicons\VBNet\project\EmptyProject.png
+backendicons\VB\project\EmptyProject.png
-backendicons\VBNet\project\Form.png
+backendicons\VB\project\Form.png
-backendicons\VBNet\project\FullProject.png
+backendicons\VB\project\FullProject.png
-backendicons\VBNet\project\Library.png
+backendicons\VB\project\Library.png
-backendicons\VBNet\project\MvcRazorProject.png
+backendicons\VB\project\MvcRazorProject.png
-backendicons\VBNet\project\ServiceProject.png
+backendicons\VB\project\ServiceProject.png
-backendicons\VBNet\project\UserControl.png
+backendicons\VB\project\UserControl.png
-backendicons\VBNet\project\WCFServiceProject.png
+backendicons\VB\project\WCFServiceProject.png
-backendicons\VBNet\project\WPFBrowserProject.png
+backendicons\VB\project\WPFBrowserProject.png
-backendicons\VBNet\project\WPFCustomControlLibrary.png
+backendicons\VB\project\WPFCustomControlLibrary.png
-backendicons\VBNet\project\WPFNavigationProject.png
+backendicons\VB\project\WPFNavigationProject.png
-backendicons\VBNet\project\WPFProject.png
+backendicons\VB\project\WPFProject.png
-backendicons\VBNet\project\WPFUserControlLibrary.png
+backendicons\VB\project\WPFUserControlLibrary.png
-backendicons\VBNet\project\WebProject.png
+backendicons\VB\project\WebProject.png
-backendicons\VBNet\project\WebService.png
+backendicons\VB\project\WebService.png
 backendicons\boo\Boo.File.EmptyFile.png
 backendicons\boo\Boo.File.Form.png
 backendicons\boo\Boo.FileIcon.png

data/resources/image/BitmapResources/BitmapResources.res

@@ -414,42 +414,42 @@ C#.Project.WPFUserControlLibrary					= backendicons\CSharp\project\WPFUserContro
 C#.Project.PRISMApplication                         = backendicons\CSharp\project\PRISMApplication.png
 C#.Project.PRISMModule                              = backendicons\CSharp\project\PRISMModule.png
 
-VBNet.ProjectIcon									= backendicons\VBNet\SmallProject.png
+VB.ProjectIcon									= backendicons\VB\SmallProject.png
-VBNet.FileIcon										= backendicons\VBNet\SmallFile.png
+VB.FileIcon										= backendicons\VB\SmallFile.png
-
+
-VBNet.File.EmptyFile								= backendicons\VBNet\file\EmptyFile.png
+VB.File.EmptyFile								= backendicons\VB\file\EmptyFile.png
-VBNet.File.Form										= backendicons\VBNet\file\Form.png
+VB.File.Form										= backendicons\VB\file\Form.png
-VBNet.File.FullFile									= backendicons\VBNet\file\FullFile.png
+VB.File.FullFile									= backendicons\VB\file\FullFile.png
-VBNet.File.NewClass									= backendicons\VBNet\file\NewClass.png
+VB.File.NewClass									= backendicons\VB\file\NewClass.png
-VBNet.File.Interface								= backendicons\VBNet.\file\Interface.png
+VB.File.Interface								= backendicons\VB.\file\Interface.png
-VBNet.File.MvcRazorFile								= backendicons\VBNet.\file\MvcRazorFile.png
+VB.File.MvcRazorFile								= backendicons\VB.\file\MvcRazorFile.png
-VBNet.File.MvcRazorFile.Small								= backendicons\VBNet.\file\MvcRazorFile.Small.png
+VB.File.MvcRazorFile.Small								= backendicons\VB.\file\MvcRazorFile.Small.png
-VBNet.File.WebFile									= backendicons\VBNet\file\WebFile.png
+VB.File.WebFile									= backendicons\VB\file\WebFile.png
-VBNet.File.WPFCustomControl							= backendicons\VBNet\file\WPFCustomControl.png
+VB.File.WPFCustomControl							= backendicons\VB\file\WPFCustomControl.png
-VBNet.File.WPFFlowDocument							= backendicons\VBNet\file\WPFFlowDocument.png
+VB.File.WPFFlowDocument							= backendicons\VB\file\WPFFlowDocument.png
-VBNet.File.WPFPage									= backendicons\VBNet\file\WPFPage.png
+VB.File.WPFPage									= backendicons\VB\file\WPFPage.png
-VBNet.File.WPFPageFunction							= backendicons\VBNet\file\WPFPageFunction.png
+VB.File.WPFPageFunction							= backendicons\VB\file\WPFPageFunction.png
-VBNet.File.WPFResourceDictionary					= backendicons\VBNet\file\WPFResourceDictionary.png
+VB.File.WPFResourceDictionary					= backendicons\VB\file\WPFResourceDictionary.png
-VBNet.File.WPFUserControl							= backendicons\VBNet\file\WPFUserControl.png
+VB.File.WPFUserControl							= backendicons\VB\file\WPFUserControl.png
-VBNet.File.WPFWindow								= backendicons\VBNet\file\WPFWindow.png
+VB.File.WPFWindow								= backendicons\VB\file\WPFWindow.png
-VBNet.Project.EmptyProject							= backendicons\VBNet\project\EmptyProject.png
+VB.Project.EmptyProject							= backendicons\VB\project\EmptyProject.png
-VBNet.Project.DOSProject							= backendicons\VBNet\project\DOSProject.png
+VB.Project.DOSProject							= backendicons\VB\project\DOSProject.png
-VBNet.Project.Form									= backendicons\VBNet\project\Form.png
+VB.Project.Form									= backendicons\VB\project\Form.png
-VBNet.Project.FullProject							= backendicons\VBNet\project\FullProject.png
+VB.Project.FullProject							= backendicons\VB\project\FullProject.png
-VBNet.Project.MvcRazorProject							= backendicons\VBNet\project\MvcRazorProject.png
+VB.Project.MvcRazorProject						= backendicons\VB\project\MvcRazorProject.png
-VBNet.Project.ServiceProject						= backendicons\VBNet\project\ServiceProject.png
+VB.Project.ServiceProject						= backendicons\VB\project\ServiceProject.png
-VBNet.Project.UserControl							= backendicons\VBNet\project\UserControl.png
+VB.Project.UserControl							= backendicons\VB\project\UserControl.png
-VBNet.Project.WebProject							= backendicons\VBNet\project\WebProject.png
+VB.Project.WebProject							= backendicons\VB\project\WebProject.png
-VBNet.Project.Library								= backendicons\VBNet\project\Library.png
+VB.Project.Library								= backendicons\VB\project\Library.png
-VBNet.Project.ControlLibrary						= backendicons\VBNet\project\ControlLibrary.png
+VB.Project.ControlLibrary						= backendicons\VB\project\ControlLibrary.png
-VBNet.Project.ASPProject							= backendicons\VBNet\project\ASPProject.png
+VB.Project.ASPProject							= backendicons\VB\project\ASPProject.png
-VBNet.Project.WCFServiceProject						= backendicons\VBNet\project\WCFServiceProject.png
+VB.Project.WCFServiceProject						= backendicons\VB\project\WCFServiceProject.png
-VBNet.Project.WebService							= backendicons\VBNet\project\WebService.png
+VB.Project.WebService							= backendicons\VB\project\WebService.png
-VBNet.Project.WPFBrowserProject						= backendicons\VBNet\project\WPFBrowserProject.png
+VB.Project.WPFBrowserProject						= backendicons\VB\project\WPFBrowserProject.png
-VBNet.Project.WPFCustomControlLibrary				= backendicons\VBNet\project\WPFCustomControlLibrary.png
+VB.Project.WPFCustomControlLibrary				= backendicons\VB\project\WPFCustomControlLibrary.png
-VBNet.Project.WPFNavigationProject					= backendicons\VBNet\project\WPFNavigationProject.png
+VB.Project.WPFNavigationProject					= backendicons\VB\project\WPFNavigationProject.png
-VBNet.Project.WPFProject							= backendicons\VBNet\project\WPFProject.png
+VB.Project.WPFProject							= backendicons\VB\project\WPFProject.png
-VBNet.Project.WPFUserControlLibrary					= backendicons\VBNet\project\WPFUserControlLibrary.png
+VB.Project.WPFUserControlLibrary					= backendicons\VB\project\WPFUserControlLibrary.png
 
 
 Java.ProjectIcon									= backendicons\Java\SmallProject.png
@@ -516,6 +516,7 @@ Boo.ProjectIcon										= backendicons\boo\Boo.ProjectIcon.png
 F#.ProjectIcon										= backendicons\FSharp\F#.ProjectIcon.png
 F#.FileIcon											= backendicons\FSharp\F#.FileIcon.png
 F#.Project.DOSProject                               = backendicons\FSharp\F#.Project.DOSProject.png
+F#.Project.Library									= backendicons\FSharp\F#.Project.Library.png
 F#.File.EmptyClass									= backendicons\FSharp\F#.File.EmptyClass.png
 
 

data/resources/image/BitmapResources/build.bat

@@ -1,3 +1,3 @@
 resasm BitmapResources.res
-move BitmapResources.resources ..\..\..\..\Src\Main\StartUp\Project\Resources\BitmapResources.resources
+move BitmapResources.resources ..\..\..\..\src\Main\SharpDevelop\Resources\BitmapResources.resources
 pause

data/templates/file/VB/VB.Empty.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.EmptyFile.Name}"
-		  icon        = "VBNet.File.EmptyFile"
+		  icon        = "VB.File.EmptyFile"
 		  category    = "VB"
 		  defaultname = "Empty${Number}.vb"
 		  language    = "VBNET"/>

data/templates/file/VB/VB.EmptyClass.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.EmptyClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Class${Number}.vb"
 		language    = "VBNET"

data/templates/file/VB/VB.Exception.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Exception.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Exception.vb"
 		  language    = "VBNet"/>

data/templates/file/VB/VB.Forms.Form.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsForm.Name}"
-		icon        = "VBNet.File.Form"
+		icon        = "VB.File.Form"
 		category    = "VB"
 		subcategory = "${res:Templates.File.Categories.WindowsApplications}"
 		defaultname = "Form${Number}.vb"

data/templates/file/VB/VB.Forms.UserControl.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.WindowsUserControl.Name}"
-		icon        = "VBNet.File.Form"
+		icon        = "VB.File.Form"
 		category    = "VB"
 		subcategory = "${res:Templates.File.Categories.WindowsApplications}"
 		defaultname = "UserControl${Number}.vb"

data/templates/file/VB/VB.Interface.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.Interface.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Interface${Number}.vb"
 		language    = "VBNET"

data/templates/file/VB/VB.Module.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Module.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Module${Number}.vb"
 		  language    = "VBNET"/>

data/templates/file/VB/VB.Mvc.Controller.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC Controller"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="Controller${Number}.vb"

data/templates/file/VB/VB.Mvc.Razor.LayoutPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Layout Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_LayoutPage${Number}.vbhtml"

data/templates/file/VB/VB.Mvc.Razor.PartialPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor Partial Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="_PartialPage${Number}.vbhtml"

data/templates/file/VB/VB.Mvc.Razor.ViewPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="Razor View Page"
-		icon="VBNet.File.MvcRazorFile"
+		icon="VB.File.MvcRazorFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.vbhtml"

data/templates/file/VB/VB.Mvc.ViewContentPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Content Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewContentPage${Number}.aspx"

data/templates/file/VB/VB.Mvc.ViewMasterPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Master Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewMasterPage${Number}.master"

data/templates/file/VB/VB.Mvc.ViewPage.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View Page"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewPage${Number}.aspx"

data/templates/file/VB/VB.Mvc.ViewUserControl.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name="MVC View User Control"
-		icon="VBNet.File.WebFile"
+		icon="VB.File.WebFile"
 		category="VB"
 		subcategory="ASP.NET MVC"
 		defaultname="ViewUserControl${Number}.ascx"

data/templates/file/VB/VB.MyExtensionClass.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.MyExtensionClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "Extension${Number}.vb"
 		language    = "VBNET"

data/templates/file/VB/VB.Patterns.Singleton.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		name        = "${res:Templates.File.SingletonClass.Name}"
-		icon        = "VBNet.File.NewClass"
+		icon        = "VB.File.NewClass"
 		category    = "VB"
 		defaultname = "SingletonClass${Number}.vb"
 		language    = "VB"

data/templates/file/VB/VB.Structure.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.Structure.Name}"
-		  icon        = "VBNet.File.NewClass"
+		  icon        = "VB.File.NewClass"
 		  category    = "VB"
 		  defaultname = "Structure${Number}.vb"
 		  language    = "VBNET"/>

data/templates/file/VB/VB.UnitTest.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.UnitTest.Name}"
-		  icon        = "VBNet.File.FullFile"
+		  icon        = "VB.File.FullFile"
 		  category    = "VB"
 		  defaultname = "Test${Number}.vb"
 		  language    = "VBNET"/>

data/templates/file/VB/VB.WPFFlowDocument.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXFlowDocument.Name}"
-		  icon        = "VBNet.File.WPFFlowDocument"
+		  icon        = "VB.File.WPFFlowDocument"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "FlowDocument${Number}.xaml"

data/templates/file/VB/VB.WPFPage.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPage.Name}"
-		  icon        = "VBNet.File.WPFPage"
+		  icon        = "VB.File.WPFPage"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Page${Number}.xaml"

data/templates/file/VB/VB.WPFPageFunction.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXPageFunction.Name}"
-		  icon        = "VBNet.File.WPFPageFunction"
+		  icon        = "VB.File.WPFPageFunction"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "PageFunction${Number}.xaml"

data/templates/file/VB/VB.WPFResourceDictionary.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXResourceDictionary.Name}"
-		  icon        = "VBNet.File.WPFResourceDictionary"
+		  icon        = "VB.File.WPFResourceDictionary"
 		  subcategory = "WPF"
 		  category    = "VB"
 		  defaultname = "Dictionary${Number}.xaml"

data/templates/file/VB/VB.WPFUserControl.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXUserControl.Name}"
-		  icon        = "VBNet.File.WPFUserControl"
+		  icon        = "VB.File.WPFUserControl"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "UserControl${Number}.xaml"

data/templates/file/VB/VB.WPFWindow.xft

@@ -3,7 +3,7 @@
 	
 	<Config
 		  name        = "${res:Templates.File.WinFXWindow.Name}"
-		  icon        = "VBNet.File.WPFWindow"
+		  icon        = "VB.File.WPFWindow"
 		  category    = "VB"
 		  subcategory = "WPF"
 		  defaultname = "Window${Number}.xaml"

data/templates/file/VB/VB.WcfRestService.xft

@@ -7,7 +7,7 @@
 	
 	<Config
 		name="WCF REST Service"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="WCF"
 		defaultname="Service${Number}.svc"

data/templates/file/VB/VB.WcfService.xft

@@ -7,7 +7,7 @@
 	
 	<Config
 		name="WCF Service"
-		icon="VBNet.File.NewClass"
+		icon="VB.File.NewClass"
 		category="VB"
 		subcategory="WCF"
 		defaultname="Service${Number}.svc"

data/templates/file/VB/VB.Web.WebControl.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebControl.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebControl${Number}"

data/templates/file/VB/VB.Web.WebForm.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebForm.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebForm${Number}.aspx"

data/templates/file/VB/VB.Web.WebHandler.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebHandler.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebHandler${Number}.ashx"

data/templates/file/VB/VB.Web.WebService.xft

@@ -3,7 +3,7 @@
 
 	<Config
 		name        = "${res:Templates.File.WebService.Name}"
-		icon        = "VBNet.File.WebFile"
+		icon        = "VB.File.WebFile"
 		category    = "VB"
 		subcategory = "ASP.NET"
 		defaultname = "WebService${Number}.asmx"

data/templates/project/VB/ConsoleProject.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.ConsoleProject.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.DOSProject</Icon>
+		<Icon>VB.Project.DOSProject</Icon>
 		<Description>${res:Templates.Project.ConsoleProject.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/ControlLibrary.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.UserControlLibrary.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.UserControlLibrary.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/EmptyMvc3WebProject.xpt

@@ -8,7 +8,7 @@
 		<Name>Empty MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC 3 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/EmptyMvc4WebProject.xpt

@@ -8,7 +8,7 @@
 		<Name>Empty MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>Empty ASP.NET MVC 4 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/EmptyProject.xpt

@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.EmptyProject.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.EmptyProject</Icon>
+		<Icon>VB.Project.EmptyProject</Icon>
 		<Description>${res:Templates.Project.EmptyProject.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/FormsProject.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WindowsApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>${res:Templates.Project.WindowsApplication.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Library.xpt

@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.ClassLibrary.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.Library</Icon>
+		<Icon>VB.Project.Library</Icon>
 		<Description>${res:Templates.Project.ClassLibrary.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Mvc3RazorProject.xpt

@@ -8,7 +8,7 @@
 		<Name>Razor MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.MvcRazorProject</Icon>
+		<Icon>VB.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC 3 Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Mvc3WebProject.xpt

@@ -8,7 +8,7 @@
 		<Name>MVC 3 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 3</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>ASP.NET MVC 3 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Mvc4RazorProject.xpt

@@ -8,7 +8,7 @@
 		<Name>Razor MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.MvcRazorProject</Icon>
+		<Icon>VB.Project.MvcRazorProject</Icon>
 		<Description>ASP.NET MVC 4 Application using Razor</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Mvc4WebProject.xpt

@@ -8,7 +8,7 @@
 		<Name>MVC 4 Application</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET MVC 4</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>ASP.NET MVC 4 Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/NotifyIcon.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SysTrayIcon.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>${res:Templates.Project.SysTrayIcon.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/Service.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.WindowsService.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>${res:Templates.File.Categories.WindowsApplications}</Subcategory>
-		<Icon>VBNet.Project.ServiceProject</Icon>
+		<Icon>VB.Project.ServiceProject</Icon>
 		<Description>${res:Templates.Project.WindowsService.Description}</Description>
 		<SupportedTargetFrameworks>v2.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/SharedAddin.xpt

@@ -11,7 +11,7 @@
 
 		<Name>${res:Templates.Project.SharedAddin.Name}</Name>
 		<Category>VB</Category>
-		<Icon>VBNet.Project.Library</Icon>
+		<Icon>VB.Project.Library</Icon>
 		<Description>${res:Templates.Project.SharedAddin.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/SharpDevelopAddin.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SharpDevelopAddin.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.SharpDevelopAddin.Description}</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/SharpDevelopCustomTool.xpt

@@ -6,7 +6,7 @@
 		<Name>Custom Tool</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>A custom tool that implements a code generator transforming a source file into an output file whenever the source is changed inside SharpDevelop</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/SharpDevelopMacro.xpt

@@ -8,7 +8,7 @@
 		<Name>${res:Templates.Project.SharpDevelopMacro.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>SharpDevelop</Subcategory>
-		<Icon>VBNet.Project.ControlLibrary</Icon>
+		<Icon>VB.Project.ControlLibrary</Icon>
 		<Description>${res:Templates.Project.SharpDevelopMacro.Description}</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/SilverlightApplication.xpt

@@ -5,7 +5,7 @@
 		<Name>Silverlight Application</Name>
 		<Category>VB</Category>
 		<Subcategory>Silverlight</Subcategory>
-		<Icon>VBNet.Project.Form</Icon>
+		<Icon>VB.Project.Form</Icon>
 		<Description>Default Silverlight Application</Description>
 		<SupportedTargetFrameworks>v4.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/VB.WcfRestServiceProject.xpt

@@ -10,7 +10,7 @@
 		<Name>WCF REST Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.WCFServiceProject</Icon>
+		<Icon>VB.Project.WCFServiceProject</Icon>
 		<Description>WCF REST Service</Description>
 		<SupportedTargetFrameworks>v3.5</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/VB.WcfServiceProject.xpt

@@ -10,7 +10,7 @@
 		<Name>WCF Service</Name>
 		<Category>VB</Category>
 		<Subcategory>WCF</Subcategory>
-		<Icon>VBNet.Project.WCFServiceProject</Icon>
+		<Icon>VB.Project.WCFServiceProject</Icon>
 		<Description>WCF Service</Description>
 		<SupportedTargetFrameworks>v3.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/WPFApplication.xpt

@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.WPFProject</Icon>
+		<Icon>VB.Project.WPFProject</Icon>
 		<Description>${res:Templates.Project.WinFXApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/WPFNavigationApplication.xpt

@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WinFXNavigationApplication.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>WPF</Subcategory>
-		<Icon>VBNet.Project.WPFNavigationProject</Icon>
+		<Icon>VB.Project.WPFNavigationProject</Icon>
 		<Description>${res:Templates.Project.WinFXNavigationApplication.Description}</Description>
 		<SupportedTargetFrameworks>v3.0;v3.5Client</SupportedTargetFrameworks>
 	</TemplateConfiguration>

data/templates/project/VB/WebService.xpt

@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebService.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.WebService</Icon>
+		<Icon>VB.Project.WebService</Icon>
 		<Description>${res:Templates.Project.WebService.Description}</Description>
 	</TemplateConfiguration>
 

data/templates/project/VB/WebpageProject.xpt

@@ -6,7 +6,7 @@
 		<Name>${res:Templates.Project.WebPage.Name}</Name>
 		<Category>VB</Category>
 		<Subcategory>ASP.NET</Subcategory>
-		<Icon>VBNet.Project.WebProject</Icon>
+		<Icon>VB.Project.WebProject</Icon>
 		<Description>${res:Templates.Project.WebPage.Description}</Description>
 		<SupportedTargetFrameworks>v2.0</SupportedTargetFrameworks>
 	</TemplateConfiguration>

samples/Mono/Mono.AddIn.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5571
+# SharpDevelop 4.3
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.AddIn", "Mono.AddIn\Mono.AddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Build.Tasks", "Mono.Build.Tasks\Mono.Build.Tasks.csproj", "{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}"

samples/Mono/Mono.AddIn/Configuration/AssemblyInfo.cs

@@ -29,4 +29,4 @@ using System.Reflection;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.0.*")]