diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 9a3946c95e..0932c21196 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -151,6 +151,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\Ad
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortSD4AddInToSD5", "samples\PortSD4AddInToSD5\PortSD4AddInToSD5.csproj", "{E2FD63DA-8478-4066-934C-DA82A852C83A}"
EndProject
Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
@@ -595,6 +597,14 @@ Global
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.Build.0 = Release|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.ActiveCfg = Release|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Debug|Any CPU.Build.0 = Debug|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Debug|x86.Build.0 = Debug|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Debug|x86.ActiveCfg = Debug|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Release|Any CPU.Build.0 = Release|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Release|Any CPU.ActiveCfg = Release|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Release|x86.Build.0 = Release|Any CPU
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -661,5 +671,6 @@ Global
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
+ DC88D67C-E6B5-4994-9FA9-D4AB0E162FB3 = {B3352C08-3CB4-4DD9-996F-B9DCE4356BB9}
EndGlobalSection
EndGlobal
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index f797361804..3440f3447d 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -1,7 +1,7 @@
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
@@ -127,6 +127,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "44FA68C9-DAD1-4C3C-90BB-3435F0D1D128"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@@ -505,6 +507,14 @@ Global
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.Build.0 = Release|Any CPU
{3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.ActiveCfg = Release|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Debug|x86.Build.0 = Debug|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Debug|x86.ActiveCfg = Debug|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Release|Any CPU.Build.0 = Release|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Release|Any CPU.ActiveCfg = Release|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Release|x86.Build.0 = Release|Any CPU
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -560,6 +570,7 @@ Global
{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {7019F43E-DFD7-4D1C-8C96-E75D55646DE7}
{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {7019F43E-DFD7-4D1C-8C96-E75D55646DE7}
+ 44FA68C9-DAD1-4C3C-90BB-3435F0D1D128 = {7019F43E-DFD7-4D1C-8C96-E75D55646DE7}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E}
EndGlobalSection
diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
index 23a7b60836..9993f1164c 100644
--- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
+++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj
@@ -16,12 +16,13 @@
AnyCPU
4096
4
- false
- v4.0
+ False
+ v4.5
False
False
+ False
obj\Debug\
@@ -30,6 +31,7 @@
true
Full
True
+ obj\
obj\Release\
@@ -39,6 +41,9 @@
None
False
+
+ False
+
@@ -79,11 +84,6 @@
-
- {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}
- NRefactory
- False
-
{2748AD25-9C63-4E12-877B-4DCE96FBED54}
ICSharpCode.SharpDevelop
@@ -99,11 +99,6 @@
ICSharpCode.Core.Presentation
False
-
- {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}
- ICSharpCode.SharpDevelop.Dom
- False
-
diff --git a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
index dc478920f7..2b10c2bf62 100644
--- a/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
+++ b/src/AddIns/Analysis/SourceAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
@@ -98,7 +98,7 @@ namespace ICSharpCode.SourceAnalysis
public static string StyleCopPath {
get {
- return PropertyService.Get("SourceAnalysis.StyleCopPath");
+ return PropertyService.Get("SourceAnalysis.StyleCopPath", String.Empty);
}
set {
PropertyService.Set("SourceAnalysis.StyleCopPath", value);
diff --git a/src/AddIns/Analysis/SourceAnalysis/Src/CheckCurrentProjectCommand.cs b/src/AddIns/Analysis/SourceAnalysis/Src/CheckCurrentProjectCommand.cs
index 8047b0a7bc..38077d2494 100644
--- a/src/AddIns/Analysis/SourceAnalysis/Src/CheckCurrentProjectCommand.cs
+++ b/src/AddIns/Analysis/SourceAnalysis/Src/CheckCurrentProjectCommand.cs
@@ -3,6 +3,7 @@
using System;
using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Project.Commands;
@@ -10,13 +11,13 @@ namespace ICSharpCode.SourceAnalysis
{
public class CheckCurrentProjectCommand : BuildProject
{
- public override void StartBuild()
+ public override async void StartBuild()
{
- BuildOptions options = new BuildOptions(BuildTarget.Rebuild, CallbackMethod);
+ var options = new BuildOptions(BuildTarget.Rebuild);
options.TargetForDependencies = BuildTarget.Build;
options.ProjectAdditionalProperties["RunSourceAnalysis"] = "true";
options.ProjectAdditionalProperties["StyleCopFile"] = StyleCopWrapper.FindStyleCopPath() ?? string.Empty;
- BuildEngine.BuildInGui(this.ProjectToBuild, options);
+ CallbackMethod(await SD.BuildService.BuildAsync(this.ProjectToBuild, options));
}
}
}
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 2445192e8d..21ed78ccda 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -781,7 +781,7 @@
-