Update project files with git location for cecil. Fix wix project wrt FX3.5mono-2-8

44 files changed, 282 insertions, 279 deletions

diff --git a/gendarme/AssemblyStaticInfo.cs b/gendarme/AssemblyStaticInfo.cs
index 323b2e27..397a2ff8 100644
--- a/gendarme/AssemblyStaticInfo.cs
+++ b/gendarme/AssemblyStaticInfo.cs
@@ -23,5 +23,5 @@ using System.Security.Permissions;
 [assembly: ComVisible (false)]
 
 #if RELEASE
-[assembly: AssemblyVersion ("2.7.0.0")]
+[assembly: AssemblyVersion ("2.8.0.0")]
 #endif
diff --git a/gendarme/console/gendarme.csproj b/gendarme/console/gendarme.csproj
index c987b51c..2a827e22 100755
--- a/gendarme/console/gendarme.csproj
+++ b/gendarme/console/gendarme.csproj
@@ -80,7 +80,7 @@
       <Project>{4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E}</Project>

       <Name>Mono.Cecil.Pdb</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/framework/Gendarme.Framework.csproj b/gendarme/framework/Gendarme.Framework.csproj
index 3031c21d..f412f8c0 100755
--- a/gendarme/framework/Gendarme.Framework.csproj
+++ b/gendarme/framework/Gendarme.Framework.csproj
@@ -1,161 +1,161 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CD6818D5-B398-486C-B180-92A07B143AFD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Gendarme.Framework</RootNamespace>
-    <AssemblyName>Gendarme.Framework</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Gendarme.Framework/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;RELEASE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\AssemblyStaticInfo.cs" />
-    <Compile Include="Gendarme.Framework.Engines\SuppressMessageEngine.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\Log.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\MethodPrinter.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\ParameterRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\VariableDefinitionRocks.cs" />
-    <Compile Include="Gendarme.Framework\Engine.cs" />
-    <Compile Include="Gendarme.Framework.Engines\OpCodeEngine.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\OpCodeBitmask.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\StackEntryUsageResult.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\AssemblyRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\CecilRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\CommonRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\CustomAttributeRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\FieldRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\InstructionRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\MethodRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\ModuleRocks.cs" />
-    <Compile Include="Gendarme.Framework.Rocks\TypeRocks.cs" />
-    <Compile Include="Gendarme.Framework\ApplicabilityScope.cs" />
-    <Compile Include="Gendarme.Framework\AssemblyResolver.cs" />
-    <Compile Include="Gendarme.Framework\Confidence.cs" />
-    <Compile Include="Gendarme.Framework\Defect.cs" />
-    <Compile Include="Gendarme.Framework\DocumentationUriAttribute.cs" />
-    <Compile Include="Gendarme.Framework\Bitmask.cs" />
-    <Compile Include="Gendarme.Framework\EngineController.cs" />
-    <Compile Include="Gendarme.Framework\EngineDependencyAttribute.cs" />
-    <Compile Include="Gendarme.Framework\EngineEventArgs.cs" />
-    <Compile Include="Gendarme.Framework\FxCopCompatibilityAttribute.cs" />
-    <Compile Include="Gendarme.Framework\HierarchicalEventArgs.cs" />
-    <Compile Include="Gendarme.Framework\IAssemblyRule.cs" />
-    <Compile Include="Gendarme.Framework\BasicIgnoreList.cs" />
-    <Compile Include="Gendarme.Framework\IIgnoreList.cs" />
-    <Compile Include="Gendarme.Framework\IMethodRule.cs" />
-    <Compile Include="Gendarme.Framework\IRule.cs" />
-    <Compile Include="Gendarme.Framework\IRunner.cs" />
-    <Compile Include="Gendarme.Framework\ITypeRule.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\MethodSignature.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\MethodSignatures.cs" />
-    <Compile Include="Gendarme.Framework\ProblemAttribute.cs" />
-    <Compile Include="Gendarme.Framework\Rule.cs" />
-    <Compile Include="Gendarme.Framework\RuleResult.cs" />
-    <Compile Include="Gendarme.Framework\Runner.cs" />
-    <Compile Include="Gendarme.Framework\RunnerEventArgs.cs" />
-    <Compile Include="Gendarme.Framework\Severity.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\StackEntryAnalysis.cs" />
-    <Compile Include="Gendarme.Framework\SolutionAttribute.cs" />
-    <Compile Include="Gendarme.Framework\Symbols.cs" />
-    <Compile Include="Gendarme.Framework.Engines\NamespaceEngine.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\Namespace.cs" />
-    <Compile Include="Gendarme.Framework.Helpers\PrimitiveReferences.cs" />
-    <Compile Include="Gendarme.Framework\ThreadModelAttribute.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ChangeLog" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">
-      <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{CD6818D5-B398-486C-B180-92A07B143AFD}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>Gendarme.Framework</RootNamespace>

+    <AssemblyName>Gendarme.Framework</AssemblyName>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+    <OldToolsVersion>2.0</OldToolsVersion>

+    <UpgradeBackupLocation>

+    </UpgradeBackupLocation>

+    <PublishUrl>http://localhost/Gendarme.Framework/</PublishUrl>

+    <Install>true</Install>

+    <InstallFrom>Web</InstallFrom>

+    <UpdateEnabled>true</UpdateEnabled>

+    <UpdateMode>Foreground</UpdateMode>

+    <UpdateInterval>7</UpdateInterval>

+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>

+    <UpdatePeriodically>false</UpdatePeriodically>

+    <UpdateRequired>false</UpdateRequired>

+    <MapFileExtensions>true</MapFileExtensions>

+    <ApplicationRevision>0</ApplicationRevision>

+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

+    <IsWebBootstrapper>true</IsWebBootstrapper>

+    <UseApplicationTrust>false</UseApplicationTrust>

+    <BootstrapperEnabled>true</BootstrapperEnabled>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>..\bin\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>3</WarningLevel>

+    <StartupObject />

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE;RELEASE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <StartupObject />

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="..\AssemblyStaticInfo.cs" />

+    <Compile Include="Gendarme.Framework.Engines\SuppressMessageEngine.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\Log.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\MethodPrinter.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\ParameterRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\VariableDefinitionRocks.cs" />

+    <Compile Include="Gendarme.Framework\Engine.cs" />

+    <Compile Include="Gendarme.Framework.Engines\OpCodeEngine.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\OpCodeBitmask.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\StackEntryUsageResult.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\AssemblyRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\CecilRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\CommonRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\CustomAttributeRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\FieldRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\InstructionRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\MethodRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\ModuleRocks.cs" />

+    <Compile Include="Gendarme.Framework.Rocks\TypeRocks.cs" />

+    <Compile Include="Gendarme.Framework\ApplicabilityScope.cs" />

+    <Compile Include="Gendarme.Framework\AssemblyResolver.cs" />

+    <Compile Include="Gendarme.Framework\Confidence.cs" />

+    <Compile Include="Gendarme.Framework\Defect.cs" />

+    <Compile Include="Gendarme.Framework\DocumentationUriAttribute.cs" />

+    <Compile Include="Gendarme.Framework\Bitmask.cs" />

+    <Compile Include="Gendarme.Framework\EngineController.cs" />

+    <Compile Include="Gendarme.Framework\EngineDependencyAttribute.cs" />

+    <Compile Include="Gendarme.Framework\EngineEventArgs.cs" />

+    <Compile Include="Gendarme.Framework\FxCopCompatibilityAttribute.cs" />

+    <Compile Include="Gendarme.Framework\HierarchicalEventArgs.cs" />

+    <Compile Include="Gendarme.Framework\IAssemblyRule.cs" />

+    <Compile Include="Gendarme.Framework\BasicIgnoreList.cs" />

+    <Compile Include="Gendarme.Framework\IIgnoreList.cs" />

+    <Compile Include="Gendarme.Framework\IMethodRule.cs" />

+    <Compile Include="Gendarme.Framework\IRule.cs" />

+    <Compile Include="Gendarme.Framework\IRunner.cs" />

+    <Compile Include="Gendarme.Framework\ITypeRule.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\MethodSignature.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\MethodSignatures.cs" />

+    <Compile Include="Gendarme.Framework\ProblemAttribute.cs" />

+    <Compile Include="Gendarme.Framework\Rule.cs" />

+    <Compile Include="Gendarme.Framework\RuleResult.cs" />

+    <Compile Include="Gendarme.Framework\Runner.cs" />

+    <Compile Include="Gendarme.Framework\RunnerEventArgs.cs" />

+    <Compile Include="Gendarme.Framework\Severity.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\StackEntryAnalysis.cs" />

+    <Compile Include="Gendarme.Framework\SolutionAttribute.cs" />

+    <Compile Include="Gendarme.Framework\Symbols.cs" />

+    <Compile Include="Gendarme.Framework.Engines\NamespaceEngine.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\Namespace.cs" />

+    <Compile Include="Gendarme.Framework.Helpers\PrimitiveReferences.cs" />

+    <Compile Include="Gendarme.Framework\ThreadModelAttribute.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="ChangeLog" />

+  </ItemGroup>

+  <ItemGroup>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

+      <Visible>False</Visible>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">

+      <Visible>False</Visible>

+    </BootstrapperPackage>

+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">

+      <Visible>False</Visible>

+    </BootstrapperPackage>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+      <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

+      <Name>Mono.Cecil</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <GtkDesignInfo />
-        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
-          <BuildFilesVar Sync="true" Name="framework_sources" />
-          <DeployFilesVar />
-          <ResourcesVar />
-          <OthersVar />
-          <GacRefVar />
-          <AsmRefVar />
-          <ProjectRefVar />
-        </MonoDevelop.Autotools.MakefileInfo>
-      </Properties>
-    </MonoDevelop>
-    <VisualStudio />
-  </ProjectExtensions>
+  -->

+  <ProjectExtensions>

+    <MonoDevelop>

+      <Properties>

+        <GtkDesignInfo />

+        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../..">

+          <BuildFilesVar Sync="true" Name="framework_sources" />

+          <DeployFilesVar />

+          <ResourcesVar />

+          <OthersVar />

+          <GacRefVar />

+          <AsmRefVar />

+          <ProjectRefVar />

+        </MonoDevelop.Autotools.MakefileInfo>

+      </Properties>

+    </MonoDevelop>

+    <VisualStudio />

+  </ProjectExtensions>

 </Project>
\ No newline at end of file
diff --git a/gendarme/framework/Test/Tests.Framework.csproj b/gendarme/framework/Test/Tests.Framework.csproj
index 87dfe35a..c9df47a2 100755
--- a/gendarme/framework/Test/Tests.Framework.csproj
+++ b/gendarme/framework/Test/Tests.Framework.csproj
@@ -55,7 +55,7 @@
     <Compile Include="GlobalSuppressions.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/gendarme-win.sln b/gendarme/gendarme-win.sln
index 2a4d020e..d2a39955 100755
--- a/gendarme/gendarme-win.sln
+++ b/gendarme/gendarme-win.sln
@@ -79,7 +79,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gendarme.Framework", "frame
 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cecil", "Cecil", "{10772645-2837-44B1-9CFA-51A0A5CAC635}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj", "{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj", "{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Pdb", "..\..\cecil\pdb\Mono.Cecil.Pdb\Mono.Cecil.Pdb.csproj", "{4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E}"

 EndProject

@@ -106,6 +106,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "wix\wix.wixproj", "{
 	ProjectSection(ProjectDependencies) = postProject

 		{5446570C-A304-418D-B908-91ADA51E4F00} = {5446570C-A304-418D-B908-91ADA51E4F00}

 		{3A220513-3E53-4E13-B25D-2202F79B4C47} = {3A220513-3E53-4E13-B25D-2202F79B4C47}

+		{627AA224-D043-4CF4-A783-72546E6ACFDD} = {627AA224-D043-4CF4-A783-72546E6ACFDD}

+		{4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E} = {4FEBBB25-D5C0-48F0-A822-2E0D6F3D777E}

 		{EEC7B836-DB9D-4CB3-9829-53C223C9411F} = {EEC7B836-DB9D-4CB3-9829-53C223C9411F}

 		{237A273E-BCAF-42DB-9DE5-1697B016C648} = {237A273E-BCAF-42DB-9DE5-1697B016C648}

 		{949C4D51-4581-402A-AC18-B1B41F395FDA} = {949C4D51-4581-402A-AC18-B1B41F395FDA}

@@ -124,6 +126,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "wix\wix.wixproj", "{
 		{732905E1-1FD4-403A-93DD-EC4CF120091E} = {732905E1-1FD4-403A-93DD-EC4CF120091E}

 		{7A8D4AE7-66FA-42E0-BDCB-400D8E0ECFA6} = {7A8D4AE7-66FA-42E0-BDCB-400D8E0ECFA6}

 		{BDDBA1F9-061B-45BE-86B5-98571F7B0383} = {BDDBA1F9-061B-45BE-86B5-98571F7B0383}

+		{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE} = {D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}

 	EndProjectSection

 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{A208E677-6A00-4F5C-A15B-5CCA90AB78FF}"

diff --git a/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj b/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj
index 39d5b341..c1a26b32 100755
--- a/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj
+++ b/gendarme/rules/Gendarme.Rules.BadPractice/Gendarme.Rules.BadPractice.csproj
@@ -70,7 +70,7 @@
     <Compile Include="ToStringReturnsNullRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj b/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj
index 71d780fe..4cb3e1be 100755
--- a/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj
+++ b/gendarme/rules/Gendarme.Rules.BadPractice/Test/Tests.Rules.BadPractice.csproj
@@ -61,7 +61,7 @@
     <Compile Include="ToStringReturnsNullTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj b/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj
index 58e38c0d..7cc30b77 100644
--- a/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj
+++ b/gendarme/rules/Gendarme.Rules.Concurrency/Gendarme.Rules.Concurrency.csproj
@@ -80,7 +80,7 @@
     <Compile Include="ProtectCallToEventDelegatesRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj b/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj
index 1663f855..f8fa060e 100755
--- a/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj
+++ b/gendarme/rules/Gendarme.Rules.Concurrency/Test/Tests.Rules.Concurrency.csproj
@@ -72,7 +72,7 @@
     <Compile Include="WriteStaticFieldFromInstanceMethodTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj b/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj
index c1f405f8..d8a39215 100755
--- a/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj
+++ b/gendarme/rules/Gendarme.Rules.Correctness/Gendarme.Rules.Correctness.csproj
@@ -119,7 +119,7 @@
     <Compile Include="AttributeStringLiteralsShouldParseCorrectlyRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj b/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj
index 005e2df4..a0f1b927 100755
--- a/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj
+++ b/gendarme/rules/Gendarme.Rules.Correctness/Test/Tests.Rules.Correctness.csproj
@@ -80,12 +80,12 @@
     <Compile Include="ProvideCorrectArgumentsToFormattingMethodsTest.cs" />

     <Compile Include="ProvideCorrectRegexPatternTest.cs" />

     <Compile Include="ProvideValidXmlStringTest.cs" />

-    <Compile Include="ProvideValidXPathExpressionTest.cs" />
-    <Compile Include="Resource.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
+    <Compile Include="ProvideValidXPathExpressionTest.cs" />

+    <Compile Include="Resource.Designer.cs">

+      <AutoGen>True</AutoGen>

+      <DesignTime>True</DesignTime>

+      <DependentUpon>Resource.resx</DependentUpon>

+    </Compile>

     <Compile Include="ReviewCastOnIntegerDivisionTest.cs" />

     <Compile Include="ReviewCastOnIntegerMultiplicationTest.cs" />

     <Compile Include="ReviewDoubleAssignmentTest.cs" />

@@ -98,7 +98,7 @@
     <Compile Include="UseValueInPropertySetterTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

@@ -125,14 +125,14 @@
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">

       <Visible>False</Visible>

     </BootstrapperPackage>

-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
+  </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="Resource.resx">

+      <Generator>ResXFileCodeGenerator</Generator>

+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>

+      <SubType>Designer</SubType>

+    </EmbeddedResource>

+  </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -157,4 +157,4 @@
     </MonoDevelop>

     <VisualStudio />

   </ProjectExtensions>

-</Project>
+</Project>
\ No newline at end of file
diff --git a/gendarme/rules/Gendarme.Rules.Design.Generic/Gendarme.Rules.Design.Generic.csproj b/gendarme/rules/Gendarme.Rules.Design.Generic/Gendarme.Rules.Design.Generic.csproj
index 1c9e916b..216d109e 100644
--- a/gendarme/rules/Gendarme.Rules.Design.Generic/Gendarme.Rules.Design.Generic.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design.Generic/Gendarme.Rules.Design.Generic.csproj
@@ -54,7 +54,7 @@
     <Compile Include="PreferGenericsOverRefObjectRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Design.Generic/Test/Tests.Rules.Design.Generic.csproj b/gendarme/rules/Gendarme.Rules.Design.Generic/Test/Tests.Rules.Design.Generic.csproj
index 55114574..d8d49888 100644
--- a/gendarme/rules/Gendarme.Rules.Design.Generic/Test/Tests.Rules.Design.Generic.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design.Generic/Test/Tests.Rules.Design.Generic.csproj
@@ -50,7 +50,7 @@
     <Compile Include="UseGenericEventHandlerTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Design.Linq/Gendarme.Rules.Design.Linq.csproj b/gendarme/rules/Gendarme.Rules.Design.Linq/Gendarme.Rules.Design.Linq.csproj
index 1fed0339..e2c6a103 100644
--- a/gendarme/rules/Gendarme.Rules.Design.Linq/Gendarme.Rules.Design.Linq.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design.Linq/Gendarme.Rules.Design.Linq.csproj
@@ -49,7 +49,7 @@
     <Compile Include="AvoidExtensionMethodOnSystemObjectRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Design.Linq/Test/Tests.Rules.Design.Linq.csproj b/gendarme/rules/Gendarme.Rules.Design.Linq/Test/Tests.Rules.Design.Linq.csproj
index 54fe5178..64cacfb2 100644
--- a/gendarme/rules/Gendarme.Rules.Design.Linq/Test/Tests.Rules.Design.Linq.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design.Linq/Test/Tests.Rules.Design.Linq.csproj
@@ -41,7 +41,7 @@
     <Compile Include="AvoidExtensionMethodOnSystemObjectTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Design/Gendarme.Rules.Design.csproj b/gendarme/rules/Gendarme.Rules.Design/Gendarme.Rules.Design.csproj
index bfc52794..35195488 100755
--- a/gendarme/rules/Gendarme.Rules.Design/Gendarme.Rules.Design.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design/Gendarme.Rules.Design.csproj
@@ -93,7 +93,7 @@
     <Compile Include="ConsiderAddingInterfaceRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Design/Test/Tests.Rules.Design.csproj b/gendarme/rules/Gendarme.Rules.Design/Test/Tests.Rules.Design.csproj
index fb3573a2..afde1ee3 100755
--- a/gendarme/rules/Gendarme.Rules.Design/Test/Tests.Rules.Design.csproj
+++ b/gendarme/rules/Gendarme.Rules.Design/Test/Tests.Rules.Design.csproj
@@ -85,7 +85,7 @@
     <Compile Include="UsingCloneWithoutImplementingICloneableTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Exceptions/Gendarme.Rules.Exceptions.csproj b/gendarme/rules/Gendarme.Rules.Exceptions/Gendarme.Rules.Exceptions.csproj
index f0ea4ee3..37d7cd7e 100644
--- a/gendarme/rules/Gendarme.Rules.Exceptions/Gendarme.Rules.Exceptions.csproj
+++ b/gendarme/rules/Gendarme.Rules.Exceptions/Gendarme.Rules.Exceptions.csproj
@@ -84,7 +84,7 @@
     <Compile Include="UseObjectDisposedExceptionRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Exceptions/Test/Tests.Rules.Exceptions.csproj b/gendarme/rules/Gendarme.Rules.Exceptions/Test/Tests.Rules.Exceptions.csproj
index 00001ca0..242ffe6f 100644
--- a/gendarme/rules/Gendarme.Rules.Exceptions/Test/Tests.Rules.Exceptions.csproj
+++ b/gendarme/rules/Gendarme.Rules.Exceptions/Test/Tests.Rules.Exceptions.csproj
@@ -71,7 +71,7 @@
     <Compile Include="UseObjectDisposedExceptionTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Interoperability/Gendarme.Rules.Interoperability.csproj b/gendarme/rules/Gendarme.Rules.Interoperability/Gendarme.Rules.Interoperability.csproj
index f3c5b6a8..609b80a1 100755
--- a/gendarme/rules/Gendarme.Rules.Interoperability/Gendarme.Rules.Interoperability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Interoperability/Gendarme.Rules.Interoperability.csproj
@@ -56,7 +56,7 @@
     <Compile Include="MarshalBooleansInPInvokeDeclarationsRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Interoperability/Test/Tests.Rules.Interoperability.csproj b/gendarme/rules/Gendarme.Rules.Interoperability/Test/Tests.Rules.Interoperability.csproj
index 8162ab72..3315516c 100755
--- a/gendarme/rules/Gendarme.Rules.Interoperability/Test/Tests.Rules.Interoperability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Interoperability/Test/Tests.Rules.Interoperability.csproj
@@ -50,7 +50,7 @@
     <Compile Include="UseManagedAlternativesToPInvokeTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Maintainability/Gendarme.Rules.Maintainability.csproj b/gendarme/rules/Gendarme.Rules.Maintainability/Gendarme.Rules.Maintainability.csproj
index 79561e9a..67737700 100755
--- a/gendarme/rules/Gendarme.Rules.Maintainability/Gendarme.Rules.Maintainability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Maintainability/Gendarme.Rules.Maintainability.csproj
@@ -56,7 +56,7 @@
     <Compile Include="RemoveDependenceOnObsoleteCodeRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Maintainability/Test/Tests.Rules.Maintainability.csproj b/gendarme/rules/Gendarme.Rules.Maintainability/Test/Tests.Rules.Maintainability.csproj
index 568fafec..ba2a2c3a 100755
--- a/gendarme/rules/Gendarme.Rules.Maintainability/Test/Tests.Rules.Maintainability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Maintainability/Test/Tests.Rules.Maintainability.csproj
@@ -48,7 +48,7 @@
     <Compile Include="RemoveDependenceOnObsoleteCodeTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Naming/Gendarme.Rules.Naming.csproj b/gendarme/rules/Gendarme.Rules.Naming/Gendarme.Rules.Naming.csproj
index 8ac7146c..63d9669a 100755
--- a/gendarme/rules/Gendarme.Rules.Naming/Gendarme.Rules.Naming.csproj
+++ b/gendarme/rules/Gendarme.Rules.Naming/Gendarme.Rules.Naming.csproj
@@ -57,7 +57,7 @@
     <Compile Include="AvoidRedundancyInTypeNameRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Naming/Test/Tests.Rules.Naming.csproj b/gendarme/rules/Gendarme.Rules.Naming/Test/Tests.Rules.Naming.csproj
index 22e01580..47705baa 100755
--- a/gendarme/rules/Gendarme.Rules.Naming/Test/Tests.Rules.Naming.csproj
+++ b/gendarme/rules/Gendarme.Rules.Naming/Test/Tests.Rules.Naming.csproj
@@ -53,7 +53,7 @@
     <Compile Include="UseSingularNameInEnumsUnlessAreFlagsTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Performance/Gendarme.Rules.Performance.csproj b/gendarme/rules/Gendarme.Rules.Performance/Gendarme.Rules.Performance.csproj
index 4cf8d2ab..545a3b4c 100755
--- a/gendarme/rules/Gendarme.Rules.Performance/Gendarme.Rules.Performance.csproj
+++ b/gendarme/rules/Gendarme.Rules.Performance/Gendarme.Rules.Performance.csproj
@@ -102,7 +102,7 @@
     <Compile Include="PreferLiteralOverInitOnlyFieldsRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Performance/Test/Tests.Rules.Performance.csproj b/gendarme/rules/Gendarme.Rules.Performance/Test/Tests.Rules.Performance.csproj
index dc0d846d..6c251170 100755
--- a/gendarme/rules/Gendarme.Rules.Performance/Test/Tests.Rules.Performance.csproj
+++ b/gendarme/rules/Gendarme.Rules.Performance/Test/Tests.Rules.Performance.csproj
@@ -98,7 +98,7 @@
     <Compile Include="UseTypeEmptyTypesTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Portability/Gendarme.Rules.Portability.csproj b/gendarme/rules/Gendarme.Rules.Portability/Gendarme.Rules.Portability.csproj
index 741a6c3b..dd7f4b6c 100755
--- a/gendarme/rules/Gendarme.Rules.Portability/Gendarme.Rules.Portability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Portability/Gendarme.Rules.Portability.csproj
@@ -81,7 +81,7 @@
     <Compile Include="NewLineLiteralRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Portability/Test/Tests.Rules.Portability.csproj b/gendarme/rules/Gendarme.Rules.Portability/Test/Tests.Rules.Portability.csproj
index ba761a52..0798fec0 100755
--- a/gendarme/rules/Gendarme.Rules.Portability/Test/Tests.Rules.Portability.csproj
+++ b/gendarme/rules/Gendarme.Rules.Portability/Test/Tests.Rules.Portability.csproj
@@ -69,7 +69,7 @@
     <Compile Include="DoNotHardcodePathsTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Security.Cas/Gendarme.Rules.Security.Cas.csproj b/gendarme/rules/Gendarme.Rules.Security.Cas/Gendarme.Rules.Security.Cas.csproj
index 385ccf4a..133adf28 100644
--- a/gendarme/rules/Gendarme.Rules.Security.Cas/Gendarme.Rules.Security.Cas.csproj
+++ b/gendarme/rules/Gendarme.Rules.Security.Cas/Gendarme.Rules.Security.Cas.csproj
@@ -56,7 +56,7 @@
     <Compile Include="SecureGetObjectDataOverridesRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Security.Cas/Test/Tests.Rules.Security.Cas.csproj b/gendarme/rules/Gendarme.Rules.Security.Cas/Test/Tests.Rules.Security.Cas.csproj
index 91f8ae6a..1a32f8f9 100644
--- a/gendarme/rules/Gendarme.Rules.Security.Cas/Test/Tests.Rules.Security.Cas.csproj
+++ b/gendarme/rules/Gendarme.Rules.Security.Cas/Test/Tests.Rules.Security.Cas.csproj
@@ -48,7 +48,7 @@
     <Compile Include="SecureGetObjectDataOverridesTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Security/Gendarme.Rules.Security.csproj b/gendarme/rules/Gendarme.Rules.Security/Gendarme.Rules.Security.csproj
index 71133c16..4a18c306 100755
--- a/gendarme/rules/Gendarme.Rules.Security/Gendarme.Rules.Security.csproj
+++ b/gendarme/rules/Gendarme.Rules.Security/Gendarme.Rules.Security.csproj
@@ -71,7 +71,7 @@
     <Compile Include="StaticConstructorsShouldBePrivateRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Security/Test/Tests.Rules.Security.csproj b/gendarme/rules/Gendarme.Rules.Security/Test/Tests.Rules.Security.csproj
index f0918d99..2fa0cad3 100755
--- a/gendarme/rules/Gendarme.Rules.Security/Test/Tests.Rules.Security.csproj
+++ b/gendarme/rules/Gendarme.Rules.Security/Test/Tests.Rules.Security.csproj
@@ -65,7 +65,7 @@
     <Compile Include="StaticConstructorsShouldBePrivateTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Serialization/Gendarme.Rules.Serialization.csproj b/gendarme/rules/Gendarme.Rules.Serialization/Gendarme.Rules.Serialization.csproj
index b705a6c2..8c8e6edd 100755
--- a/gendarme/rules/Gendarme.Rules.Serialization/Gendarme.Rules.Serialization.csproj
+++ b/gendarme/rules/Gendarme.Rules.Serialization/Gendarme.Rules.Serialization.csproj
@@ -56,7 +56,7 @@
     <Compile Include="MarkEnumerationsAsSerializableRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Serialization/Test/Tests.Rules.Serialization.csproj b/gendarme/rules/Gendarme.Rules.Serialization/Test/Tests.Rules.Serialization.csproj
index 362bcc0e..a5089074 100755
--- a/gendarme/rules/Gendarme.Rules.Serialization/Test/Tests.Rules.Serialization.csproj
+++ b/gendarme/rules/Gendarme.Rules.Serialization/Test/Tests.Rules.Serialization.csproj
@@ -47,7 +47,7 @@
     <Compile Include="MissingSerializationConstructorTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Smells/Gendarme.Rules.Smells.csproj b/gendarme/rules/Gendarme.Rules.Smells/Gendarme.Rules.Smells.csproj
index 8e701e71..66b4c01c 100755
--- a/gendarme/rules/Gendarme.Rules.Smells/Gendarme.Rules.Smells.csproj
+++ b/gendarme/rules/Gendarme.Rules.Smells/Gendarme.Rules.Smells.csproj
@@ -60,7 +60,7 @@
     <Compile Include="Utilities.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Smells/Test/Tests.Rules.Smells.csproj b/gendarme/rules/Gendarme.Rules.Smells/Test/Tests.Rules.Smells.csproj
index 15260318..1cc81ba8 100755
--- a/gendarme/rules/Gendarme.Rules.Smells/Test/Tests.Rules.Smells.csproj
+++ b/gendarme/rules/Gendarme.Rules.Smells/Test/Tests.Rules.Smells.csproj
@@ -52,7 +52,7 @@
     <Compile Include="AvoidSwitchStatementsTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj b/gendarme/rules/Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj
index a6504c6f..ae620f80 100644
--- a/gendarme/rules/Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj
+++ b/gendarme/rules/Gendarme.Rules.Ui/Gendarme.Rules.Ui.csproj
@@ -71,7 +71,7 @@
     <Compile Include="UseSTAThreadAttributeOnSWFEntryPointsRule.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Gendarme.Rules.Ui/Test/Tests.Rules.Ui.csproj b/gendarme/rules/Gendarme.Rules.Ui/Test/Tests.Rules.Ui.csproj
index 12e5d0dd..153890ed 100644
--- a/gendarme/rules/Gendarme.Rules.Ui/Test/Tests.Rules.Ui.csproj
+++ b/gendarme/rules/Gendarme.Rules.Ui/Test/Tests.Rules.Ui.csproj
@@ -63,7 +63,7 @@
     <Compile Include="UseSTAThreadAttributeOnSWFEntryPointsTest.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/rules/Test.Rules/Test.Rules.csproj b/gendarme/rules/Test.Rules/Test.Rules.csproj
index 4fdacaef..90d6d92f 100755
--- a/gendarme/rules/Test.Rules/Test.Rules.csproj
+++ b/gendarme/rules/Test.Rules/Test.Rules.csproj
@@ -49,7 +49,7 @@
     <Compile Include="Fixtures\AssemblyRuleTestFixture.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/swf-wizard-runner/swf-wizard-runner.csproj b/gendarme/swf-wizard-runner/swf-wizard-runner.csproj
index 65c0d8c5..798d626f 100644
--- a/gendarme/swf-wizard-runner/swf-wizard-runner.csproj
+++ b/gendarme/swf-wizard-runner/swf-wizard-runner.csproj
@@ -78,7 +78,7 @@
     <None Include="Resources\gendarme.png" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+    <ProjectReference Include="..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

       <Name>Mono.Cecil</Name>

     </ProjectReference>

diff --git a/gendarme/tools/unsupported/typeref/typeref.csproj b/gendarme/tools/unsupported/typeref/typeref.csproj
index ea1b2096..b0a92543 100644
--- a/gendarme/tools/unsupported/typeref/typeref.csproj
+++ b/gendarme/tools/unsupported/typeref/typeref.csproj
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2262381F-297D-4AC7-8509-91DBF2429EB9}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>typeref</RootNamespace>
-    <AssemblyName>typeref</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\AssemblyStaticInfo.cs">
-      <Link>AssemblyStaticInfo.cs</Link>
-    </Compile>
-    <Compile Include="typeref.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\mcs\class\Mono.Cecil\Mono.Cecil.csproj">
-      <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>
-      <Name>Mono.Cecil</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{2262381F-297D-4AC7-8509-91DBF2429EB9}</ProjectGuid>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>typeref</RootNamespace>

+    <AssemblyName>typeref</AssemblyName>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="..\..\..\AssemblyStaticInfo.cs">

+      <Link>AssemblyStaticInfo.cs</Link>

+    </Compile>

+    <Compile Include="typeref.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\..\..\..\mono\mcs\class\Mono.Cecil\Mono.Cecil.csproj">

+      <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>

+      <Name>Mono.Cecil</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="Properties\" />

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->

 </Project>
\ No newline at end of file
diff --git a/gendarme/wix/Product.wxs b/gendarme/wix/Product.wxs
index 6afd9ecb..329b0682 100644
--- a/gendarme/wix/Product.wxs
+++ b/gendarme/wix/Product.wxs
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?define ProductShortName = "Gendarme" ?>

-<?define ProductVersion = "2.7.0" ?>

-<?define ProductVersionText = "2.7" ?>

+<?define ProductVersion = "2.8.0" ?>

+<?define ProductVersionText = "2.8" ?>

 <?define Manufacturer = "Novell" ?>

-<?define UpgradeCode = "d7c83968-def2-4614-81f2-a3eefc9bc6b3" ?>

+<?define UpgradeCode = "D7C83968-DEF2-4614-81F2-A3EEFC9BC6B3" ?>

 

 <?define GendarmeBin=..\console\bin\$(var.Configuration)?>

 <?define GendarmeRoot=..?>

@@ -15,12 +15,6 @@
 		<Package Id="*" Compressed="yes" Description="$(var.ProductShortName) $(var.ProductVersionText) ($(var.ProductVersion))" InstallerVersion="200" ShortNames="no" Manufacturer="$(var.Manufacturer)" />

 		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />

 

-    <!-- Ensure .Net Framework 3.5 is installed -->

-    <PropertyRef Id="NETFRAMEWORK35" />

-    <Condition Message="This setup requires the .NET Framework 3.5 to be installed.">

-      Installed OR NETFRAMEWORK35

-    </Condition>

-

     <!-- Major upgrade -->

     <Upgrade Id="$(var.UpgradeCode)">

       <UpgradeVersion Minimum="$(var.ProductVersion)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED" />

@@ -31,9 +25,9 @@
 			<Directory Id="ProgramFilesFolder">

 				<Directory Id="INSTALLLOCATION" Name="Gendarme">

           

-					<Component Id="ProductComponent" Guid="93fe542d-d350-4329-ac61-d1bb9c20f26a">

+					<Component Id="ProductComponent" Guid="93FE542D-D350-4329-AC61-D1BB9C20F26A">

             <!-- Gendarme files -->

-            <File Name="GendarmeWizard.exe" Source="$(var.GendarmeBin)\GendarmeWizard.exe">

+            <File Name="GendarmeWizard.exe" Source="$(var.GendarmeBin)\GendarmeWizard.exe" KeyPath="yes">

               <Shortcut Id="gen_shortcut" Directory="ProgramMenuDir" Name="$(var.ProductShortName)" LongName="$(var.ProductShortName) $(var.ProductVersionText)" WorkingDirectory='INSTALLLOCATION' Icon="GendarmeWizard.exe" IconIndex="0" Advertise="yes" />

             </File>

             <File Name="gendarme.exe" Source="$(var.GendarmeBin)\gendarme.exe" />

@@ -87,13 +81,16 @@
     

     <!-- Sequences -->

     <InstallExecuteSequence>

+      <!-- Because we have a launch condition that uses the results of FindRelatedProducts, put it first. -->

+      <LaunchConditions After="FindRelatedProducts" />

       <RemoveExistingProducts After="InstallValidate" />

     </InstallExecuteSequence>

 

-    <InstallUISequence>

-      <!-- Because we have a launch condition that uses the results of FindRelatedProducts, put it first. -->

-      <LaunchConditions After="FindRelatedProducts" />

-    </InstallUISequence>

+    <!-- Ensure .Net Framework 3.5 is installed -->

+    <PropertyRef Id="NETFRAMEWORK35" />

+    <Condition Message="This setup requires the .NET Framework 3.5 to be installed.">

+      <![CDATA[Installed OR NETFRAMEWORK35]]>

+    </Condition>

 

     <!-- This enables the license screen and where to install screen -->

     <Property Id="WIXUI_INSTALLDIR">INSTALLLOCATION</Property>

diff --git a/gendarme/wix/wix.wixproj b/gendarme/wix/wix.wixproj
index 547ac43c..57cf6cb9 100644
--- a/gendarme/wix/wix.wixproj
+++ b/gendarme/wix/wix.wixproj
@@ -17,6 +17,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

     <OutputPath>bin\$(Configuration)\</OutputPath>

     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>

+    <SuppressAllWarnings>False</SuppressAllWarnings>

+    <Pedantic>False</Pedantic>

+    <VerboseOutput>False</VerboseOutput>

   </PropertyGroup>

   <ItemGroup>

     <Compile Include="Product.wxs" />