diff --git a/ChaosBuild.ProjectAnalyzer.SDK.csproj b/ChaosBuild.ProjectAnalyzer.SDK.csproj
new file mode 100644
index 0000000..45d2921
--- /dev/null
+++ b/ChaosBuild.ProjectAnalyzer.SDK.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ProjectStyle>SDK</ProjectStyle>
+    <ChaosAnalyzers_CleanCode_Analyzer_TF>netstandard2.0</ChaosAnalyzers_CleanCode_Analyzer_TF>
+  </PropertyGroup>
+
+  <Import Project="ChaosBuild.ProjectAnalyzer.props" />
+
+  <!-- Included Files -->
+  <ItemGroup>
+    <Compile Include="source/**/*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.10.4" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/ChaosBuild.ProjectAnalyzer.csproj b/ChaosBuild.ProjectAnalyzer.VS.csproj
similarity index 53%
rename from ChaosBuild.ProjectAnalyzer.csproj
rename to ChaosBuild.ProjectAnalyzer.VS.csproj
index cc6b566..44b79f8 100644
--- a/ChaosBuild.ProjectAnalyzer.csproj
+++ b/ChaosBuild.ProjectAnalyzer.VS.csproj
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import
-    Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-    Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
+    Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props"
+    Condition="Exists('$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props')"
     />
 
-  <!-- Project Metadata -->
   <PropertyGroup>
-    <AssemblyName>ChaosBuild.ProjectAnalyzer</AssemblyName>
-    <RootNamespace>ChaosBuild.ProjectAnalyzer</RootNamespace>
-    <ProjectGuid>{5071A341-46B3-45DD-807E-A6F58053B870}</ProjectGuid>
+    <ProjectStyle>VS</ProjectStyle>
+    <ChaosAnalyzers_CleanCode_Analyzer_TF>net4.5</ChaosAnalyzers_CleanCode_Analyzer_TF>
   </PropertyGroup>
 
-  <!-- Properties -->
-  <Import Project="submodules/ChaosPresets.Targets/Properties/Library.targets" />
+  <Import Project="submodules/ChaosPresets.Targets/Frameworks/net4.5.2.targets" />
   <Import Project="submodules/ChaosPresets.Targets/Paths/Output/bin.targets" />
-  <PropertyGroup>
-    <DocumentationFile>$(ProjectDir)$(OutputPath)$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
+  <Import Project="ChaosBuild.ProjectAnalyzer.props" />
 
-  <!-- Configuration and Platform -->
-  <Import Project="submodules/ChaosPresets.Targets/Configurations.targets" />
+  <!-- Included Files -->
+  <ItemGroup>
+    <Compile Include="source\**\*.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="packages.config" />
+  </ItemGroup>
 
   <!-- References -->
-  <Import Project="submodules/ChaosPresets.References/ProjectReferences/ChaosBuild.Solution.targets" />
   <ItemGroup>
     <Reference Include="System" />
-
     <Reference Include="Microsoft.Build.Framework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll</HintPath>
       <Private>True</Private>
@@ -37,16 +34,6 @@
     </Reference>
   </ItemGroup>
 
-  <!-- Analyzers -->
-  <Import Project="submodules/ChaosPresets.References/Analyzers/ChaosAnalyzers.CleanCode.targets" />
-
-  <!-- Included Files -->
-  <ItemGroup>
-    <Compile Include="source\**\*.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="packages.config" />
-  </ItemGroup>
-
   <!-- Default Targets for Building CSharp Projects -->
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ChaosBuild.ProjectAnalyzer.props b/ChaosBuild.ProjectAnalyzer.props
new file mode 100644
index 0000000..c5562b6
--- /dev/null
+++ b/ChaosBuild.ProjectAnalyzer.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Project Metadata -->
+  <PropertyGroup>
+    <AssemblyName>ChaosBuild.ProjectAnalyzer</AssemblyName>
+    <RootNamespace>ChaosBuild.ProjectAnalyzer</RootNamespace>
+    <ProjectGuid>{5071A341-46B3-45DD-807E-A6F58053B870}</ProjectGuid>
+  </PropertyGroup>
+
+  <!-- Properties -->
+  <Import Project="submodules/ChaosPresets.Targets/Properties/OutputType/Library.targets" />
+  <Import Project="submodules/ChaosPresets.Targets/Properties/ProjectStyle/$(ProjectStyle).targets" />
+
+  <!-- Configurations -->
+  <Import Project="submodules/ChaosPresets.Targets/Configurations.targets" />
+
+  <!-- References -->
+  <Import Project="submodules/ChaosPresets.References/ProjectReferences/ChaosBuild.Solution.targets" />
+
+  <!-- Analyzers -->
+  <Import Project="submodules/ChaosPresets.References/Analyzers/ChaosAnalyzers.CleanCode.targets" />
+
+</Project>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..05bcf02
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="submodules/ChaosPresets.Targets/Frameworks/netstandard2.0.targets" />
+  <Import Project="submodules/ChaosPresets.Targets/Paths/Output/bin.targets" />
+</Project>
\ No newline at end of file
diff --git a/submodules/ChaosPresets.References b/submodules/ChaosPresets.References
index b35db0d..bcdb018 160000
--- a/submodules/ChaosPresets.References
+++ b/submodules/ChaosPresets.References
@@ -1 +1 @@
-Subproject commit b35db0dbdd076b04bcc3fd21c888c4ee804b467e
+Subproject commit bcdb018b603a2793ded2ffacca92a04328a3942f
diff --git a/submodules/ChaosPresets.Targets b/submodules/ChaosPresets.Targets
index d391f3b..7da9c1f 160000
--- a/submodules/ChaosPresets.Targets
+++ b/submodules/ChaosPresets.Targets
@@ -1 +1 @@
-Subproject commit d391f3b4342f83f45ba8597bfe4b04c4b826bd9c
+Subproject commit 7da9c1f6e4382970e6760dd26fd65570697df0ec