diff --git a/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.NonWindows.targets b/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.NonWindows.targets
new file mode 100644
index 0000000..5bad9aa
--- /dev/null
+++ b/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.NonWindows.targets
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="Build">
+    <Message Text="Skipping LiamWorkflowDiagnostics on non-Windows because the WPF diagnostics tool requires Windows MSBuild." Importance="high" />
+    <MakeDir Directories="$(OutputPath)" />
+    <WriteLinesToFile File="$(OutputPath)LiamWorkflowDiagnostics.skipped.txt" Lines="Skipped on non-Windows because the WPF diagnostics tool requires Windows MSBuild." Overwrite="true" />
+  </Target>
+
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+
+  <Target Name="Clean">
+    <Delete Files="$(OutputPath)LiamWorkflowDiagnostics.skipped.txt" />
+  </Target>
+</Project>
diff --git a/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.csproj b/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.csproj
index a4613db..e49284c 100644
--- a/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.csproj
+++ b/LiamWorkflowDiagnostics/LiamWorkflowDiagnostics.csproj
@@ -116,14 +116,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="Build" Condition=" '$(OS)' != 'Windows_NT' ">
-    <Message Text="Skipping LiamWorkflowDiagnostics on non-Windows because the WPF diagnostics tool requires Windows MSBuild." Importance="high" />
-    <MakeDir Directories="$(OutputPath)" />
-    <WriteLinesToFile File="$(OutputPath)LiamWorkflowDiagnostics.skipped.txt" Lines="Skipped on non-Windows because the WPF diagnostics tool requires Windows MSBuild." Overwrite="true" />
-  </Target>
-  <Target Name="Rebuild" Condition=" '$(OS)' != 'Windows_NT' " DependsOnTargets="Clean;Build" />
-  <Target Name="Clean" Condition=" '$(OS)' != 'Windows_NT' ">
-    <Delete Files="$(OutputPath)LiamWorkflowDiagnostics.skipped.txt" />
-  </Target>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="LiamWorkflowDiagnostics.NonWindows.targets" Condition=" '$(OS)' != 'Windows_NT' " />
 </Project>