diff --git a/doc/Nuclei.Nunit.Extensions.Documentation/Nuclei.Nunit.Extensions.Documentation.csproj b/doc/Nuclei.Nunit.Extensions.Documentation/Nuclei.Nunit.Extensions.Documentation.csproj
index eb1e425..3e5bb5a 100644
--- a/doc/Nuclei.Nunit.Extensions.Documentation/Nuclei.Nunit.Extensions.Documentation.csproj
+++ b/doc/Nuclei.Nunit.Extensions.Documentation/Nuclei.Nunit.Extensions.Documentation.csproj
@@ -18,7 +18,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nuclei.Nunit.Extensions.Documentation</RootNamespace>
     <AssemblyName>Nuclei.Nunit.Extensions.Documentation</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -27,18 +27,11 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup>
     <LogFile>..\..\build\logs\docfx.txt</LogFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web.DynamicData" />
diff --git a/doc/Nuclei.Nunit.Extensions.Samples/Nuclei.Nunit.Extensions.Samples.csproj b/doc/Nuclei.Nunit.Extensions.Samples/Nuclei.Nunit.Extensions.Samples.csproj
index ba17c9a..3b9dfe2 100644
--- a/doc/Nuclei.Nunit.Extensions.Samples/Nuclei.Nunit.Extensions.Samples.csproj
+++ b/doc/Nuclei.Nunit.Extensions.Samples/Nuclei.Nunit.Extensions.Samples.csproj
@@ -20,26 +20,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nuclei.Nunit.Extensions.Samples</RootNamespace>
     <AssemblyName>Nuclei.Nunit.Extensions.Samples</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</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>
   <Import Project="$(SolutionDir)\base.props" />
   <ItemGroup>
     <Reference Include="Nuclei.Build, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ee5b68ec5ad4ef93, processorArchitecture=MSIL">
diff --git a/src/base.props b/src/base.props
index 627015f..89c3e71 100644
--- a/src/base.props
+++ b/src/base.props
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0"
-         DefaultTargets="Run"
-         xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <!--
             A flag that indicates whether the current project is a Test project. The value will be set in the Visual
@@ -39,11 +37,6 @@
             for all projects that include the MsBuild.Projects.XXXX NuGet package.
         -->
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <!--
-            The version of the .NET framework at which the assemblies should be targeted. This value is set
-            for all projects that include the MsBuild.Projects.XXXX NuGet package.
-        -->
-        <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
 
         <!--
             The platform against which the code should be compiled. Note that the target should not have space in it,
@@ -106,63 +99,36 @@
         Debug configuration
     -->
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <DefineConstants>DEBUG;CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
+        <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <DefineDebug>true</DefineDebug>
         <DefineTrace>true</DefineTrace>
         <Optimize>false</Optimize>
         <OutputPath Condition=" '$(IsWebProject)' == 'false' ">bin\Debug\</OutputPath>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' != 'true' ">false</RunCodeAnalysis>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' == 'true' ">true</RunCodeAnalysis>
+        <OutputPath Condition=" '$(IsWebProject)' == 'true' ">bin\</OutputPath>
     </PropertyGroup>
 
     <!--
         Release configuration
     -->
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <DefineConstants>CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
+        <DefineConstants>$(DefineConstants)</DefineConstants>
         <DebugSymbols>false</DebugSymbols>
         <DebugType>pdbonly</DebugType>
         <DefineDebug>false</DefineDebug>
         <DefineTrace>true</DefineTrace>
         <Optimize>true</Optimize>
         <OutputPath Condition=" '$(IsWebProject)' == 'false' ">bin\Release\</OutputPath>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' != 'true' ">false</RunCodeAnalysis>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' == 'true' ">true</RunCodeAnalysis>
-    </PropertyGroup>
-
-    <!--
-        Deploy configuration
-    -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Deploy' ">
-        <DebugSymbols>false</DebugSymbols>
-        <DebugType>pdbonly</DebugType>
-        <DefineDebug>false</DefineDebug>
-        <DefineTrace>true</DefineTrace>
-        <Optimize>true</Optimize>
-        <OutputPath Condition=" '$(IsWebProject)' == 'false' ">bin\Deploy\</OutputPath>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' != 'true' ">false</RunCodeAnalysis>
-        <RunCodeAnalysis Condition=" '$(ShouldPerformCodeAnalysis)' == 'true' ">true</RunCodeAnalysis>
+        <OutputPath Condition=" '$(IsWebProject)' == 'true' ">bin\</OutputPath>
     </PropertyGroup>
 
     <!-- Generate the XML documentation file -->
     <PropertyGroup>
-        <!--
-            A flag indicating whether or not the XML documentation file should be generated during the compilation process.
-            Note that if 'WarningsAsErrors' is enabled then missing documentation will generate errors that stop the
-            build process.
-
-            If documentation should only be generated for non-test assemblies then add the '!$(IsTest)' condition
-            to the property.
-        -->
-        <GenerateDocumentation>false</GenerateDocumentation>
-        <GenerateDocumentation Condition=" '$(IsTest)' == 'false' ">true</GenerateDocumentation>
-
         <!--
             The full file path where the XML documentation file should be created.
         -->
-        <DocumentationFile Condition=" '$(GenerateDocumentation)' == 'true' AND '$(IsTest)' == 'false'">$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
+        <DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
     </PropertyGroup>
 
     <!-- Default includes -->
@@ -170,8 +136,8 @@
         <AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" />
     </ItemGroup>
     <ItemGroup>
-    <CodeAnalysisDictionary Include="$(MSBuildThisFileDirectory)\..\CustomDictionary.xml">
-        <Link>CustomDictionary.xml</Link>
-    </CodeAnalysisDictionary>
-  </ItemGroup>
+        <CodeAnalysisDictionary Include="$(MSBuildThisFileDirectory)\..\CustomDictionary.xml">
+            <Link>CustomDictionary.xml</Link>
+        </CodeAnalysisDictionary>
+    </ItemGroup>
 </Project>
\ No newline at end of file