diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 5de572c44f..d6dc80444f 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-# SharpDevelop 4.1.0.7374-alpha
+# SharpDevelop 4.1.0.7605-alpha
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@@ -584,6 +584,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F3
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications.Tests", "src\AddIns\Analysis\MachineSpecifications\MachineSpecifications.Tests\MachineSpecifications.Tests.csproj", "{172AE35D-2051-4977-AC13-0BF1B76374D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications", "src\AddIns\Analysis\MachineSpecifications\MachineSpecifications\MachineSpecifications.csproj", "{D1DA3B8F-7313-4BDA-8880-461C5F007751}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
@@ -620,10 +624,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications.Tests", "src\AddIns\Analysis\MachineSpecifications\MachineSpecifications.Tests\MachineSpecifications.Tests.csproj", "{172AE35D-2051-4977-AC13-0BF1B76374D5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications", "src\AddIns\Analysis\MachineSpecifications\MachineSpecifications\MachineSpecifications.csproj", "{D1DA3B8F-7313-4BDA-8880-461C5F007751}"
-EndProject
Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
EndProject
Global
@@ -1354,38 +1354,38 @@ Global
{11115C83-3DB1-431F-8B98-59040359238D}.Release|x86.ActiveCfg = Release|x86
{11115C83-3DB1-431F-8B98-59040359238D}.Release|Debug.Build.0 = Release|x86
{11115C83-3DB1-431F-8B98-59040359238D}.Release|Debug.ActiveCfg = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Any CPU.Build.0 = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Any CPU.ActiveCfg = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Win32.Build.0 = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Win32.ActiveCfg = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.Build.0 = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.ActiveCfg = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Debug.Build.0 = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Debug.ActiveCfg = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Any CPU.Build.0 = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Any CPU.ActiveCfg = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Win32.Build.0 = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Win32.ActiveCfg = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.Build.0 = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.ActiveCfg = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Debug.Build.0 = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Debug.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.ActiveCfg = Release|x86
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Win32.Build.0 = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.Build.0 = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Debug.Build.0 = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|Debug.ActiveCfg = Debug|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Win32.Build.0 = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Win32.ActiveCfg = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.Build.0 = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.ActiveCfg = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Debug.Build.0 = Release|Any CPU
+ {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|Debug.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 136365e1f2..b9292fa936 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -1048,22 +1048,22 @@ Global
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|x86.ActiveCfg = Release|x86
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Debug.Build.0 = Release|x86
{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Debug.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.Build.0 = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.ActiveCfg = Debug|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.ActiveCfg = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.Build.0 = Release|x86
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.ActiveCfg = Release|x86
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.Build.0 = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Debug.ActiveCfg = Debug|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Win32.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.ActiveCfg = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.Build.0 = Release|Any CPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Debug.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.csproj b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.csproj
index ef36be71ad..e98cf19027 100644
--- a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.csproj
+++ b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.csproj
@@ -3,7 +3,7 @@
{172AE35D-2051-4977-AC13-0BF1B76374D5}
Debug
- x86
+ AnyCPU
Library
ICSharpCode.MachineSpecifications.Tests
MachineSpecifications.Tests
@@ -11,12 +11,10 @@
Properties
-
-
- x86
+ AnyCPU
+ ..\..\..\..\..\bin\UnitTests\
- bin\Debug\
True
Full
False
@@ -24,16 +22,12 @@
DEBUG;TRACE
- bin\Release\
False
None
True
False
TRACE
-
- ..\..\..\..\..\bin\UnitTests\
-
D:\git\sharpdevelop\packages\developwithpassion.specifications.rhinomocks.0.4.13.0\lib\developwithpassion.specifications.dll
diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.sln b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.sln
deleted file mode 100644
index ffb25036ce..0000000000
--- a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications.Tests/MachineSpecifications.Tests.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-# SharpDevelop 4.1.0.7606-alpha
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineSpecifications.Tests", "MachineSpecifications.Tests.csproj", "{172AE35D-2051-4977-AC13-0BF1B76374D5}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.Build.0 = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Debug|x86.ActiveCfg = Debug|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.Build.0 = Release|x86
- {172AE35D-2051-4977-AC13-0BF1B76374D5}.Release|x86.ActiveCfg = Release|x86
- EndGlobalSection
-EndGlobal
diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj
index cd0a6537c6..91909d3bb5 100644
--- a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj
+++ b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj
@@ -1,37 +1,38 @@
- {D1DA3B8F-7313-4BDA-8880-461C5F007751}
- Debug
- x86
Library
ICSharpCode.MachineSpecifications
MachineSpecifications
- v4.0
+ Debug
+ AnyCPU
+ {D1DA3B8F-7313-4BDA-8880-461C5F007751}
+ ..\..\..\..\..\AddIns\Analysis\MachineSpecifications\
+ False
+ False
+ false
+ 4
-
-
- x86
+ AnyCPU
+ False
+ Auto
+ 4194304
+ 4096
- bin\Debug\
- True
- Full
False
- True
DEBUG;TRACE
+ true
+ Full
+ True
- bin\Release\
+ True
+ TRACE
False
None
- True
False
- TRACE
-
-
- ..\..\..\..\..\AddIns\Analysis\MachineSpecifications\