From e58cc3a7dd76a8467f84119e8a0c4e473ebcc709 Mon Sep 17 00:00:00 2001
From: SteveGilham <SteveGilham@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:57:08 +0100
Subject: [PATCH] Simplify the use of the AltCover MSBuild tasks via the
 associated package-level `.targets` file

---
 AltCover.Api.Tests/AltCover.Api.Tests.fsproj |   2 +-
 AltCover.Api.Tests/FSApiTests.fs             |   2 +-
 AltCover.Tests/AltCover.Tests.fsproj         |   2 +-
 AltCover.Tests/Runner.Tests.fs               |   2 +-
 AltCover.Tests/Tests3.fs                     |   2 +-
 AltCover.sln                                 |   1 +
 ReleaseNotes.md                              |   1 +
 nupkg/build/AltCover.proj                    | 220 +++++++++++++++++++
 nupkg/build/AltCover.targets                 | 218 +-----------------
 9 files changed, 228 insertions(+), 222 deletions(-)
 create mode 100644 nupkg/build/AltCover.proj

diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
index 26659449..a4ac8592 100644
--- a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
+++ b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\nupkg\build\AltCover.targets" Link="AltCover.targets" />
+    <EmbeddedResource Include="..\nupkg\build\AltCover.proj" Link="AltCover.proj" />
     <EmbeddedResource Include="..\AltCover.Tests\CompressBoth.xml" Link="CompressBoth.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\Compressible.xml" Link="Compressible.xml" />
     <EmbeddedResource Include="..\AltCover.Tests\CompressInterior.xml" Link="CompressInterior.xml" />
diff --git a/AltCover.Api.Tests/FSApiTests.fs b/AltCover.Api.Tests/FSApiTests.fs
index 787ed706..2e6e16fb 100644
--- a/AltCover.Api.Tests/FSApiTests.fs
+++ b/AltCover.Api.Tests/FSApiTests.fs
@@ -1148,7 +1148,7 @@ module FSApiTests =
       Assembly
         .GetExecutingAssembly()
         .GetManifestResourceNames()
-      |> Seq.find _.EndsWith("AltCover.targets", StringComparison.Ordinal)
+      |> Seq.find _.EndsWith("AltCover.proj", StringComparison.Ordinal)
 
     use stream =
       Assembly
diff --git a/AltCover.Tests/AltCover.Tests.fsproj b/AltCover.Tests/AltCover.Tests.fsproj
index ce7b18b4..890d0c3a 100644
--- a/AltCover.Tests/AltCover.Tests.fsproj
+++ b/AltCover.Tests/AltCover.Tests.fsproj
@@ -40,7 +40,7 @@
     <EmbeddedResource Include="AltCover.Usage.txt" />
     <EmbeddedResource Include="AltCover.Runner.Usage.txt" />
     <EmbeddedResource Include="coverage-04.xsd" />
-    <EmbeddedResource Include="..\nupkg\build\AltCover.targets" Link="AltCover.targets" />
+    <EmbeddedResource Include="..\nupkg\build\AltCover.proj" Link="AltCover.proj" />
     <EmbeddedResource Include="HandRolledMonoCoverage.xml" />
     <EmbeddedResource Include="Sample1WithOpenCover.xml" />
     <EmbeddedResource Include="Sample1ClassExclusion.xml" />
diff --git a/AltCover.Tests/Runner.Tests.fs b/AltCover.Tests/Runner.Tests.fs
index 91b6491c..7eb938a9 100644
--- a/AltCover.Tests/Runner.Tests.fs
+++ b/AltCover.Tests/Runner.Tests.fs
@@ -910,7 +910,7 @@ module AltCoverRunnerTests =
       Assembly
         .GetExecutingAssembly()
         .GetManifestResourceNames()
-      |> Seq.find _.EndsWith("AltCover.targets", StringComparison.Ordinal)
+      |> Seq.find _.EndsWith("AltCover.proj", StringComparison.Ordinal)
 
     use stream =
       Assembly
diff --git a/AltCover.Tests/Tests3.fs b/AltCover.Tests/Tests3.fs
index 134e1a24..999a99de 100644
--- a/AltCover.Tests/Tests3.fs
+++ b/AltCover.Tests/Tests3.fs
@@ -203,7 +203,7 @@ module AltCoverTests3 =
       Assembly
         .GetExecutingAssembly()
         .GetManifestResourceNames()
-      |> Seq.find _.EndsWith("AltCover.targets", StringComparison.Ordinal)
+      |> Seq.find _.EndsWith("AltCover.proj", StringComparison.Ordinal)
 
     use stream =
       Assembly
diff --git a/AltCover.sln b/AltCover.sln
index ee121eb6..222e0b98 100644
--- a/AltCover.sln
+++ b/AltCover.sln
@@ -38,6 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Items", "Build Items"
 		Build\actions.fs = Build\actions.fs
 		Build\AddStrongName.fsx = Build\AddStrongName.fsx
 		Build\AltCover.nuspec = Build\AltCover.nuspec
+		nupkg\build\AltCover.proj = nupkg\build\AltCover.proj
 		nupkg\build\AltCover.props = nupkg\build\AltCover.props
 		nupkg\build\AltCover.targets = nupkg\build\AltCover.targets
 		Build\Apply-Xslt.ps1 = Build\Apply-Xslt.ps1
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index a7c6c00f..b36be5c9 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -5,6 +5,7 @@ read the FAQ : https://github.com/SteveGilham/altcover/wiki/FAQ
 
 # (Habu series release 28)
 * [BREAKING; BUGFIX] Issue #206 : Update to net6+ for `dotnet test` integration and respect the `$(IsTestProject)` setting from the `Microsoft.NET.Test.Sdk` package.
+* Simplify the use of the AltCover MSBuild tasks via the associated package-level `.targets` file by not even including the `VSTest` integration unless both `'$(AltCover)' == 'true' AND '$(IsTestProject)' == 'true'`.
 * Mitigate instances of `System.IO.IOException: The process cannot access the file '[coverage report]' because it is being used by another process.`
 
 # 8.8.10 (Habu series release 27)
diff --git a/nupkg/build/AltCover.proj b/nupkg/build/AltCover.proj
new file mode 100644
index 00000000..591fd61b
--- /dev/null
+++ b/nupkg/build/AltCover.proj
@@ -0,0 +1,220 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <AltCoverInPlace Condition="'$(AltCoverInPlace)' == ''">false</AltCoverInPlace>
+    <AltCoverVerbosity Condition="'$(AltCoverVerbosity)' == ''">Info</AltCoverVerbosity>
+    <AltCoverPreFlightCheck Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)')  AND '$(AltCoverInPlace)' != 'false'">Fail</AltCoverPreFlightCheck>
+    <AltCoverPreFlightCheck Condition="!Exists('$(AltCoverSavedDirectory)_$(ProjectName)') OR  '$(AltCoverInPlace)' == 'false'">OK</AltCoverPreFlightCheck>
+  </PropertyGroup>
+
+  <Target Name="AltCoverPreFlight" Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">
+    <Message Condition="Exists('$(AltCoverInstrumentedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'"
+             Importance="High"
+             Text="Directory '$(AltCoverInstrumentedDirectory)_$(ProjectName)' exists from a previous run.  Forcibly deleting it" />
+    <RemoveDir Directories="$(AltCoverInstrumentedDirectory)_$(ProjectName)"
+               Condition="Exists('$(AltCoverInstrumentedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'" />
+  </Target>
+
+  <Target Name="AltCoverPreFlight" Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' != 'false'">
+    <Error Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' != 'true'"
+           Text="Directory '$(AltCoverSavedDirectory)_$(ProjectName)' exists from a previous run.  Either manually examine and delete it, or run with '/p:AltCoverForce=true' to force deletion" />
+    <Warning Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'"
+             Text="Directory '$(AltCoverSavedDirectory)_$(ProjectName)' exists from a previous run.  Forcibly deleting it" />
+    <RemoveDir Directories="$(AltCoverSavedDirectory)_$(ProjectName)"
+               Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'" />
+  </Target>
+
+  <Target Name="AltCoverRunPreparation" Condition="'$(AltCover)' == 'true'">
+    <ItemGroup>
+      <AltCoverXmlOutput Include="$([MSBuild]::Unescape($(AltCoverReport)))" />
+      <AltCoverInputDirectory Include="$(TargetDir)" />
+      <AltCoverOutputDirectory Condition="'$(AltCoverInPlace)' == 'false'" Include="$(AltCoverInstrumentedDirectory)_$(ProjectName)" />
+      <AltCoverOutputDirectory Condition="'$(AltCoverInPlace)' != 'false'" Include="$(AltCoverSavedDirectory)_$(ProjectName)" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <AltCoverDollarChar>$</AltCoverDollarChar>
+      <AltCoverProjectName>$(AltCoverDollarChar)(ProjectName)</AltCoverProjectName>
+      <AltCoverSolutionDir>$(AltCoverDollarChar)(SolutionDir)</AltCoverSolutionDir>
+      <AltCoverNewGuid>$(AltCoverDollarChar)([System.Guid]::NewGuid())</AltCoverNewGuid>
+      <AltCoverReport Condition="'$(AltCoverReport)' != '' AND '$(TargetFrameworks)' != ''">%(AltCoverXmlOutput.RootDir)/%(AltCoverXmlOutput.Directory)/%(AltCoverXmlOutput.Filename).$(TargetFramework)%(AltCoverXmlOutput.Extension)</AltCoverReport>
+      <AltCoverReport Condition="'$(AltCoverReport)' == '' AND '$(TargetFrameworks)' == ''">$(ProjectDir)coverage$(AltCoverFileExtension)</AltCoverReport>
+      <AltCoverReport Condition="'$(AltCoverReport)' == '' AND '$(TargetFrameworks)' != ''">$(ProjectDir)coverage.$(TargetFramework)$(AltCoverFileExtension)</AltCoverReport>
+      <AltCoverShowStatic Condition="'$(AltCoverShowStatic' != '+' AND '$(AltCoverShowStatic' != '++'">-</AltCoverShowStatic>
+      <AltCoverReportFormat Condition="'$(AltCoverReportFormat)' == ''">OpenCover</AltCoverReportFormat>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <AltCoverReport1>$(AltCoverReport.Replace($(AltCoverProjectName),$(ProjectName)).Replace($(AltCoverNewGuid),$([System.Guid]::NewGuid().ToString())))</AltCoverReport1>
+      <AltCoverReport2 Condition="'$(SolutionDir)' == ''">$(AltCoverReport1.Replace($(AltCoverSolutionDir),'')</AltCoverReport2>
+      <AltCoverReport2 Condition="'$(SolutionDir)' != ''">$(AltCoverReport1.Replace($(AltCoverSolutionDir),$(SolutionDir)))</AltCoverReport2>
+    </PropertyGroup>
+
+    <AltCover.PowerShell Condition="'$(AltCoverImportModule)' == 'true'" />
+    <AltCover.GetVersion Condition="'$(AltCoverGetVersion)' == 'true'" />
+    <AltCover.Prepare
+      InputDirectories="@(AltCoverInputDirectory)"
+      OutputDirectories="@(AltCoverOutputDirectory)"
+      InPlace="$(AltCoverInPlace)"
+      SymbolDirectories="$(AltCoverSymbolDirectories.Split('|'))"
+      Dependencies="$(AltCoverDependencyList.Trim('|').Split('|'))"
+      Keys="$(AltCoverKeys.Split('|'))"
+      StrongNameKey="$(AltCoverStrongNameKey)"
+      Report="$(AltCoverReport2)"
+      FileFilter="$(AltCoverFileFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      AssemblyFilter="$(AltCoverAssemblyFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      AssemblyExcludeFilter="$(AltCoverAssemblyExcludeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      TypeFilter="$(AltCoverTypeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      MethodFilter="$(AltCoverMethodFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      AttributeFilter="$(AltCoverAttributeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      PathFilter="$(AltCoverPathFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
+      AttributeTopLevel="$(AltCoverAttributeTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
+      TypeTopLevel="$(AltCoverTypeTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
+      MethodTopLevel="$(AltCoverMethodTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
+      ReportFormat="$(AltCoverReportFormat)"
+      CallContext="$(AltCoverCallContext.Split('|'))"
+      ZipFile="$(AltCoverZipFile)"
+      MethodPoint="$(AltCoverMethodPoint)"
+      SingleVisit="$(AltCoverSingle)"
+      LineCover="$(AltCoverLineCover)"
+      BranchCover="$(AltCoverBranchCover)"
+      SourceLink="$(AltCoverSourceLink)"
+      LocalSource="$(AltCoverLocalSource)"
+      VisibleBranches="$(AltCoverVisibleBranches)"
+      ShowStatic="$(AltCoverShowStatic)"
+      ShowGenerated="$(AltCoverShowGenerated)"
+      Verbosity="$(AltCoverVerbosity)"
+      Trivia="$(AltCoverTrivia)" />
+  </Target>
+
+  <!-- Override Microsoft.TestPlatform.targets to do coverage work -->
+  <Target Name="VSTest" DependsOnTargets="ShowInfoMessageIfProjectHasNoIsTestProjectProperty">
+    <CallTarget Targets="AltCoverVSTestPreFlight" ContinueOnError="ErrorAndStop" />
+    <CallTarget Targets="AltCoverVSTestCore" />
+  </Target>
+
+  <!-- As per the first part of Microsoft.TestPlatform.targets v2.1.300, but with pre-flight checks clause -->
+  <Target Name="AltCoverVSTestPreFlight">
+    <CallTarget Targets="AltCoverPreFlight" Condition="'$(IsTestProject)' == 'true'" />
+    <CallTarget Condition="'$(VSTestNoBuild)' != 'true' AND '$(IsTestProject)' == 'true'" Targets="BuildProject" />
+    <CallTarget Condition="'$(IsTestProject)' != 'true'" Targets="ShowCallOfVSTestTaskWithParameter" />
+    <CallTarget Condition="'$(IsTestProject)' == 'true'" Targets="AltCoverRunPreparation" ContinueOnError="ErrorAndStop" />
+  </Target>
+
+  <!-- As per the second part Microsoft.TestPlatform.targets v2.1.809, but with OnError clause -->
+  <Target Name="AltCoverVSTestCore">
+    <PropertyGroup>
+      <AltCoverTestTargetPath Condition="'$(AltCover)' != 'true' OR '$(AltCoverInPlace)' != 'false'">$(TargetPath)</AltCoverTestTargetPath>
+      <AltCoverTestTargetPath Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">$([System.IO.Path]::Combine($(AltCoverInstrumentedDirectory)_$(ProjectName), $(TargetFileName)))</AltCoverTestTargetPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <AltCoverBuildItem Include="@(ApplicationDefinition)" />
+      <AltCoverBuildItem Include="@(EditorConfigFiles)" />
+      <AltCoverBuildItem Include="@(XamlAppDef)" />
+      <AltCoverBuildItem Include="@(DesignData)" />
+      <AltCoverBuildItem Include="@(CodeAnalysisDictionary)" />
+      <AltCoverBuildItem Include="@(None)" />
+      <AltCoverBuildItem Include="@(Resource)" />
+      <AltCoverBuildItem Include="@(EntityDeploy)" />
+      <AltCoverBuildItem Include="@(Compile)" />
+      <AltCoverBuildItem Include="@(SplashScreen)" />
+      <AltCoverBuildItem Include="@(Content)" />
+      <AltCoverBuildItem Include="@(EmbeddedResource)" />
+      <AltCoverBuildItem Include="@(Page)" />
+      <AltCoverBuildItem Include="@(DesignDataWithDesignTimeCreatableTypes)" />
+      <AltCoverBuildItem Include="@(AdditionalFiles)" />
+    </ItemGroup>
+
+    <AltCover.ContingentCopy
+      Condition="'$(AltCoverTestTargetPath)' != '$(TargetPath)' AND ('%(AltCoverBuildItem.CopyToOutputDirectory)' == 'Always' OR '%(AltCoverBuildItem.CopyToOutputDirectory)' == 'PreserveNewest' )"
+      RelativeDir="%(AltCoverBuildItem.RelativeDir)"
+      ProjectDir="$(ProjectDir)"
+      CopyToOutputDirectory="%(AltCoverBuildItem.CopyToOutputDirectory)"
+      FileName="%(AltCoverBuildItem.FullPath)"
+      BuildOutputDirectory="$(TargetDir)"
+      InstrumentDirectory="$(AltCoverInstrumentedDirectory)_$(ProjectName)" />
+
+    <AltCover.RunSettings
+      TestSetting="$(VSTestSetting)"
+      Verbosity="$(AltCoverVerbosity)">
+      <Output TaskParameter="Extended" PropertyName="VSTestSetting" />
+    </AltCover.RunSettings>
+
+    <CallTarget Targets="ShowCallOfVSTestTaskWithParameter" />
+
+    <Microsoft.TestPlatform.Build.Tasks.VSTestTask
+      TestFileFullPath="$(AltCoverTestTargetPath)"
+      VSTestSetting="$([MSBuild]::ValueOrDefault($(VSTestSetting), '$(RunSettingsFilePath)'))"
+      VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
+      VSTestFramework="$(TargetFrameworkMoniker)"
+      VSTestPlatform="$(PlatformTarget)"
+      VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
+      VSTestLogger="$(VSTestLogger)"
+      VSTestListTests="$(VSTestListTests)"
+      VSTestDiag="$(VSTestDiag)"
+      VSTestCLIRunSettings="$(VSTestCLIRunSettings)"
+      VSTestConsolePath="$(VSTestConsolePath)"
+      VSTestResultsDirectory="$(VSTestResultsDirectory)"
+      VSTestVerbosity="$(VSTestVerbosity)"
+      VSTestCollect="$(VSTestCollect)"
+      VSTestBlame="$(VSTestBlame)"
+      VSTestBlameCrash="$(VSTestBlameCrash)"
+      VSTestBlameCrashDumpType="$(VSTestBlameCrashDumpType)"
+      VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
+      VSTestBlameHang="$(VSTestBlameHang)"
+      VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
+      VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
+      VSTestTraceDataCollectorDirectoryPath="$(TraceDataCollectorDirectoryPath)"
+      VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
+      VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)"
+      VSTestNoLogo="$(VSTestNoLogo)"
+      Condition="'$(IsTestProject)' == 'true'" />
+
+    <OnError ExecuteTargets="AltCoverGenerateCoverageResult" Condition="'$(AltCoverFailFast)' != 'true'" />
+    <OnError ExecuteTargets="AltCoverTidy" Condition="'$(AltCoverFailFast)' == 'true'" />
+  </Target>
+
+  <Target Name="AltCoverDeleteTempRunSettingsFile">
+    <Message Text="Deleting $(VSTestSetting)" />
+    <Delete Files="$(VSTestSetting)">
+      <Output TaskParameter="DeletedFiles" ItemName="AltCoverDeletedList" />
+    </Delete>
+    <Message Text="Deleted files: '@(AltCoverDeletedList)'" />
+  </Target>
+
+  <Target Name="AltCoverTidy">
+    <ItemGroup>
+      <AltCoverRecorderGFiles Include="$(TargetDir)/AltCover.Recorder.g.*" />
+      <AltCoverSavedFiles Include="$(AltCoverSavedDirectory))_$(ProjectName)/*.*" />
+    </ItemGroup>
+    <CallTarget Targets="AltCoverDeleteTempRunSettingsFile"
+                Condition="$(VSTestSetting.EndsWith('.altcover.runsettings')) AND Exists($(VSTestSetting))" />
+    <Move SourceFiles="@(AltCoverSavedFiles)" DestinationFolder="$(TargetDir)" OverwriteReadOnlyFiles="true" Condition="'$(AltCoverInPlace)' != 'false'" />
+    <RemoveDir Directories="$(AltCoverSavedDirectory)_$(ProjectName)" Condition="Exists('$(AltCoverSavedDirectory))_$(ProjectName)') AND '$(AltCoverInPlace)' != 'false'" />
+    <AltCover.RetryDelete Files="@(AltCoverRecorderGFiles)" Condition="'$(AltCoverInPlace)' != 'false'" />
+  </Target>
+
+  <Target Name="AltCoverGenerateCoverageResult" AfterTargets="VSTest" Condition="'$(AltCover)' == 'true'">
+    <PropertyGroup>
+      <AltCoverColour Condition="'$(AltCoverShowSummary)' != ''">$(AltCoverShowSummary)</AltCoverColour>
+      <AltCoverColour Condition="'$(AltCoverShowSummary)' == ''">Foreground</AltCoverColour>
+      <AltCoverRecorderDirectory Condition="'$(AltCover)' != 'true' OR '$(AltCoverInPlace)' != 'false'">$(TargetDir)</AltCoverRecorderDirectory>
+      <AltCoverRecorderDirectory Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">$(AltCoverInstrumentedDirectory)_$(ProjectName)</AltCoverRecorderDirectory>
+    </PropertyGroup>
+
+    <AltCover.Collect
+      RecorderDirectory="$(AltCoverRecorderDirectory)"
+      LcovReport="$(AltCoverLcovReport)"
+      Threshold="$(AltCoverThreshold)"
+      Cobertura="$(AltCoverCobertura)"
+      SummaryFormat="$(AltCoverSummaryFormat)"
+      Verbosity="$(AltCoverVerbosity)">
+      <Output TaskParameter="Summary" PropertyName="AltCoverSummary" />
+    </AltCover.Collect>
+    <AltCover.Echo Condition="'$(AltCoverShowSummary)' != '' AND '$(AltCoverSummary)' !=''"
+                   Text="$(AltCoverSummary)" Colour="$(AltCoverColour)"
+                   Verbosity="$(AltCoverVerbosity)" />
+    <CallTarget Targets="AltCoverTidy" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/nupkg/build/AltCover.targets b/nupkg/build/AltCover.targets
index 6d86fd9c..3ad15aa5 100644
--- a/nupkg/build/AltCover.targets
+++ b/nupkg/build/AltCover.targets
@@ -29,221 +29,5 @@
   <UsingTask TaskName="AltCover.RetryDelete"
         AssemblyFile="$(AltCoverEngine)" />
 
-  <PropertyGroup>
-    <AltCoverInPlace Condition="'$(AltCoverInPlace)' == ''">false</AltCoverInPlace>
-    <AltCoverVerbosity Condition="'$(AltCoverVerbosity)' == ''">Info</AltCoverVerbosity>
-    <AltCoverPreFlightCheck Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)')  AND '$(AltCoverInPlace)' != 'false'">Fail</AltCoverPreFlightCheck>
-    <AltCoverPreFlightCheck Condition="!Exists('$(AltCoverSavedDirectory)_$(ProjectName)') OR  '$(AltCoverInPlace)' == 'false'">OK</AltCoverPreFlightCheck>
-  </PropertyGroup>
-
-  <Target Name="AltCoverPreFlight" Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">
-    <Message Condition="Exists('$(AltCoverInstrumentedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'"
-             Importance="High"
-             Text="Directory '$(AltCoverInstrumentedDirectory)_$(ProjectName)' exists from a previous run.  Forcibly deleting it" />
-    <RemoveDir Directories="$(AltCoverInstrumentedDirectory)_$(ProjectName)"
-               Condition="Exists('$(AltCoverInstrumentedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'" />
-  </Target>
-
-  <Target Name="AltCoverPreFlight" Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' != 'false'">
-    <Error Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' != 'true'"
-           Text="Directory '$(AltCoverSavedDirectory)_$(ProjectName)' exists from a previous run.  Either manually examine and delete it, or run with '/p:AltCoverForce=true' to force deletion" />
-    <Warning Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'"
-             Text="Directory '$(AltCoverSavedDirectory)_$(ProjectName)' exists from a previous run.  Forcibly deleting it" />
-    <RemoveDir Directories="$(AltCoverSavedDirectory)_$(ProjectName)"
-               Condition="Exists('$(AltCoverSavedDirectory)_$(ProjectName)') AND '$(AltCoverForce)' == 'true'" />
-  </Target>
-
-  <Target Name="AltCoverRunPreparation" Condition="'$(AltCover)' == 'true'">
-    <ItemGroup>
-      <AltCoverXmlOutput Include="$([MSBuild]::Unescape($(AltCoverReport)))" />
-      <AltCoverInputDirectory Include="$(TargetDir)" />
-      <AltCoverOutputDirectory Condition="'$(AltCoverInPlace)' == 'false'" Include="$(AltCoverInstrumentedDirectory)_$(ProjectName)" />
-      <AltCoverOutputDirectory Condition="'$(AltCoverInPlace)' != 'false'" Include="$(AltCoverSavedDirectory)_$(ProjectName)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <AltCoverDollarChar>$</AltCoverDollarChar>
-      <AltCoverProjectName>$(AltCoverDollarChar)(ProjectName)</AltCoverProjectName>
-      <AltCoverSolutionDir>$(AltCoverDollarChar)(SolutionDir)</AltCoverSolutionDir>
-      <AltCoverNewGuid>$(AltCoverDollarChar)([System.Guid]::NewGuid())</AltCoverNewGuid>
-      <AltCoverReport Condition="'$(AltCoverReport)' != '' AND '$(TargetFrameworks)' != ''">%(AltCoverXmlOutput.RootDir)/%(AltCoverXmlOutput.Directory)/%(AltCoverXmlOutput.Filename).$(TargetFramework)%(AltCoverXmlOutput.Extension)</AltCoverReport>
-      <AltCoverReport Condition="'$(AltCoverReport)' == '' AND '$(TargetFrameworks)' == ''">$(ProjectDir)coverage$(AltCoverFileExtension)</AltCoverReport>
-      <AltCoverReport Condition="'$(AltCoverReport)' == '' AND '$(TargetFrameworks)' != ''">$(ProjectDir)coverage.$(TargetFramework)$(AltCoverFileExtension)</AltCoverReport>
-      <AltCoverShowStatic Condition="'$(AltCoverShowStatic' != '+' AND '$(AltCoverShowStatic' != '++'">-</AltCoverShowStatic>
-      <AltCoverReportFormat Condition="'$(AltCoverReportFormat)' == ''">OpenCover</AltCoverReportFormat>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <AltCoverReport1>$(AltCoverReport.Replace($(AltCoverProjectName),$(ProjectName)).Replace($(AltCoverNewGuid),$([System.Guid]::NewGuid().ToString())))</AltCoverReport1>
-      <AltCoverReport2 Condition="'$(SolutionDir)' == ''">$(AltCoverReport1.Replace($(AltCoverSolutionDir),'')</AltCoverReport2>
-      <AltCoverReport2 Condition="'$(SolutionDir)' != ''">$(AltCoverReport1.Replace($(AltCoverSolutionDir),$(SolutionDir)))</AltCoverReport2>
-    </PropertyGroup>
-
-    <AltCover.PowerShell Condition="'$(AltCoverImportModule)' == 'true'" />
-    <AltCover.GetVersion Condition="'$(AltCoverGetVersion)' == 'true'" />
-    <AltCover.Prepare
-      InputDirectories="@(AltCoverInputDirectory)"
-      OutputDirectories="@(AltCoverOutputDirectory)"
-      InPlace="$(AltCoverInPlace)"
-      SymbolDirectories="$(AltCoverSymbolDirectories.Split('|'))"
-      Dependencies="$(AltCoverDependencyList.Trim('|').Split('|'))"
-      Keys="$(AltCoverKeys.Split('|'))"
-      StrongNameKey="$(AltCoverStrongNameKey)"
-      Report="$(AltCoverReport2)"
-      FileFilter="$(AltCoverFileFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      AssemblyFilter="$(AltCoverAssemblyFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      AssemblyExcludeFilter="$(AltCoverAssemblyExcludeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      TypeFilter="$(AltCoverTypeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      MethodFilter="$(AltCoverMethodFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      AttributeFilter="$(AltCoverAttributeFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      PathFilter="$(AltCoverPathFilter.Replace('\',%00).Replace('||',%01).Split('|'))"
-      AttributeTopLevel="$(AltCoverAttributeTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
-      TypeTopLevel="$(AltCoverTypeTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
-      MethodTopLevel="$(AltCoverMethodTopLevel.Replace('\',%00).Replace('||',%01).Split('|'))"
-      ReportFormat="$(AltCoverReportFormat)"
-      CallContext="$(AltCoverCallContext.Split('|'))"
-      ZipFile="$(AltCoverZipFile)"
-      MethodPoint="$(AltCoverMethodPoint)"
-      SingleVisit="$(AltCoverSingle)"
-      LineCover="$(AltCoverLineCover)"
-      BranchCover="$(AltCoverBranchCover)"
-      SourceLink="$(AltCoverSourceLink)"
-      LocalSource="$(AltCoverLocalSource)"
-      VisibleBranches="$(AltCoverVisibleBranches)"
-      ShowStatic="$(AltCoverShowStatic)"
-      ShowGenerated="$(AltCoverShowGenerated)"
-      Verbosity="$(AltCoverVerbosity)"
-      Trivia="$(AltCoverTrivia)" />
-  </Target>
-
-  <!-- Override Microsoft.TestPlatform.targets to do coverage work -->
-  <Target Name="VSTest" DependsOnTargets="ShowInfoMessageIfProjectHasNoIsTestProjectProperty">
-    <CallTarget Targets="AltCoverVSTestPreFlight" ContinueOnError="ErrorAndStop" />
-    <CallTarget Targets="AltCoverVSTestCore" />
-  </Target>
-
-  <!-- As per the first part of Microsoft.TestPlatform.targets v2.1.300, but with pre-flight checks clause -->
-  <Target Name="AltCoverVSTestPreFlight">
-    <CallTarget Targets="AltCoverPreFlight" Condition="'$(IsTestProject)' == 'true'" />
-    <CallTarget Condition="'$(VSTestNoBuild)' != 'true' AND '$(IsTestProject)' == 'true'" Targets="BuildProject" />
-    <CallTarget Condition="'$(IsTestProject)' != 'true'" Targets="ShowCallOfVSTestTaskWithParameter" />
-    <CallTarget Condition="'$(IsTestProject)' == 'true'" Targets="AltCoverRunPreparation" ContinueOnError="ErrorAndStop" />
-  </Target>
-
-  <!-- As per the second part Microsoft.TestPlatform.targets v2.1.809, but with OnError clause -->
-  <Target Name="AltCoverVSTestCore">
-    <PropertyGroup>
-      <AltCoverTestTargetPath Condition="'$(AltCover)' != 'true' OR '$(AltCoverInPlace)' != 'false'">$(TargetPath)</AltCoverTestTargetPath>
-      <AltCoverTestTargetPath Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">$([System.IO.Path]::Combine($(AltCoverInstrumentedDirectory)_$(ProjectName), $(TargetFileName)))</AltCoverTestTargetPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <AltCoverBuildItem Include="@(ApplicationDefinition)" />
-      <AltCoverBuildItem Include="@(EditorConfigFiles)" />
-      <AltCoverBuildItem Include="@(XamlAppDef)" />
-      <AltCoverBuildItem Include="@(DesignData)" />
-      <AltCoverBuildItem Include="@(CodeAnalysisDictionary)" />
-      <AltCoverBuildItem Include="@(None)" />
-      <AltCoverBuildItem Include="@(Resource)" />
-      <AltCoverBuildItem Include="@(EntityDeploy)" />
-      <AltCoverBuildItem Include="@(Compile)" />
-      <AltCoverBuildItem Include="@(SplashScreen)" />
-      <AltCoverBuildItem Include="@(Content)" />
-      <AltCoverBuildItem Include="@(EmbeddedResource)" />
-      <AltCoverBuildItem Include="@(Page)" />
-      <AltCoverBuildItem Include="@(DesignDataWithDesignTimeCreatableTypes)" />
-      <AltCoverBuildItem Include="@(AdditionalFiles)" />
-    </ItemGroup>
-
-    <AltCover.ContingentCopy
-      Condition="'$(AltCoverTestTargetPath)' != '$(TargetPath)' AND ('%(AltCoverBuildItem.CopyToOutputDirectory)' == 'Always' OR '%(AltCoverBuildItem.CopyToOutputDirectory)' == 'PreserveNewest' )"
-      RelativeDir="%(AltCoverBuildItem.RelativeDir)"
-      ProjectDir="$(ProjectDir)"
-      CopyToOutputDirectory="%(AltCoverBuildItem.CopyToOutputDirectory)"
-      FileName="%(AltCoverBuildItem.FullPath)"
-      BuildOutputDirectory="$(TargetDir)"
-      InstrumentDirectory="$(AltCoverInstrumentedDirectory)_$(ProjectName)" />
-
-    <AltCover.RunSettings
-      TestSetting="$(VSTestSetting)"
-      Verbosity="$(AltCoverVerbosity)">
-      <Output TaskParameter="Extended" PropertyName="VSTestSetting" />
-    </AltCover.RunSettings>
-
-    <CallTarget Targets="ShowCallOfVSTestTaskWithParameter" />
-
-    <Microsoft.TestPlatform.Build.Tasks.VSTestTask
-      TestFileFullPath="$(AltCoverTestTargetPath)"
-      VSTestSetting="$([MSBuild]::ValueOrDefault($(VSTestSetting), '$(RunSettingsFilePath)'))"
-      VSTestTestAdapterPath="$(VSTestTestAdapterPath)"
-      VSTestFramework="$(TargetFrameworkMoniker)"
-      VSTestPlatform="$(PlatformTarget)"
-      VSTestTestCaseFilter="$(VSTestTestCaseFilter)"
-      VSTestLogger="$(VSTestLogger)"
-      VSTestListTests="$(VSTestListTests)"
-      VSTestDiag="$(VSTestDiag)"
-      VSTestCLIRunSettings="$(VSTestCLIRunSettings)"
-      VSTestConsolePath="$(VSTestConsolePath)"
-      VSTestResultsDirectory="$(VSTestResultsDirectory)"
-      VSTestVerbosity="$(VSTestVerbosity)"
-      VSTestCollect="$(VSTestCollect)"
-      VSTestBlame="$(VSTestBlame)"
-      VSTestBlameCrash="$(VSTestBlameCrash)"
-      VSTestBlameCrashDumpType="$(VSTestBlameCrashDumpType)"
-      VSTestBlameCrashCollectAlways="$(VSTestBlameCrashCollectAlways)"
-      VSTestBlameHang="$(VSTestBlameHang)"
-      VSTestBlameHangDumpType="$(VSTestBlameHangDumpType)"
-      VSTestBlameHangTimeout="$(VSTestBlameHangTimeout)"
-      VSTestTraceDataCollectorDirectoryPath="$(TraceDataCollectorDirectoryPath)"
-      VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
-      VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)"
-      VSTestNoLogo="$(VSTestNoLogo)"
-      Condition="'$(IsTestProject)' == 'true'" />
-
-    <OnError ExecuteTargets="AltCoverGenerateCoverageResult" Condition="'$(AltCoverFailFast)' != 'true'" />
-    <OnError ExecuteTargets="AltCoverTidy" Condition="'$(AltCoverFailFast)' == 'true'" />
-  </Target>
-
-  <Target Name="AltCoverDeleteTempRunSettingsFile">
-    <Message Text="Deleting $(VSTestSetting)" />
-    <Delete Files="$(VSTestSetting)">
-      <Output TaskParameter="DeletedFiles" ItemName="AltCoverDeletedList" />
-    </Delete>
-    <Message Text="Deleted files: '@(AltCoverDeletedList)'" />
-  </Target>
-
-  <Target Name="AltCoverTidy">
-    <ItemGroup>
-      <AltCoverRecorderGFiles Include="$(TargetDir)/AltCover.Recorder.g.*" />
-      <AltCoverSavedFiles Include="$(AltCoverSavedDirectory))_$(ProjectName)/*.*" />
-    </ItemGroup>
-    <CallTarget Targets="AltCoverDeleteTempRunSettingsFile"
-                Condition="$(VSTestSetting.EndsWith('.altcover.runsettings')) AND Exists($(VSTestSetting))" />
-    <Move SourceFiles="@(AltCoverSavedFiles)" DestinationFolder="$(TargetDir)" OverwriteReadOnlyFiles="true" Condition="'$(AltCoverInPlace)' != 'false'" />
-    <RemoveDir Directories="$(AltCoverSavedDirectory)_$(ProjectName)" Condition="Exists('$(AltCoverSavedDirectory))_$(ProjectName)') AND '$(AltCoverInPlace)' != 'false'" />
-    <AltCover.RetryDelete Files="@(AltCoverRecorderGFiles)" Condition="'$(AltCoverInPlace)' != 'false'" />
-  </Target>
-
-  <Target Name="AltCoverGenerateCoverageResult" AfterTargets="VSTest" Condition="'$(AltCover)' == 'true'">
-    <PropertyGroup>
-      <AltCoverColour Condition="'$(AltCoverShowSummary)' != ''">$(AltCoverShowSummary)</AltCoverColour>
-      <AltCoverColour Condition="'$(AltCoverShowSummary)' == ''">Foreground</AltCoverColour>
-      <AltCoverRecorderDirectory Condition="'$(AltCover)' != 'true' OR '$(AltCoverInPlace)' != 'false'">$(TargetDir)</AltCoverRecorderDirectory>
-      <AltCoverRecorderDirectory Condition="'$(AltCover)' == 'true' AND '$(AltCoverInPlace)' == 'false'">$(AltCoverInstrumentedDirectory)_$(ProjectName)</AltCoverRecorderDirectory>
-    </PropertyGroup>
-
-    <AltCover.Collect
-      RecorderDirectory="$(AltCoverRecorderDirectory)"
-      LcovReport="$(AltCoverLcovReport)"
-      Threshold="$(AltCoverThreshold)"
-      Cobertura="$(AltCoverCobertura)"
-      SummaryFormat="$(AltCoverSummaryFormat)"
-      Verbosity="$(AltCoverVerbosity)">
-      <Output TaskParameter="Summary" PropertyName="AltCoverSummary" />
-    </AltCover.Collect>
-    <AltCover.Echo Condition="'$(AltCoverShowSummary)' != '' AND '$(AltCoverSummary)' !=''"
-                   Text="$(AltCoverSummary)" Colour="$(AltCoverColour)"
-                   Verbosity="$(AltCoverVerbosity)" />
-    <CallTarget Targets="AltCoverTidy" />
-  </Target>
+  <Import Project="$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).proj" Condition="'$(AltCover)' == 'true' AND '$(IsTestProject)' == 'true'" />
 </Project>
\ No newline at end of file