Merge branch 'master' of github.com:icsharpcode/SharpDevelop

README.md

@@ -26,12 +26,13 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod
 
 ##Extended Requirements (building #Develop)
 
+ - [Microsoft Build Tools 2013](www.microsoft.com/en-us/download/details.aspx?id=40760)
  - [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
- - [.NET 4.5 SDK](http://www.microsoft.com/en-au/download/details.aspx?id=30653) (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx))
- - Windows SDK 7.1 (?? not sure if this still is necessary...)
- - Windows SDK 7.0 (optional; C++ compiler needed for profiler)
+ - [.NET 4.5 SDK] (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx))
+ - [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B) (?? not sure if this still is necessary...)
+ - [Windows SDK 7.0](http://www.microsoft.com/en-us/download/details.aspx?id=3138) (optional; C++ compiler needed for profiler)
  - [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
- - [SD Git Repository](https://github.com/icsharpcode/SharpDevelop.git)
+ - If you have cloned the SD git repository: git must be available on your PATH
  
 ##Libraries and Integrated tools:
 
@@ -42,7 +43,7 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod
 * [ITextSharp](http://sourceforge.net/projects/itextsharp/)
 * [log4Net](https://github.com/apache/log4net)
 * Mono T4
-* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**) - 
+* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**)
 * [Sharp Svn](https://sharpsvn.open.collab.net/)
 * [SQLite](https://sqlite.org/)
 * [WPFToolkit](https://wpf.codeplex.com/)
@@ -58,8 +59,8 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod
 
 ##Reusable Libraries (Part of #Develop):
 
-* [AvalonEdit](https://github.com/icsharpcode/SharpDevelop/wiki/AvalonEdit)
-* Debugger.Core
+* [AvalonEdit](http://avalonedit.net/)
+* [Debugger.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/Debugger/Debugger.Core)
 * [ICSharpCode.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Main/Core)
 * [ICSharpCode.Decompiler](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/ICSharpCode.Decompiler)
 * [NRefactory](https://github.com/icsharpcode/NRefactory)

SharpDevelop.Tests.sln

@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
@@ -280,6 +282,10 @@ Global
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
@@ -647,6 +653,7 @@ Global
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{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}

SharpDevelop.sln

@@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
@@ -229,6 +231,10 @@ Global
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
@@ -373,6 +379,10 @@ Global
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0502FCF7-72F4-4587-936B-D0238CD0E072}.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
@@ -497,10 +507,6 @@ Global
 		{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
 		{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -514,6 +520,7 @@ Global
 		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {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}

clean.bat

@@ -1,4 +1,6 @@
-%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
+@set PROGFILES=%PROGRAMFILES%
+@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
 @IF %ERRORLEVEL% NEQ 0 PAUSE
-%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
+"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
 @IF %ERRORLEVEL% NEQ 0 PAUSE

debugbuild.bat

@@ -1,4 +1,6 @@
-%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
+@set PROGFILES=%PROGRAMFILES%
+@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err

releasebuild.bat

@@ -1,4 +1,6 @@
-%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU"
+@set PROGFILES=%PROGRAMFILES%
+@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err

src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "CodeCoverageAddIn"
+<AddIn name        = "CodeCoverage AddIn"
        author      = "Matt Ward"
        copyright   = "prj:///doc/copyright.txt"
        description = "Code Coverage AddIn for SharpDevelop using OpenCover"

src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "Machine.Specifications Addin"
+<AddIn name        = "Machine.Specifications AddIn"
        author      = "Tomasz Tretkowski"
        url         = ""
        description = "Runner for Machine.Specifications unit tests for SharpDevelop"

src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "Profiler.AddIn"
+<AddIn name        = "Profiler AddIn"
        author      = "Siegfried Pammer"
        url         = ""
        description = "Integrates a Profiler with GUI into SharpDevelop"

src/AddIns/Analysis/UnitTesting/UnitTesting.addin

@@ -1,4 +1,4 @@
-<AddIn name="Unit Testing Addin"
+<AddIn name="Unit Testing AddIn"
        author="Matt Ward"
        copyright="prj:///doc/copyright.txt"
        description="Runs NUnit tests inside #Develop"

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs

@@ -118,7 +118,7 @@ namespace CSharpBinding.FormattingStrategy
 		{
 			// Load solution settings
 			SolutionOptions = new CSharpFormattingOptionsPersistence(
-				e.Solution.GlobalPreferences,
+				e.Solution.SDSettings,
 				new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer)
 				{
 					DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.SolutionOptionReference}")

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingStrategy.cs

@@ -358,8 +358,17 @@ namespace CSharpBinding.FormattingStrategy
 						sb.Append(indentation);
 						sb.Append("/// </summary>");
 						
+						IUnresolvedMethod method = null;
 						if (member is IUnresolvedMethod) {
-							IUnresolvedMethod method = (IUnresolvedMethod)member;
+							method = (IUnresolvedMethod)member;
+						} else if (member is IUnresolvedTypeDefinition) {
+							IUnresolvedTypeDefinition type = (IUnresolvedTypeDefinition) member;
+							if (type.Kind == TypeKind.Delegate) {
+								method = type.Methods.FirstOrDefault(m => m.Name == "Invoke");
+							}
+						}
+						
+						if (method != null) {
 							for (int i = 0; i < method.Parameters.Count; ++i) {
 								sb.Append(terminator);
 								sb.Append(indentation);
@@ -376,8 +385,8 @@ namespace CSharpBinding.FormattingStrategy
 								}
 							}
 						}
-						textArea.Document.Insert(cursorOffset, sb.ToString());
 						
+						textArea.Document.Insert(cursorOffset, sb.ToString());
 						textArea.Caret.Offset = cursorOffset + indentation.Length + "/// ".Length + " <summary>".Length + terminator.Length;
 					}
 				}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerLoader.cs

@@ -127,6 +127,7 @@ namespace CSharpBinding.FormsDesigner
 			
 			foreach (var field in designerClass.Fields) {
 				var codeField = new CodeMemberField(cv.Convert(field.Type), field.Name);
+				codeField.Attributes = GetAccessibility(field);
 				codeClass.Members.Add(codeField);
 			}
 			var codeNamespace = new CodeNamespace(designerClass.Namespace);
@@ -170,6 +171,27 @@ namespace CSharpBinding.FormsDesigner
 				MessageService.ShowException(ex);
 			}
 		}
+
+		MemberAttributes GetAccessibility(IField field)
+		{
+			switch (field.Accessibility) {
+				case Accessibility.None:
+				case Accessibility.Private:
+					return MemberAttributes.Private;
+				case Accessibility.Public:
+					return MemberAttributes.Public;
+				case Accessibility.Protected:
+					return MemberAttributes.Family;
+				case Accessibility.Internal:
+					return MemberAttributes.Assembly;
+				case Accessibility.ProtectedOrInternal:
+					return MemberAttributes.FamilyOrAssembly;
+				case Accessibility.ProtectedAndInternal:
+					return MemberAttributes.FamilyAndAssembly;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+		}
 		
 		protected override CodeDomLocalizationModel GetCurrentLocalizationModelFromDesignedFile()
 		{

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "WiX binding"
+<AddIn name        = "WiX Binding"
        author      = "Matt Ward"
        copyright   = "prj:///doc/copyright.txt"
        url         = "http://icsharpcode.net"

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "XAML binding"
+<AddIn name        = "XAML Binding"
        author      = "Siegfried Pammer"
        copyright   = "prj:///doc/copyright.txt"
        url         = "http://icsharpcode.net"

src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptions.cs

@@ -24,12 +24,13 @@ using System.Windows.Forms;
 using System.Xml.Serialization;
 using Debugger;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Debugging;
 
 namespace ICSharpCode.SharpDevelop.Services
 {
 	public enum ShowIntegersAs { Decimal, Hexadecimal, Both };
 	
-	public class DebuggingOptions: Options
+	public class DebuggingOptions: Options, IDebuggerOptions
 	{
 		public static DebuggingOptions Instance {
 			get { return new DebuggingOptions(); }

src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.xaml

@@ -36,6 +36,8 @@
 		</GroupBox>
 		<GroupBox Margin="5" Header="{sd:Localize Dialog.Options.IDEOptions.Debugging.WithoutSource}">
 			<widgets:StackPanelWithSpacing SpaceBetweenItems="5">
+				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.Stepping.EnableJustMyCode}"
+				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.EnableJustMyCode}" />
 				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.AskForArguments}"
 				          IsChecked="{sd:OptionBinding debugger:DebuggingOptions.AskForArguments}" />
 				<CheckBox Content="{sd:Localize Dialog.Options.IDEOptions.Debugging.BreakAtBeginning}"

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -137,6 +137,10 @@ namespace ICSharpCode.SharpDevelop.Services
 			}
 		}
 		
+		public override IDebuggerOptions Options {
+			get { return DebuggingOptions.Instance; }
+		}
+		
 		public override bool CanDebug(IProject project)
 		{
 			return true;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "AvalonEdit.AddIn"
+<AddIn name        = "AvalonEdit AddIn"
        author      = "Daniel Grunwald"
        description = "The main text editor for SharpDevelop"
        addInManagerHidden="preinstalled">

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "ILSpyAddIn"
+<AddIn name        = "ILSpy AddIn"
        author      = "Daniel Grunwald"
        copyright   = "prj:///doc/copyright.txt"
        description = "Can open ILSpy on a selected class or member."

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs

@@ -16,7 +16,7 @@ namespace ICSharpCode.ILSpyAddIn
 	{
 		public bool Handles(IMethod method)
 		{
-			return true;
+			return !SD.Debugger.Options.EnableJustMyCode;
 		}
 		
 		public bool IsCompilerGenerated(IMethod method)

src/AddIns/Misc/RegExpTk/Project/RegExpTk.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "Regular expressions toolkit"
+<AddIn name        = "Regular Expressions Toolkit"
        author      = "Markus Palme"
        copyright   = "prj:///doc/copyright.txt"
        description = "Testing toolkit for regular expressions"

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj

@@ -91,6 +91,9 @@
     <Folder Include="src\Views" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="src\Commands\ViewCommands.cs" />
     <Compile Include="src\DesignableItems\AbstractGraphicItem.cs" />

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj

@@ -79,6 +79,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Src\Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Src\Arrange\ArrangeStrategy.cs" />
     <Compile Include="Src\Arrange\MeasurementStrategy.cs" />
     <Compile Include="Src\BaseClasses\AbstractColumn.cs" />

src/AddIns/VersionControl/GitAddIn/GitAddIn.addin

@@ -1,4 +1,4 @@
-<AddIn name        = "GitAddIn"
+<AddIn name        = "Git AddIn"
        author      = "Daniel Grunwald"
        description = "Git Binding"
        addInManagerHidden = "preinstalled">

src/Automated.proj

@@ -21,8 +21,8 @@
 			properties available for the projects inside the solution 
 			(but this works using the command line) -->
 		<!-- B) The Wix task assembly is locked if we do not use a separate MSBuild process -->
-		<!-- C) We need to use MSBuild 4.0, but the build server uses MSBuild 2.0 -->
-		<MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.30319\msbuild.exe&quot;</MSBuildExecutable>
+		<!-- C) We need to use MSBuild 12.0, but the build server uses MSBuild 4.0 -->
+		<MSBuildExecutable>&quot;$(MSBuildExtensionsPath)\12.0\Bin\msbuild.exe&quot;</MSBuildExecutable>
 		<BuildProperties>/m /p:Configuration=Release</BuildProperties>
 		<BuildProperties>$(BuildProperties) &quot;/p:SharpDevelopBinPath=$(SharpDevelopBin)&quot;</BuildProperties>
 		<BuildProperties>$(BuildProperties) &quot;/p:FSharpBuildTasksPath=$(SharpDevelopSrc)\AddIns\BackendBindings\FSharp\RequiredLibraries&quot;</BuildProperties>

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/XmlDocIssue.cs

@@ -38,25 +38,25 @@ using ICSharpCode.NRefactory.CSharp.TypeSystem;
 namespace ICSharpCode.NRefactory.CSharp.Refactoring
 {
 	[IssueDescription("Validate Xml documentation",
-	                   Description = "Validate Xml docs",
-	                   Category = IssueCategories.CompilerWarnings,
-	                   Severity = Severity.Warning)]
+		Description = "Validate Xml docs",
+		Category = IssueCategories.CompilerWarnings,
+		Severity = Severity.Warning)]
 	public class XmlDocIssue : GatherVisitorCodeIssueProvider
 	{
 		protected override IGatherVisitor CreateVisitor(BaseRefactoringContext context)
 		{
 			return new GatherVisitor(context);
 		}
-
+		
 		class GatherVisitor : GatherVisitorBase<XmlDocIssue>
 		{
 			readonly List<Comment> storedXmlComment = new List<Comment>();
-
+			
 			public GatherVisitor(BaseRefactoringContext ctx)
 				: base (ctx)
 			{
 			}
-
+			
 			void InvalideXmlComments()
 			{
 				if (storedXmlComment.Count == 0)
@@ -77,37 +77,37 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				));
 				storedXmlComment.Clear();
 			}
-
+			
 			public override void VisitComment(Comment comment)
 			{
 				if (comment.CommentType == CommentType.Documentation)
 					storedXmlComment.Add(comment);
 			}
-
+			
 			public override void VisitNamespaceDeclaration(NamespaceDeclaration namespaceDeclaration)
 			{
 				InvalideXmlComments();
 				base.VisitNamespaceDeclaration(namespaceDeclaration);
 			}
-
+			
 			public override void VisitUsingDeclaration(UsingDeclaration usingDeclaration)
 			{
 				InvalideXmlComments();
 				base.VisitUsingDeclaration(usingDeclaration);
 			}
-
+			
 			public override void VisitUsingAliasDeclaration(UsingAliasDeclaration usingDeclaration)
 			{
 				InvalideXmlComments();
 				base.VisitUsingAliasDeclaration(usingDeclaration);
 			}
-
+			
 			public override void VisitExternAliasDeclaration(ExternAliasDeclaration externAliasDeclaration)
 			{
 				InvalideXmlComments();
 				base.VisitExternAliasDeclaration(externAliasDeclaration);
 			}
-
+			
 			TextLocation TranslateOffset(int offset)
 			{
 				int line = storedXmlComment.First().StartLocation.Line;
@@ -120,7 +120,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				}
 				return TextLocation.Empty;
 			}
-
+			
 			void AddXmlIssue(int offset, int length, string str)
 			{
 				var textLocation = TranslateOffset(offset);
@@ -150,14 +150,14 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				foreach (var cmt in storedXmlComment)
 					xml.Append(cmt.Content + "\n");
 				xml.Append("</root>\n");
-
+				
 				var doc = new AXmlParser().Parse(new StringTextSource(xml.ToString()));
-
+				
 				var stack = new Stack<AXmlObject>();
 				stack.Push(doc);
 				foreach (var err in doc.SyntaxErrors)
 					AddXmlIssue(err.StartOffset - firstline.Length, err.EndOffset - err.StartOffset, err.Description);
-
+				
 				while (stack.Count > 0) {
 					var cur = stack.Pop();
 					var el = cur as AXmlElement;
@@ -183,6 +183,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 								var m = member as IParameterizedMember;
 								if (m != null && m.Parameters.Any(p => p.Name == name.Value))
 									break;
+								var dtype = member as ITypeDefinition;
+								if ((dtype != null) && (dtype.Kind == TypeKind.Delegate)) {
+									var invokeMethod = dtype.Methods.FirstOrDefault(method => method.Name == "Invoke");
+									if ((invokeMethod != null) && invokeMethod.Parameters.Any(p => p.Name == name.Value))
+										break;
+								}
 								if (name.Value == "value" && member != null && (member.SymbolKind == SymbolKind.Property || member.SymbolKind == SymbolKind.Indexer || member.SymbolKind == SymbolKind.Event) && el.Name == "paramref")
 									break;
 								AddXmlIssue(name.ValueSegment.Offset - firstline.Length + 1, name.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Parameter '{0}' not found"), name.Value));
@@ -204,7 +210,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 										trctx = trctx.WithUsingScope(state.CurrentUsingScope);
 									var cdc = new CSharpDocumentationComment (emptySource, trctx);
 									var entity = cdc.ResolveCref(cref.Value);
-
+									
 									if (entity == null) {
 										AddXmlIssue(cref.ValueSegment.Offset - firstline.Length + 1, cref.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Cannot find reference '{0}'"), cref.Value));
 									}
@@ -212,15 +218,15 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 									AddXmlIssue(cref.ValueSegment.Offset - firstline.Length + 1, cref.ValueSegment.Length - 2, string.Format(ctx.TranslateString("Reference parsing error '{0}'."), e.Message));
 								}
 								break;
-
-						}
+								
+					}
 					}
 					foreach (var child in cur.Children)
 						stack.Push(child);
 				}
 				storedXmlComment.Clear();
 			}
-
+			
 			protected virtual void VisitXmlChildren(AstNode node, Action checkDocumentationAction)
 			{
 				AstNode next;
@@ -231,7 +237,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					child = next;
 				}
 				checkDocumentationAction();
-
+				
 				for (; child != null; child = next) {
 					// Store next to allow the loop to continue
 					// if the visitor removes/replaces child.
@@ -240,47 +246,47 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				}
 				InvalideXmlComments();
 			}
-
+			
 			protected virtual void VisitXmlChildren(AstNode node)
 			{
 				VisitXmlChildren(node, () => CheckXmlDoc(node));
 			}
-
+			
 			public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
 			{
 				VisitXmlChildren(typeDeclaration);
 			}
-
+			
 			public override void VisitMethodDeclaration(MethodDeclaration methodDeclaration)
 			{
 				VisitXmlChildren(methodDeclaration);
 			}
-
+			
 			public override void VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration)
 			{
 				VisitXmlChildren(delegateDeclaration);
 			}
-
+			
 			public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
 			{
 				VisitXmlChildren(constructorDeclaration);
 			}
-
+			
 			public override void VisitCustomEventDeclaration(CustomEventDeclaration eventDeclaration)
 			{
 				VisitXmlChildren(eventDeclaration);
 			}
-
+			
 			public override void VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration)
 			{
 				VisitXmlChildren(destructorDeclaration);
 			}
-
+			
 			public override void VisitEnumMemberDeclaration(EnumMemberDeclaration enumMemberDeclaration)
 			{
 				VisitXmlChildren(enumMemberDeclaration);
 			}
-
+			
 			public override void VisitEventDeclaration(EventDeclaration eventDeclaration)
 			{
 				VisitXmlChildren(eventDeclaration, () => {
@@ -289,7 +295,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					}
 				});
 			}
-
+			
 			public override void VisitFieldDeclaration(FieldDeclaration fieldDeclaration)
 			{
 				VisitXmlChildren(fieldDeclaration, () => {
@@ -298,17 +304,17 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					}
 				});
 			}
-
+			
 			public override void VisitIndexerDeclaration(IndexerDeclaration indexerDeclaration)
 			{
 				VisitXmlChildren(indexerDeclaration);
 			}
-
+			
 			public override void VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration)
 			{
 				VisitXmlChildren(propertyDeclaration);
 			}
-
+			
 			public override void VisitOperatorDeclaration(OperatorDeclaration operatorDeclaration)
 			{
 				VisitXmlChildren(operatorDeclaration);

src/Main/Base/Project/Debugging/BaseDebuggerService.cs

@@ -33,6 +33,10 @@ namespace ICSharpCode.SharpDevelop.Debugging
 			};
 			SD.ProjectService.SolutionClosing += OnSolutionClosing;
 		}
+		
+		public virtual IDebuggerOptions Options {
+			get { return DummyDebuggerOptions.Instance; }
+		}
 
 		public virtual void Dispose()
 		{

src/Main/Base/Project/Debugging/IDebuggerService.cs

@@ -16,7 +16,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui;
@@ -27,13 +29,20 @@ namespace ICSharpCode.SharpDevelop.Debugging
 	[SDService("SD.Debugger", FallbackImplementation = typeof(DebuggerServiceFallback))]
 	public interface IDebuggerService : IDisposable, ITextAreaToolTipProvider
 	{
+		/// <summary>
+		/// Allows (read-only) access to the currently used debugger options from other AddIns.
+		/// </summary>
+		IDebuggerOptions Options {
+			get;
+		}
+		
 		/// <summary>
 		/// Returns true if debugger is loaded.
 		/// </summary>
 		bool IsDebuggerLoaded {
 			get;
 		}
-
+		
 		bool IsDebuggerStarted {
 			get;
 		}
@@ -139,6 +148,23 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		event EventHandler DebugStopped;
 	}
 	
+	/// <summary>
+	/// Abstraction of some debugger options.
+	/// Allows (read-only) access to the currently used debugger options from other AddIns.
+	/// </summary>
+	public interface IDebuggerOptions
+	{
+		bool EnableJustMyCode { get; }
+		bool EnableEditAndContinue { get; }
+		bool SuppressJITOptimization { get; }
+		bool SuppressNGENOptimization { get; }
+		bool StepOverDebuggerAttributes { get; }
+		bool StepOverAllProperties { get; }
+		bool StepOverFieldAccessProperties { get; }
+		IEnumerable<string> SymbolsSearchPaths { get; }
+		bool PauseOnHandledExceptions { get; }
+	}
+	
 	public enum DebuggerFeatures
 	{
 		Start,
@@ -165,34 +191,67 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		}
 	}
 	
-	
+	sealed class DummyDebuggerOptions : IDebuggerOptions
+	{
+		DummyDebuggerOptions() {}
+		
+		public bool EnableJustMyCode {
+			get { return true; }
+		}
+		public bool EnableEditAndContinue {
+			get { return false; }
+		}
+		public bool SuppressJITOptimization {
+			get { return false; }
+		}
+		public bool SuppressNGENOptimization {
+			get { return false; }
+		}
+		public bool StepOverDebuggerAttributes {
+			get { return false; }
+		}
+		public bool StepOverAllProperties {
+			get { return false; }
+		}
+		public bool StepOverFieldAccessProperties {
+			get { return false; }
+		}
+		public IEnumerable<string> SymbolsSearchPaths {
+			get { return Enumerable.Empty<string>(); }
+		}
+		public bool PauseOnHandledExceptions {
+			get { return false; }
+		}
+		
+		public static readonly DummyDebuggerOptions Instance = new DummyDebuggerOptions();
+	}
 	
 	class DebuggerServiceFallback : BaseDebuggerService
 	{
 		Process attachedProcess = null;
-
+		
 		public override bool IsDebugging {
 			get {
 				return attachedProcess != null;
 			}
 		}
-
+		
 		public override bool IsProcessRunning {
 			get {
 				return IsDebugging;
 			}
 		}
-
+		
 		/// <inheritdoc/>
 		public override bool BreakAtBeginning {
 			get; set;
 		}
-
+		
 		public override bool CanDebug(IProject project)
 		{
 			return true;
 		}
-
+		
 		public override bool Supports(DebuggerFeatures feature)
 		{
 			switch (feature) {
@@ -207,7 +266,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 					return false;
 				default:
 					throw new ArgumentOutOfRangeException();
-			}
+		}
 		}
 		
 		public override void Start(ProcessStartInfo processStartInfo)
@@ -215,7 +274,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 			if (attachedProcess != null) {
 				return;
 			}
-
+			
 			OnDebugStarting(EventArgs.Empty);
 			try {
 				attachedProcess = new Process();
@@ -229,19 +288,19 @@ namespace ICSharpCode.SharpDevelop.Debugging
 				throw new ApplicationException("Can't execute \"" + processStartInfo.FileName + "\"\n");
 			}
 		}
-
+		
 		public override void ShowAttachDialog()
 		{
 		}
-
+		
 		public override void Attach(Process process)
 		{
 		}
-
+		
 		public override void Detach()
 		{
 		}
-
+		
 		void AttachedProcessExited(object sender, EventArgs e)
 		{
 			attachedProcess.Exited -= AttachedProcessExited;
@@ -249,12 +308,12 @@ namespace ICSharpCode.SharpDevelop.Debugging
 			attachedProcess = null;
 			SD.MainThread.InvokeAsyncAndForget(() => new Action<EventArgs>(OnDebugStopped)(EventArgs.Empty));
 		}
-
+		
 		public override void StartWithoutDebugging(ProcessStartInfo processStartInfo)
 		{
 			Process.Start(processStartInfo);
 		}
-
+		
 		public override void Stop()
 		{
 			if (attachedProcess != null) {
@@ -265,50 +324,50 @@ namespace ICSharpCode.SharpDevelop.Debugging
 				attachedProcess = null;
 			}
 		}
-
+		
 		// ExecutionControl:
-
+		
 		public override void Break()
 		{
 			throw new NotSupportedException();
 		}
-
+		
 		public override void Continue()
 		{
 			throw new NotSupportedException();
 		}
 		// Stepping:
-
+		
 		public override void StepInto()
 		{
 			throw new NotSupportedException();
 		}
-
+		
 		public override void StepOver()
 		{
 			throw new NotSupportedException();
 		}
-
+		
 		public override void StepOut()
 		{
 			throw new NotSupportedException();
 		}
-
+		
 		public override void HandleToolTipRequest(ToolTipRequestEventArgs e)
 		{
 		}
-
+		
 		public override bool SetInstructionPointer(string filename, int line, int column, bool dryRun)
 		{
 			return false;
 		}
-
+		
 		public override void Dispose()
 		{
 			Stop();
 			base.Dispose();
 		}
-
+		
 		public override bool IsAttached {
 			get {
 				return false;

src/Main/Base/Project/Dom/ClassBrowser/BaseTypesTreeNode.cs

@@ -40,19 +40,15 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 				throw new ArgumentNullException("definition");
 			this.definition = definition;
 			this.text = SD.ResourceService.GetString("MainWindow.Windows.ClassBrowser.BaseTypes");
+			LazyLoading = true;
 		}
-
+		
 		protected override void OnIsVisibleChanged()
 		{
 			base.OnIsVisibleChanged();
-			if (IsVisible) {
-				definition.Updated += OnDefinitionUpdated;
-			} else {
-				definition.Updated -= OnDefinitionUpdated;
-				LazyLoading = true;
-			}
+			definition.Updated += OnDefinitionUpdated;
 		}
-
+		
 		void OnDefinitionUpdated(object sender, EventArgs e)
 		{
 			// If the list of children was created, update it

src/Main/Base/Project/Dom/ClassBrowser/DerivedTypesTreeNode.cs

@@ -38,17 +38,13 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 				throw new ArgumentNullException("definition");
 			this.definition = definition;
 			this.text = SD.ResourceService.GetString("MainWindow.Windows.ClassBrowser.DerivedTypes");
+			LazyLoading = true;
 		}
-
+		
 		protected override void OnIsVisibleChanged()
 		{
 			base.OnIsVisibleChanged();
-			if (IsVisible) {
-				definition.Updated += OnDefinitionUpdated;
-			} else {
-				definition.Updated -= OnDefinitionUpdated;
-				LazyLoading = true;
-			}
+			definition.Updated += OnDefinitionUpdated;
 		}
 		
 		void OnDefinitionUpdated(object sender, EventArgs e)

src/Main/Base/Project/Project/ISolution.cs

@@ -97,7 +97,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		/// Gets a container that can be used to store data about the solution.
 		/// This data is stored along with .sln file as .sln.sdsettings.
 		/// </summary>
-		Properties GlobalPreferences { get; }
+		Properties SDSettings { get; }
 		
 		/// <summary>
 		/// This event is raised by <see cref="SavePreferences"/> immediately before the preferences are saved to disk.

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs

@@ -65,20 +65,21 @@ namespace ICSharpCode.SharpDevelop.Project
 			this.project = project;
 			
 			Text = project.Name;
-			if (project.IsReadOnly) {
-				Text += StringParser.Parse(" (${res:Global.ReadOnly})");
-			}
-			
 			autoClearNodes = false;
 			
 			if (project is MissingProject) {
 				OpenedImage = ClosedImage = "ProjectBrowser.MissingProject";
 				this.ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/MissingProjectNode";
+				Text += StringParser.Parse(" (${res:Global.ErrorText})");
 			} else if (project is ErrorProject) {
 				OpenedImage = ClosedImage = "ProjectBrowser.ProjectWarning";
 				this.ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/UnknownProjectNode";
+				Text += StringParser.Parse(" (${res:Global.ErrorText})");
 			} else {
 				OpenedImage = ClosedImage = IconService.GetImageForProjectType(project.Language);
+				if (project.IsReadOnly) {
+					Text += StringParser.Parse(" (${res:Global.ReadOnly})");
+				}
 			}
 			Tag = project;
 			

src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj

@@ -49,8 +49,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<startup>
+	<configSections>
+		<!-- Microsoft.Build.Engine instead of Microsoft.Build here because a task run under Microsoft.Build may load Microsoft.Build.Engine, which will attempt to read this section. -->
+		<section name="msbuildToolsets" type="Microsoft.Build.BuildEngine.ToolsetConfigurationSection, Microsoft.Build.Engine, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	</configSections>
+	<startup useLegacyV2RuntimeActivationPolicy="true">
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 	</startup>
 	<runtime>

src/Main/ICSharpCode.SharpDevelop.BuildWorker120/Configuration/AssemblyInfo.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("SharpDevelop Build Worker for MSBuild 12.0")]
+[assembly: AssemblyDescription("Runs MSBuild 12.0")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: CLSCompliant(true)]

src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ProjectGuid>{6F273DA5-E10C-45A6-9071-7313ECD98C90}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ICSharpCode.SharpDevelop.BuildWorker</RootNamespace>
+    <AssemblyName>ICSharpCode.SharpDevelop.BuildWorker120</AssemblyName>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\ICSharpCode.SharpDevelop.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <RunCodeAnalysis>False</RunCodeAnalysis>
+    <CodeAnalysisRules>-Microsoft.Globalization#CA1303</CodeAnalysisRules>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <NoWin32Manifest>False</NoWin32Manifest>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+    <Prefer32Bit>True</Prefer32Bit>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <ItemGroup>
+    <Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\BuildJob.cs">
+      <Link>BuildJob.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\EventSource.cs">
+      <Link>EventSource.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\EventTypes.cs">
+      <Link>EventTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\ExtendedBinaryReader.cs">
+      <Link>ExtendedBinaryReader.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\HostProcess.cs">
+      <Link>HostProcess.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\MSBuild40.cs">
+      <Link>MSBuild40.cs</Link>
+    </Compile>
+    <Compile Include="..\ICSharpCode.SharpDevelop.BuildWorker\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="Configuration\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Project\ICSharpCode.Core.csproj">
+      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
+      <Name>ICSharpCode.Core</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Configuration" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+</Project>

src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<configSections>
+		<!-- Microsoft.Build.Engine instead of Microsoft.Build here because a task run under Microsoft.Build may load Microsoft.Build.Engine, which will attempt to read this section. -->
+		<section name="msbuildToolsets" type="Microsoft.Build.BuildEngine.ToolsetConfigurationSection, Microsoft.Build.Engine, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	</configSections>
+	<startup useLegacyV2RuntimeActivationPolicy="true">
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+	</startup>
+	<runtime>
+		<DisableFXClosureWalk enabled="true" />
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<!-- redirect MSBuild.Framework requests to make old task assemblies work with MSBuild 12.0 -->
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="12.0.0.0"/>
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="12.0.0.0"/>
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="12.0.0.0"/>
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.CompactFramework.Build.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="9.0.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>

src/Main/SharpDevelop/Project/Build/MSBuildEngine/BuildWorkerManager.cs

@@ -34,6 +34,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		readonly List<BuildWorker> freeWorkers = new List<BuildWorker>();
 		readonly string workerProcessName;
 		
+		public static readonly BuildWorkerManager MSBuild120 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker120.exe");
 		public static readonly BuildWorkerManager MSBuild40 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker40.exe");
 		public static readonly BuildWorkerManager MSBuild35 = new BuildWorkerManager("ICSharpCode.SharpDevelop.BuildWorker35.exe");
 		

src/Main/SharpDevelop/Project/Build/MSBuildEngine/MSBuildEngineWorker.cs

@@ -159,8 +159,10 @@ namespace ICSharpCode.SharpDevelop.Project
 					loggerChain.HandleError(new BuildError(job.ProjectFileName, ".NET 3.5 SP1 is required to build this project."));
 					tcs.SetResult(false);
 				}
-			} else {
+			} else if (projectMinimumSolutionVersion <= SolutionFormatVersion.VS2010) {
 				BuildWorkerManager.MSBuild40.RunBuildJob(job, loggerChain, OnDone, cancellationToken);
+			} else {
+				BuildWorkerManager.MSBuild120.RunBuildJob(job, loggerChain, OnDone, cancellationToken);
 			}
 			return tcs.Task;
 		}

src/Main/SharpDevelop/Project/Solution.cs

@@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop.Project
 	class Solution : SolutionFolder, ISolution
 	{
 		FileName fileName;
-		FileName globalSettingsFileName;
+		FileName sdSettingsFileName;
 		DirectoryName directory;
 		readonly IProjectChangeWatcher changeWatcher;
 		readonly IFileService fileService;
@@ -52,7 +52,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			this.PlatformNames = new SolutionConfigurationOrPlatformNameCollection(this, true);
 			this.projects = new SynchronizedModelCollection<IProject>(new ProjectModelCollection(this));
 			this.FileName = fileName;
-			this.globalSettingsFileName = new FileName(fileName + ".sdsettings");
+			this.sdSettingsFileName = new FileName(fileName + ".sdsettings");
 			base.Name = fileName.GetFileNameWithoutExtension();
 			
 			this.globalSections = new SynchronizedModelCollection<SolutionSection>(new NullSafeSimpleModelCollection<SolutionSection>());
@@ -126,6 +126,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		IProject startupProject;
 		
+		[Browsable(false)]
 		public IProject StartupProject {
 			get {
 				if (startupProject == null) {
@@ -231,6 +232,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		}
 		#endregion
 		
+		[Browsable(false)]
 		public IEnumerable<ISolutionItem> AllItems {
 			get {
 				return this.Items.Flatten(i => i is ISolutionFolder ? ((ISolutionFolder)i).Items : null);
@@ -274,14 +276,16 @@ namespace ICSharpCode.SharpDevelop.Project
 		#region Preferences
 		Properties preferences = new Properties();
 		
+		[Browsable(false)]
 		public Properties Preferences {
 			get { return preferences; }
 		}
 		
-		Properties globalPreferences = new Properties();
+		Properties sdSettings = new Properties();
 		
-		public Properties GlobalPreferences {
-			get { return globalPreferences; }
+		[Browsable(false)]
+		public Properties SDSettings {
+			get { return sdSettings; }
 		}
 		
 		string GetPreferencesKey()
@@ -293,7 +297,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		{
 			try {
 				preferences = SD.PropertyService.LoadExtraProperties(GetPreferencesKey());
-				globalPreferences = Properties.Load(globalSettingsFileName);
+				sdSettings = Properties.Load(sdSettingsFileName);
 			} catch (IOException) {
 			} catch (XmlException) {
 				// ignore errors about inaccessible or malformed files
@@ -317,7 +321,9 @@ namespace ICSharpCode.SharpDevelop.Project
 			
 			try {
 				SD.PropertyService.SaveExtraProperties(GetPreferencesKey(), preferences);
-				globalPreferences.Save(globalSettingsFileName);
+				if (sdSettings.IsDirty) {
+					sdSettings.Save(sdSettingsFileName);
+				}
 			} catch (IOException) {
 				// ignore errors writing to extra properties
 			}
@@ -369,6 +375,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		#region MSBuildProjectCollection
 		readonly Microsoft.Build.Evaluation.ProjectCollection msBuildProjectCollection = new Microsoft.Build.Evaluation.ProjectCollection();
 		
+		[Browsable(false)]
 		public Microsoft.Build.Evaluation.ProjectCollection MSBuildProjectCollection {
 			get { return msBuildProjectCollection; }
 		}
@@ -467,7 +474,9 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public event EventHandler ActiveConfigurationChanged = delegate { };
 		
+		[Browsable(false)]
 		public IConfigurationOrPlatformNameCollection ConfigurationNames { get; private set; }
+		[Browsable(false)]
 		public IConfigurationOrPlatformNameCollection PlatformNames { get; private set; }
 		
 		void CreateDefaultConfigurationsIfMissing()
@@ -498,6 +507,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		bool isDirty;
 		
+		[Browsable(false)]
 		public bool IsDirty {
 			get { return isDirty; }
 			set {

src/Main/SharpDevelop/Project/SolutionFolder.cs

@@ -114,24 +114,30 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		readonly SolutionItemsCollection items;
 		
+		[Browsable(false)]
 		public IMutableModelCollection<ISolutionItem> Items {
 			get { return items; }
 		}
 		#endregion
 		
+		[ReadOnly(true)]
 		public virtual string Name { get; set; }
 		
+		[Browsable(false)]
 		public ISolutionFolder ParentFolder { get; set; }
 		
+		[Browsable(false)]
 		public ISolution ParentSolution {
 			get { return parentSolution; }
 		}
 		
+		[Browsable(false)]
 		public Guid IdGuid {
 			get { return idGuid; }
 			set { idGuid = value; }
 		}
 		
+		[Browsable(false)]
 		public Guid TypeGuid {
 			get { return ProjectTypeGuids.SolutionFolder; }
 		}

src/Main/SharpDevelop/SharpDevelop.csproj

@@ -258,6 +258,7 @@
     <Content Include="app.config">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Content>
+    <None Include="Templates\SharpDevelop.Setup.sln" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj">
@@ -330,7 +331,6 @@
     <Folder Include="Dom\ClassBrowser" />
     <Folder Include="Editor" />
     <Folder Include="Editor\Bookmarks" />
-    <Folder Include="..\Base\Project\Project\TargetFrameworks" />
     <Folder Include="Templates" />
     <Folder Include="Project" />
     <Folder Include="Project\Build" />

src/Main/SharpDevelop/Templates/SharpDevelop.Setup.sln

@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# SharpDevelop 4.0.0.5860
+Project("{CFEE4113-1246-4D54-95CB-156813CB8593}") = "SharpDevelop.Setup", "SharpDevelop.Setup.wixproj", "{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+EndGlobal

src/Setup/Files.wxs

@@ -312,6 +312,12 @@
 								</File>
 								<File Id="ICSharpCode.SharpDevelop.BuildWorker40.exe.config" Name="ICSharpCode.SharpDevelop.BuildWorker40.exe.config" Source="..\..\bin\ICSharpCode.SharpDevelop.BuildWorker40.exe.config" />
 							</Component>
+							<Component Id="ICSharpCodeSharpDevelopBuildWorker120Exe" Guid="AD70E129-48C0-4715-9551-BD9B4F610B79" DiskId="1">
+								<File Id="ICSharpCode.SharpDevelop.BuildWorker120.exe" Name="ICSharpCode.SharpDevelop.BuildWorker120.exe" Source="..\..\bin\ICSharpCode.SharpDevelop.BuildWorker120.exe" KeyPath="yes" Assembly=".net" AssemblyApplication="ICSharpCode.SharpDevelop.BuildWorker120.exe" AssemblyManifest="ICSharpCode.SharpDevelop.BuildWorker120.exe">
+									<netfx:NativeImage Id="BuildWorker120NGenImage" Priority="1" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" />
+								</File>
+								<File Id="ICSharpCode.SharpDevelop.BuildWorker120.exe.config" Name="ICSharpCode.SharpDevelop.BuildWorker120.exe.config" Source="..\..\bin\ICSharpCode.SharpDevelop.BuildWorker120.exe.config" />
+							</Component>
 							<Component Id="ICSharpCodeScriptingDll" Guid="62B44EFA-CCB4-4B73-B455-AE3C72B8121F" DiskId="1">
 								<File Id="ICSharpCode.Scripting.dll" Name="ICSharpCode.Scripting.dll" Source="..\..\bin\ICSharpCode.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ICSharpCode.Scripting.dll" AssemblyManifest="ICSharpCode.Scripting.dll" />
 							</Component>

src/Setup/Setup.wxs

@@ -195,6 +195,7 @@
 				<ComponentRef Id="ICSharpCodeTreeViewDll"/>
 				<ComponentRef Id="ICSharpCodeSharpDevelopBuildWorker35Exe"/>
 				<ComponentRef Id="ICSharpCodeSharpDevelopBuildWorker40Exe"/>
+				<ComponentRef Id="ICSharpCodeSharpDevelopBuildWorker120Exe"/>
 				<ComponentRef Id="log4netDll"/>
 				<ComponentRef Id="GraphSharpDll"/>
 				<ComponentRef Id="GraphSharpControlsDll"/>