diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index a5f348b8c..41e34d446 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.2.0",
+      "version": "5.2.2",
       "commands": [
         "reportgenerator"
       ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d58915bf3..5c831acdd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.100'
+        dotnet-version: '8.0.202'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -63,7 +63,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.100'
+        dotnet-version: '8.0.202'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
diff --git a/AltCover.Api.Tests/FSApiTests.fs b/AltCover.Api.Tests/FSApiTests.fs
index a26eef427..787ed7061 100644
--- a/AltCover.Api.Tests/FSApiTests.fs
+++ b/AltCover.Api.Tests/FSApiTests.fs
@@ -1183,9 +1183,9 @@ module FSApiTests =
 
     // not input and output directories  (inplace now allowed)
     testWithFallback
-      <@ (prepareFragments) |> List.length = ((prepareNames |> List.length) - 2) @>
+      <@ (prepareFragments) |> List.length = ((prepareNames |> List.length) - 1) @>
       (prepareFragments |> List.length)
-      (Is.EqualTo((prepareNames |> List.length) - 2))
+      (Is.EqualTo((prepareNames |> List.length) - 1))
 
     let collect =
       doc.Descendants()
@@ -1305,6 +1305,16 @@ module FSApiTests =
         DotNet.ToTestArguments prep coll combined = "/p:AltCover=\"true\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\""
       @>
 
+    let tprep = TypeSafe.PrepareOptions.Create()
+
+    let prep2 =
+      AltCover.PrepareOptions.TypeSafe tprep
+
+    test
+      <@
+        DotNet.ToTestArguments prep2 coll combined = "/p:AltCover=\"true\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\""
+      @>
+
     let pprep2 = Options.Prepare()
     test <@ (pprep2.WhatIf()).Command = [ "--save" ] @>
 
diff --git a/AltCover.Cake/Options.cs b/AltCover.Cake/Options.cs
index 0a522c899..a484c816e 100644
--- a/AltCover.Cake/Options.cs
+++ b/AltCover.Cake/Options.cs
@@ -7,354 +7,359 @@
 
 namespace AltCover.Cake
 {
+  /// <summary>
+  /// Overall test run options; override defaults as required
+  /// </summary>
+  public class TestOptions : FSDotNet.ICLIOptions
+  {
     /// <summary>
-    /// Overall test run options; override defaults as required
+    /// Gets whether to force delete previous runs
     /// </summary>
-    public class TestOptions : FSDotNet.ICLIOptions
-    {
-        /// <summary>
-        /// Gets whether to force delete previous runs
-        /// </summary>
-        public virtual bool ForceDelete => false;
-
-        /// <summary>
-        /// Gets whether to fail without computing coverage on test failure
-        /// </summary>
-        public virtual bool FailFast => false;
-
-        /// <summary>
-        /// Gets the type of summary to show
-        /// </summary>
-        public virtual string ShowSummary => String.Empty;
-    }
+    public virtual bool ForceDelete => false;
 
     /// <summary>
-    /// Preparation stage options; override defaults as required
+    /// Gets whether to fail without computing coverage on test failure
+    /// </summary>
+    public virtual bool FailFast => false;
+
+    /// <summary>
+    /// Gets the type of summary to show
+    /// </summary>
+    public virtual string ShowSummary => String.Empty;
+  }
+
+  /// <summary>
+  /// Preparation stage options; override defaults as required
+  /// </summary>
+  public class PrepareOptions : Abstract.IPrepareOptions
+  {
+    /// <summary>
+    /// Gets the input directories (overridden by the MSBuild integration)
     /// </summary>
-    public class PrepareOptions : Abstract.IPrepareOptions
-    {
-        /// <summary>
-        /// Gets the input directories (overridden by the MSBuild integration)
-        /// </summary>
 #pragma warning disable IDE0079 // Remove unnecessary suppression
 
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public IEnumerable<string> InputDirectories => throw new NotImplementedException("InputDirectories not used");
-
-        /// <summary>
-        /// Gets the output directories (overridden by the MSBuild integration)
-        /// </summary>
-
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public IEnumerable<string> OutputDirectories => throw new NotImplementedException("OutputDirectories not used");
-
-        ///<summary>
-        /// Corresponds to command line option `-y, --symbolDirectory=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> SymbolDirectories => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-d, --dependency=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> Dependencies => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-k, --key=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> Keys => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `--sn, --strongNameKey=VALUE`
-        ///</summary>
-        public virtual string StrongNameKey => String.Empty;
-
-        ///<summary>
-        /// Gets or sets the value that corresponds to command line option `-r, --report=VALUE`
-        ///</summary>
-        public virtual string Report => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `-f, --fileFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> FileFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-s, --assemblyFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> AssemblyFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-e, --assemblyExcludeFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> AssemblyExcludeFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-t, --typeFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> TypeFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-m, --methodFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> MethodFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-a, --attributeFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> AttributeFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-p, --pathFilter=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> PathFilter => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `--attributetoplevel=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> AttributeTopLevel => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `--typetoplevel=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> TypeTopLevel => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `--methodtoplevel=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> MethodTopLevel => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `-c, --callContext=VALUE`
-        ///</summary>
-        public virtual IEnumerable<string> CallContext => Array.Empty<string>();
-
-        ///<summary>
-        /// Corresponds to command line option `--reportFormat=VALUE`
-        ///</summary>
-        public virtual string ReportFormat => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `--inplace`
-        ///</summary>
-        public virtual bool InPlace => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--save`
-        ///</summary>
-        public virtual bool Save => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--zipfile`
-        ///</summary>
-        public virtual bool ZipFile => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--methodpoint`
-        ///</summary>
-        public virtual bool MethodPoint => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--single`
-        ///</summary>
-        public virtual bool SingleVisit => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--linecover`
-        ///</summary>
-        public virtual bool LineCover => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--branchcover`
-        ///</summary>
-        public virtual bool BranchCover => false;
-
-        /// <summary>
-        /// Gets the command line (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public IEnumerable<string> CommandLine => throw new NotImplementedException("CommandLine not used");
-
-        /// <summary>
-        /// Gets whether to expose a program return code (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public bool ExposeReturnCode => throw new NotImplementedException("ExposeReturnCode not used");
-
-        ///<summary>
-        /// Corresponds to command line option `--sourcelink`
-        ///</summary>
-        public virtual bool SourceLink => true;
-
-        /// <summary>
-        /// Gets whether to defer coverage reporting (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        public bool Defer => throw new NotImplementedException("Defer not used");
-
-        ///<summary>
-        /// Corresponds to command line option `-l, --localSource`
-        ///</summary>
-        public virtual bool LocalSource => true;
-
-        ///<summary>
-        /// Corresponds to command line option `-v, --visibleBranches`
-        ///</summary>
-        public virtual bool VisibleBranches => false;
-
-        ///<summary>
-        /// Corresponds to command line option `--showstatic[=VALUE]`
-        ///</summary>
-        public virtual string ShowStatic => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `--showGenerated`
-        ///</summary>
-        public virtual bool ShowGenerated => false;
-
-        ///<summary>
-        /// Corresponds to command line option `-q`
-        ///</summary>
-        public virtual System.Diagnostics.TraceLevel Verbosity => System.Diagnostics.TraceLevel.Info;
-
-        ///<summary>
-        /// Corresponds to command line option ` --trivia`
-        ///</summary>
-        public virtual bool Trivia => false;
-    }
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public IEnumerable<string> InputDirectories => throw new NotImplementedException("InputDirectories not used");
+
+    /// <summary>
+    /// Gets the output directories (overridden by the MSBuild integration)
+    /// </summary>
+
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public IEnumerable<string> OutputDirectories => throw new NotImplementedException("OutputDirectories not used");
+
+    ///<summary>
+    /// Corresponds to command line option `-y, --symbolDirectory=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> SymbolDirectories => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-d, --dependency=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> Dependencies => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-k, --key=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> Keys => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `--sn, --strongNameKey=VALUE`
+    ///</summary>
+    public virtual string StrongNameKey => String.Empty;
+
+    ///<summary>
+    /// Gets or sets the value that corresponds to command line option `-r, --report=VALUE`
+    ///</summary>
+    public virtual string Report => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `-f, --fileFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> FileFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-s, --assemblyFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> AssemblyFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-e, --assemblyExcludeFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> AssemblyExcludeFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-t, --typeFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> TypeFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-m, --methodFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> MethodFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-a, --attributeFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> AttributeFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-p, --pathFilter=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> PathFilter => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `--attributetoplevel=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> AttributeTopLevel => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `--typetoplevel=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> TypeTopLevel => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `--methodtoplevel=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> MethodTopLevel => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `-c, --callContext=VALUE`
+    ///</summary>
+    public virtual IEnumerable<string> CallContext => Array.Empty<string>();
+
+    ///<summary>
+    /// Corresponds to command line option `--reportFormat=VALUE`
+    ///</summary>
+    public virtual string ReportFormat => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `--inplace`
+    ///</summary>
+    public virtual bool InPlace => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--save`
+    ///</summary>
+    public virtual bool Save => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--zipfile`
+    ///</summary>
+    public virtual bool ZipFile => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--methodpoint`
+    ///</summary>
+    public virtual bool MethodPoint => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--single`
+    ///</summary>
+    public virtual bool SingleVisit => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--linecover`
+    ///</summary>
+    public virtual bool LineCover => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--branchcover`
+    ///</summary>
+    public virtual bool BranchCover => false;
+
+    /// <summary>
+    /// Gets the command line (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public IEnumerable<string> CommandLine => throw new NotImplementedException("CommandLine not used");
+
+    /// <summary>
+    /// Gets whether to expose a program return code (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public bool ExposeReturnCode => throw new NotImplementedException("ExposeReturnCode not used");
+
+    ///<summary>
+    /// Corresponds to command line option `--sourcelink`
+    ///</summary>
+    public virtual bool SourceLink => true;
+
+    /// <summary>
+    /// Gets whether to defer coverage reporting (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    public bool Defer => throw new NotImplementedException("Defer not used");
+
+    ///<summary>
+    /// Corresponds to command line option `-l, --localSource`
+    ///</summary>
+    public virtual bool LocalSource => true;
+
+    ///<summary>
+    /// Corresponds to command line option `-v, --visibleBranches`
+    ///</summary>
+    public virtual bool VisibleBranches => false;
+
+    ///<summary>
+    /// Corresponds to command line option `--showstatic[=VALUE]`
+    ///</summary>
+    public virtual string ShowStatic => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `--showGenerated`
+    ///</summary>
+    public virtual bool ShowGenerated => false;
+
+    ///<summary>
+    /// Corresponds to command line option `-q`
+    ///</summary>
+    public virtual System.Diagnostics.TraceLevel Verbosity => System.Diagnostics.TraceLevel.Info;
+
+    ///<summary>
+    /// Corresponds to command line option `--trivia`
+    ///</summary>
+    public virtual bool Trivia => false;
+
+    ///<summary>
+    /// Corresponds to dotnet test option `/p:AltCoverOutputRoot`
+    ///</summary>
+    public virtual string OutputRoot => String.Empty;
+  }
+
+  /// <summary>
+  /// Collection stage options; override defaults as required
+  /// </summary>
+  public class CollectOptions : Abstract.ICollectOptions
+  {
+    /// <summary>
+    /// Gets the recorder directory (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public string RecorderDirectory => throw new NotImplementedException("RecorderDirectory not used");
+
+    /// <summary>
+    /// Gets the working directory (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public string WorkingDirectory => throw new NotImplementedException("WorkingDirectory not used");
+
+    /// <summary>
+    /// Gets the programe to run (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    public string Executable => throw new NotImplementedException("Executable not used");
+
+    ///<summary>
+    /// Corresponds to command line option `-l, --lcovReport=VALUE`
+    ///</summary>
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
+                      Justification = "Lcov is a name")]
+    public virtual string LcovReport => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `-t, --threshold=VALUE`
+    ///</summary>
+    public virtual string Threshold => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `-c, --cobertura=VALUE`
+    ///</summary>
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
+                      Justification = "Lcov is a name")]
+    public virtual string Cobertura => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `-o, --outputFile=VALUE`
+    ///</summary>
+    public virtual string OutputFile => String.Empty;
+
+    /// <summary>
+    /// Gets the command line (overridden by the MSBuild integration)
+    /// </summary>
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public IEnumerable<string> CommandLine => throw new NotImplementedException("CommandLine not used");
 
     /// <summary>
-    /// Collection stage options; override defaults as required
+    /// Gets whether to expose a program return code (overridden by the MSBuild integration)
     /// </summary>
-    public class CollectOptions : Abstract.ICollectOptions
-    {
-        /// <summary>
-        /// Gets the recorder directory (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public string RecorderDirectory => throw new NotImplementedException("RecorderDirectory not used");
-
-        /// <summary>
-        /// Gets the working directory (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public string WorkingDirectory => throw new NotImplementedException("WorkingDirectory not used");
-
-        /// <summary>
-        /// Gets the programe to run (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        public string Executable => throw new NotImplementedException("Executable not used");
-
-        ///<summary>
-        /// Corresponds to command line option `-l, --lcovReport=VALUE`
-        ///</summary>
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
-                          Justification = "Lcov is a name")]
-        public virtual string LcovReport => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `-t, --threshold=VALUE`
-        ///</summary>
-        public virtual string Threshold => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `-c, --cobertura=VALUE`
-        ///</summary>
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly",
-                          Justification = "Lcov is a name")]
-        public virtual string Cobertura => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `-o, --outputFile=VALUE`
-        ///</summary>
-        public virtual string OutputFile => String.Empty;
-
-        /// <summary>
-        /// Gets the command line (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public IEnumerable<string> CommandLine => throw new NotImplementedException("CommandLine not used");
-
-        /// <summary>
-        /// Gets whether to expose a program return code (overridden by the MSBuild integration)
-        /// </summary>
-        [SuppressMessage("Gendarme.Rules.BadPractice",
-                         "DoNotForgetNotImplementedMethodsRule",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Design",
-                         "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
-                         Justification = "Means 'do not use'")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
-                      Justification = "Property name")]
-        public bool ExposeReturnCode => throw new NotImplementedException("ExposeReturnCode not used");
-
-        ///<summary>
-        /// Corresponds to command line option `--teamcity[=VALUE]`
-        ///</summary>
-        public virtual string SummaryFormat => String.Empty;
-
-        ///<summary>
-        /// Corresponds to command line option `-q`
-        ///</summary>
-        public virtual System.Diagnostics.TraceLevel Verbosity => System.Diagnostics.TraceLevel.Info;
-    }
+    [SuppressMessage("Gendarme.Rules.BadPractice",
+                     "DoNotForgetNotImplementedMethodsRule",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Design",
+                     "CA1065:DoNotRaiseExceptionsInUnexpectedLocations",
+                     Justification = "Means 'do not use'")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly",
+                  Justification = "Property name")]
+    public bool ExposeReturnCode => throw new NotImplementedException("ExposeReturnCode not used");
+
+    ///<summary>
+    /// Corresponds to command line option `--teamcity[=VALUE]`
+    ///</summary>
+    public virtual string SummaryFormat => String.Empty;
+
+    ///<summary>
+    /// Corresponds to command line option `-q`
+    ///</summary>
+    public virtual System.Diagnostics.TraceLevel Verbosity => System.Diagnostics.TraceLevel.Info;
+  }
 }
\ No newline at end of file
diff --git a/AltCover.DotNet/DotNet.fs b/AltCover.DotNet/DotNet.fs
index 78e960ca7..f69f431f7 100644
--- a/AltCover.DotNet/DotNet.fs
+++ b/AltCover.DotNet/DotNet.fs
@@ -114,7 +114,8 @@ module DotNet =
       [ fromArg, "StrongNameKey", prepare.StrongNameKey //=`"path to default strong-name key for assemblies"
         fromArg, "Report", prepare.Report //=`"path to the report" default: `coverage.xml` or `coverage.json` in the project directory
         fromArg, "ReportFormat", prepare.ReportFormat //=`"Json", "NCover" or default "OpenCover"
-        fromArg, "ShowStatic", prepare.ShowStatic ] //=-|+|++` to mark simple code like auto-properties in the coverage file
+        fromArg, "ShowStatic", prepare.ShowStatic //=-|+|++` to mark simple code like auto-properties in the coverage file
+        fromArg, "OutputRoot", prepare.OutputRoot ] //=`"path of root folder for saved/instrumented output for `dotnet test`, default `$(TargetDir)`"
 
     let internal toPrepareArgArgumentList (prepare: Abstract.IPrepareOptions) =
       [ (arg, "ZipFile", "true", prepare.ZipFile) //="true|false"` - set "true" to store the coverage report in a `.zip` archive
diff --git a/AltCover.DotNet/Options.fs b/AltCover.DotNet/Options.fs
index 78ab9f61b..2e8468cb0 100644
--- a/AltCover.DotNet/Options.fs
+++ b/AltCover.DotNet/Options.fs
@@ -124,6 +124,7 @@ module Options =
     member val ShowGenerated = false with get, set
     member val Verbosity = System.Diagnostics.TraceLevel.Info with get, set
     member val Trivia = false with get, set
+    member val OutputRoot = String.Empty with get, set
 
     interface Abstract.IPrepareOptions with
       member self.InputDirectories =
@@ -188,6 +189,7 @@ module Options =
       member self.ShowGenerated = self.ShowGenerated
       member self.Verbosity = self.Verbosity
       member self.Trivia = self.Trivia
+      member self.OutputRoot = self.OutputRoot
 
 #if RUNNER
   [<AutoSerializable(false)>]
diff --git a/AltCover.Engine/Abstract.fs b/AltCover.Engine/Abstract.fs
index 04346e121..c8e4dd482 100644
--- a/AltCover.Engine/Abstract.fs
+++ b/AltCover.Engine/Abstract.fs
@@ -262,9 +262,13 @@ module Abstract =
     ///</summary>
     abstract member Verbosity : System.Diagnostics.TraceLevel with get
     ///<summary>
-    /// Corresponds to command line option ` --trivia`
+    /// Corresponds to command line option `--trivia`
     ///</summary>
     abstract member Trivia : bool with get
+    ///<summary>
+    /// Corresponds to dotnet test option `/p:AltCoverOutputRoot`
+    ///</summary>
+    abstract member OutputRoot : string with get
 // ```
 #if RUNNER
 // ### interface `ILoggingOptions`
diff --git a/AltCover.Engine/AltCover.fs b/AltCover.Engine/AltCover.fs
index d1d3362fd..1a08c1337 100644
--- a/AltCover.Engine/AltCover.fs
+++ b/AltCover.Engine/AltCover.fs
@@ -434,6 +434,12 @@ module AltCover =
       | Abstract a -> a.Trivia
       | TypeSafe t -> t.Trivia.AsBool()
 
+    member self.OutputRoot =
+      match self with
+      | Primitive p -> p.OutputRoot
+      | Abstract a -> a.OutputRoot
+      | TypeSafe t -> t.OutputRoot.AsString()
+
     interface Abstract.IPrepareOptions with
       member self.InputDirectories =
         self.InputDirectories |> PrepareOptions.ToSeq
@@ -512,6 +518,7 @@ module AltCover =
       member self.ShowGenerated = self.ShowGenerated
       member self.Verbosity = self.Verbosity
       member self.Trivia = self.Trivia
+      member self.OutputRoot = self.OutputRoot
 
 #if RUNNER
     static member private ValidateArray a f key =
diff --git a/AltCover.Engine/AltCover.fsi b/AltCover.Engine/AltCover.fsi
index 9d3d831b7..33f47b73f 100644
--- a/AltCover.Engine/AltCover.fsi
+++ b/AltCover.Engine/AltCover.fsi
@@ -312,6 +312,10 @@ namespace AltCoverFake.DotNet.Testing
         /// Corresponds to command line option `--trivia`
         ///</summary>
         member Trivia: bool with get
+        ///<summary>
+        /// Corresponds to dotnet test option `/p:AltCoverOutputRoot`
+        ///</summary>
+        member OutputRoot : string with get
 // ```
 #if RUNNER
 // ```
diff --git a/AltCover.Engine/Primitive.fs b/AltCover.Engine/Primitive.fs
index 4001fd8be..2d58d1d61 100644
--- a/AltCover.Engine/Primitive.fs
+++ b/AltCover.Engine/Primitive.fs
@@ -92,7 +92,8 @@ module Primitive =
       ShowStatic: string
       ShowGenerated: bool
       Verbosity: System.Diagnostics.TraceLevel
-      Trivia: bool }
+      Trivia: bool
+      OutputRoot: string }
     static member Create() =
       { InputDirectories = Seq.empty
         OutputDirectories = Seq.empty
@@ -129,7 +130,8 @@ module Primitive =
         ShowStatic = "-"
         ShowGenerated = false
         Verbosity = System.Diagnostics.TraceLevel.Info
-        Trivia = false }
+        Trivia = false
+        OutputRoot = String.Empty }
 
 #if RUNNER
   [<ExcludeFromCodeCoverage; NoComparison; NoEquality; AutoSerializable(false)>]
diff --git a/AltCover.Engine/Primitive.fsi b/AltCover.Engine/Primitive.fsi
index e83625dd0..83c6f4413 100644
--- a/AltCover.Engine/Primitive.fsi
+++ b/AltCover.Engine/Primitive.fsi
@@ -250,6 +250,10 @@ namespace AltCoverFake.DotNet.Testing
         /// Corresponds to command line option `--trivia`
         ///</summary>
         Trivia: bool
+        ///<summary>
+        /// Corresponds to dotnet test option `/p:AltCoverOutputRoot`
+        ///</summary>
+        OutputRoot : string
       }
     with
         ///<summary>
diff --git a/AltCover.Engine/Tasks.fs b/AltCover.Engine/Tasks.fs
index 83689d80d..feb44e19b 100644
--- a/AltCover.Engine/Tasks.fs
+++ b/AltCover.Engine/Tasks.fs
@@ -138,6 +138,7 @@ type Prepare() =
   member val ExposeReturnCode = true with get, set
   member val Verbosity = "Info" with get, set
   member val Trivia = false with get, set
+  member val OutputRoot = String.Empty with get, set
 
   member private self.Message text =
     ``base``.Log.LogMessage(MessageImportance.High, text)
@@ -190,7 +191,8 @@ type Prepare() =
           ShowStatic = self.ShowStatic
           ShowGenerated = self.ShowGenerated
           Verbosity = TaskHelpers.parse self.Verbosity
-          Trivia = self.Trivia }
+          Trivia = self.Trivia
+          OutputRoot = self.OutputRoot }
 
     Command.Prepare task log = 0
 
@@ -332,6 +334,7 @@ type Echo() =
 
     true
 
+[<AutoSerializable(false)>]
 type RunSettings() =
   inherit Task(null)
 
@@ -354,6 +357,9 @@ type RunSettings() =
                     Justification = "Unit test accessor")>]
   member val internal MessageIO: (string -> unit) option = None with get, set
 
+  member val internal GetTempFileName: (unit -> string) =
+    Path.GetTempFileName with get, set
+
   override self.Execute() =
     let signal =
       Option.defaultValue self.Message self.MessageIO
@@ -367,7 +373,7 @@ type RunSettings() =
       |> sprintf "Settings Before: %s"
       |> signal
 
-    let tempFile = Path.GetTempFileName()
+    let tempFile = self.GetTempFileName()
 
     try
       let settings =
diff --git a/AltCover.Engine/TypeSafe.fs b/AltCover.Engine/TypeSafe.fs
index b7c7dc443..34fc60fcd 100644
--- a/AltCover.Engine/TypeSafe.fs
+++ b/AltCover.Engine/TypeSafe.fs
@@ -306,7 +306,8 @@ module TypeSafe =
       ShowStatic: StaticFormat
       ShowGenerated: Flag
       Verbosity: System.Diagnostics.TraceLevel
-      Trivia: Flag }
+      Trivia: Flag
+      OutputRoot: FilePath }
     static member Create() =
       { InputDirectories = NoDirectories
         OutputDirectories = NoDirectories
@@ -343,7 +344,8 @@ module TypeSafe =
         ShowStatic = StaticFormat.Default
         ShowGenerated = Clear
         Verbosity = System.Diagnostics.TraceLevel.Info
-        Trivia = Clear }
+        Trivia = Clear
+        OutputRoot = NoFile }
 
 #if RUNNER
 [<assembly: SuppressMessage("Microsoft.Naming",
diff --git a/AltCover.Engine/TypeSafe.fsi b/AltCover.Engine/TypeSafe.fsi
index 2bdb65bba..819ff7f95 100644
--- a/AltCover.Engine/TypeSafe.fsi
+++ b/AltCover.Engine/TypeSafe.fsi
@@ -676,6 +676,10 @@ namespace AltCoverFake.DotNet.Testing
         /// Corresponds to command line option `--trivia`
         ///</summary>
         Trivia: Flag
+        ///<summary>
+        /// Corresponds to dotnet test option `/p:AltCoverOutputRoot`
+        ///</summary>
+        OutputRoot : FilePath
  }
       with
         ///<summary>
diff --git a/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs b/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs
index 72bfe99b7..7ddc1fa13 100644
--- a/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs
+++ b/AltCover.Fake.DotNet.Testing.AltCover/AltCoverCommand.fs
@@ -123,7 +123,8 @@ module AltCoverCommand =
           ShowStatic = a.ShowStatic
           ShowGenerated = a.ShowGenerated
           Verbosity = a.Verbosity
-          Trivia = a.Trivia }
+          Trivia = a.Trivia
+          OutputRoot = a.OutputRoot }
 
       AltCover.PrepareOptions.Primitive copy
     | AltCover.PrepareOptions.TypeSafe t ->
@@ -326,19 +327,19 @@ module AltCoverCommand =
                             "CA1823:AvoidUnusedPrivateFields",
                             Scope = "member",
                             Target =
-                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withMono@298T.#monoPath",
+                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withMono@299T.#monoPath",
                             Justification = "Generated code")>]
 [<assembly: SuppressMessage("Microsoft.Performance",
                             "CA1823:AvoidUnusedPrivateFields",
                             Scope = "member",
                             Target =
-                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withMono@298T.#options",
+                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withMono@299T.#options",
                             Justification = "Generated code")>]
 [<assembly: SuppressMessage("Microsoft.Performance",
                             "CA1823:AvoidUnusedPrivateFields",
                             Scope = "member",
                             Target =
-                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withWorkingDirectory@249T.#options",
+                              "AltCoverFake.DotNet.Testing.AltCoverCommand+withWorkingDirectory@250T.#options",
                             Justification = "Generated code")>]
 [<assembly: SuppressMessage("Gendarme.Rules.Naming",
                             "UseCorrectCasingRule",
@@ -350,6 +351,6 @@ module AltCoverCommand =
                             "UseCorrectCasingRule",
                             Scope = "member", // MethodDefinition
                             Target =
-                              "AltCoverFake.DotNet.Testing.AltCoverCommand/Pipe #2 stage #1 at line 135@135::Invoke(System.String)",
+                              "AltCoverFake.DotNet.Testing.AltCoverCommand/Pipe #2 stage #1 at line 136@136::Invoke(System.String)",
                             Justification = "Generated code")>]
 ()
\ No newline at end of file
diff --git a/AltCover.PowerShell/Command.fs b/AltCover.PowerShell/Command.fs
index 062f3d942..fd7d5d21d 100644
--- a/AltCover.PowerShell/Command.fs
+++ b/AltCover.PowerShell/Command.fs
@@ -710,7 +710,8 @@ type InvokeAltCoverCommand() =
         ShowStatic = showStatic.[self.ShowStatic |> int]
         ShowGenerated = self.ShowGenerated.IsPresent
         Verbosity = self.Verbosity
-        Trivia = self.Trivia.IsPresent }
+        Trivia = self.Trivia.IsPresent
+        OutputRoot = String.Empty }
 
   member private self.Log() =
     AltCover.LoggingOptions.Primitive
diff --git a/AltCover.Tests/Tests3.fs b/AltCover.Tests/Tests3.fs
index 8c38ca0e5..3306e26b7 100644
--- a/AltCover.Tests/Tests3.fs
+++ b/AltCover.Tests/Tests3.fs
@@ -129,15 +129,10 @@ module AltCoverTests3 =
       |> Seq.toList
 
     // add "commandline"
-    Assert.That(
-      primitiveNames |> List.length,
-      Is.EqualTo(optionCount), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", optionNames)
-      + Environment.NewLine
-      + "but got primitive "
-      + String.Join("; ", primitiveNames)
-    )
+    testWithFallback
+      <@ (primitiveNames) |> List.length = optionCount + 1 @> // adds optionroot
+      (primitiveNames |> List.length)
+      (Is.EqualTo(optionCount + 1))
 
     let typesafeNames =
       typeof<TypeSafe.PrepareOptions>
@@ -146,15 +141,10 @@ module AltCoverTests3 =
       |> Seq.sort
       |> Seq.toList
 
-    Assert.That(
-      typesafeNames |> List.length,
-      Is.EqualTo(optionCount), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", optionNames)
-      + Environment.NewLine
-      + "but got typesafe "
-      + String.Join("; ", typesafeNames)
-    )
+    testWithFallback
+      <@ (typesafeNames) |> List.length = optionCount + 1 @> // adds optionroot
+      (typesafeNames |> List.length)
+      (Is.EqualTo(optionCount + 1))
 
     let fsapiNames =
       typeof<AltCover.PrepareOptions>.GetProperties()
@@ -182,26 +172,16 @@ module AltCoverTests3 =
       |> List.map _.Trim('-')
       |> List.sort
 
-    Assert.That(
-      commandFragments |> List.length,
-      Is.EqualTo(optionCount), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", optionNames)
-      + Environment.NewLine
-      + "but got fragments "
-      + String.Join("; ", commandFragments)
-    )
+    testWithFallback
+      <@ (commandFragments) |> List.length = optionCount @> // drop -q/--verbose => verbosity
+      (commandFragments |> List.length)
+      (Is.EqualTo(optionCount))
 
     // Adds "Tag", "IsPrimitive", "IsTypeSafe"
-    Assert.That(
-      fsapiNames |> Seq.length,
-      Is.EqualTo(optionCount + fsapiCases + 1), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", primitiveNames)
-      + Environment.NewLine
-      + "but got fsapi "
-      + String.Join("; ", fsapiNames)
-    )
+    testWithFallback
+      <@ (fsapiNames) |> List.length = optionCount + fsapiCases + 2 @> // drop -q/--verbose => verbosity
+      (fsapiNames |> List.length)
+      (Is.EqualTo(optionCount + fsapiCases + 2))
 
     let taskNames =
       typeof<Prepare>
@@ -214,15 +194,10 @@ module AltCoverTests3 =
       |> Seq.sort
       |> Seq.toList
 
-    Assert.That(
-      taskNames |> Seq.length,
-      Is.EqualTo(optionCount), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", primitiveNames)
-      + Environment.NewLine
-      + "but got tasks "
-      + String.Join("; ", taskNames)
-    )
+    testWithFallback
+      <@ (taskNames) |> List.length = optionCount @> // drop -q/--verbose => verbosity
+      (taskNames |> List.length)
+      (Is.EqualTo(optionCount))
 
     let targets =
       Assembly
@@ -251,15 +226,10 @@ module AltCoverTests3 =
     // dotnet test loses commandline, defer, exposereturncode, save
     //                   N/A,         fixed, N/A,              fixed
     // inplace is explicitly hard-coded
-    Assert.That(
-      attributeNames |> Seq.length,
-      Is.EqualTo(optionCount - 4), // drop -q/--verbose => verbosity
-      "expected "
-      + String.Join("; ", primitiveNames)
-      + Environment.NewLine
-      + "but got targets "
-      + String.Join("; ", attributeNames)
-    )
+    testWithFallback
+      <@ (attributeNames) |> List.length = optionCount - 4 @> // drop -q/--verbose => verbosity
+      (attributeNames |> List.length)
+      (Is.EqualTo(optionCount - 4))
 
     Assert.That(
       options
@@ -4455,10 +4425,29 @@ module AltCoverTests3 =
       Console.SetOut(fst saved)
       Console.SetError(snd saved)
 
+  let MakeRunSettings () =
+    let subject = RunSettings()
+
+    let temper =
+      subject
+        .GetType()
+        .GetProperty("GetTempFileName", BindingFlags.Instance ||| BindingFlags.NonPublic)
+
+    let basic =
+      temper.GetValue(subject) :?> (unit -> string)
+
+    let badge =
+      (fun () ->
+        let t1 = basic ()
+        Path.Combine(Path.GetDirectoryName t1, "altcover.test." + Path.GetFileName(t1)))
+
+    temper.SetValue(subject, badge)
+    subject
+
   [<Test>]
   let RunSettingsFailsIfCollectorNotFound () =
     Main.init ()
-    let subject = RunSettings()
+    let subject = MakeRunSettings()
 
     let dc =
       subject
@@ -4474,6 +4463,7 @@ module AltCoverTests3 =
         .GetProperty("MessageIO", BindingFlags.Instance ||| BindingFlags.NonPublic)
 
     write.SetValue(subject, Some(fun (s: string) -> ()))
+
     Assert.That(subject.Execute(), Is.False)
     Assert.That(subject.Extended, Is.Empty)
     CommandLine.verbosity <- 0
@@ -4495,7 +4485,7 @@ module AltCoverTests3 =
   [<Test>]
   let RunSettingsWorksIfOK () =
     Main.init ()
-    let subject = RunSettings()
+    let subject = MakeRunSettings()
 
     let dc =
       subject
@@ -4517,9 +4507,18 @@ module AltCoverTests3 =
     Assert.That(subject.Execute(), Is.True)
     Assert.That(subject.Extended.EndsWith(".altcover.runsettings"))
 
+    Assert.That(
+      Path
+        .GetFileName(subject.Extended)
+        .StartsWith("altcover.test.")
+    )
+
     let result =
       subject.Extended |> File.ReadAllText
 
+    [ subject.Extended ]
+    |> Seq.iter (fun f -> maybeIOException (fun () -> File.Delete f))
+
     Assert.That(
       result
         .Replace("\r", String.Empty)
@@ -4542,7 +4541,7 @@ module AltCoverTests3 =
   [<Test>]
   let RunSettingsExtendsOK () =
     Main.init ()
-    let subject = RunSettings()
+    let subject = MakeRunSettings()
 
     let dc =
       subject
@@ -4571,6 +4570,9 @@ module AltCoverTests3 =
     let result =
       subject.Extended |> File.ReadAllText
 
+    [ subject.Extended ]
+    |> Seq.iter (fun f -> maybeIOException (fun () -> File.Delete f))
+
     Assert.That(
       result
         .Replace("\r", String.Empty)
@@ -4593,7 +4595,7 @@ module AltCoverTests3 =
   [<Test>]
   let RunSettingsThrowsIfUninitialized () =
     Main.init ()
-    let subject = RunSettings()
+    let subject = MakeRunSettings()
 
     let dc =
       subject
@@ -4616,7 +4618,7 @@ module AltCoverTests3 =
   [<Test>]
   let RunSettingsRecoversOK () =
     Main.init ()
-    let subject = RunSettings()
+    let subject = MakeRunSettings()
 
     let dc =
       subject
@@ -4641,6 +4643,9 @@ module AltCoverTests3 =
     let result =
       subject.Extended |> File.ReadAllText
 
+    [ subject.Extended ]
+    |> Seq.iter (fun f -> maybeIOException (fun () -> File.Delete f))
+
     Assert.That(
       result
         .Replace("\r", String.Empty)
diff --git a/AltCover.Tests/XTests.fs b/AltCover.Tests/XTests.fs
index ba797805f..9aa20b0ba 100644
--- a/AltCover.Tests/XTests.fs
+++ b/AltCover.Tests/XTests.fs
@@ -873,7 +873,6 @@ module AltCoverXTests =
         [ "AltCover.Recorder.g.dll"
           "FSharp.Core.dll"
           "Newtonsoft.Json.dll"
-          "NuGet.Frameworks.dll"
           "Sample4.deps.json"
           "Sample4.dll"
           "Sample4.runtimeconfig.json"
diff --git a/AltCover.ValidateGendarmeEmulation/Tests.fs b/AltCover.ValidateGendarmeEmulation/Tests.fs
index 9e1bf536b..b37472a16 100644
--- a/AltCover.ValidateGendarmeEmulation/Tests.fs
+++ b/AltCover.ValidateGendarmeEmulation/Tests.fs
@@ -7,7 +7,7 @@ open AltCover
 open Mono.Cecil
 
 module Rocks =
-  [<TailCall>]
+  //[<TailCall>]
   let rec GetAllTypes (t: TypeDefinition) =
     t
     :: (List.collect
diff --git a/AltCover.sln b/AltCover.sln
index ff877763d..de7f9bb52 100644
--- a/AltCover.sln
+++ b/AltCover.sln
@@ -38,12 +38,11 @@ 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\netstandard2.0\AltCover.props = nupkg\build\netstandard2.0\AltCover.props
-		nupkg\build\netstandard2.0\AltCover.targets = nupkg\build\netstandard2.0\AltCover.targets
+		nupkg\build\AltCover.props = nupkg\build\AltCover.props
+		nupkg\build\AltCover.targets = nupkg\build\AltCover.targets
 		Build\Apply-Xslt.ps1 = Build\Apply-Xslt.ps1
 		Build\build.cake = Build\build.cake
 		Build\build.fsx = Build\build.fsx
-		Build\build2.cake = Build\build2.cake
 		Build\common-rules.xml = Build\common-rules.xml
 		Build\coverletArgs.runsettings = Build\coverletArgs.runsettings
 		Build\coverletArgs.sample.runsettings = Build\coverletArgs.sample.runsettings
@@ -70,6 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Items", "Build Items"
 		Build\SelfTest.snk = Build\SelfTest.snk
 		Build\setup.fs = Build\setup.fs
 		Build\targets.fs = Build\targets.fs
+		ToolUpdate.ps1 = ToolUpdate.ps1
 		version.json = version.json
 	EndProjectSection
 EndProject
diff --git a/Build/build.cake b/Build/build.cake
index 137587307..fad34dd60 100644
--- a/Build/build.cake
+++ b/Build/build.cake
@@ -33,8 +33,10 @@ Task("Build")
   {
     public string CakeVersion;
     public override IEnumerable<string> CallContext => new string[] {"[Fact]", "0"};
+    public override IEnumerable<string> AssemblyFilter  => new string[] {"testhost"};
     public override System.Diagnostics.TraceLevel Verbosity => System.Diagnostics.TraceLevel.Verbose;
     public override string Report => "coverage.build.cake." + CakeVersion +".xml";
+    public override string OutputRoot => System.IO.Path.GetFullPath($"../_Binaries/cake_dotnettest/OutputRoot");
   }
 
 Task("Test")
diff --git a/Build/setup.fs b/Build/setup.fs
index f40078c74..0265a6488 100644
--- a/Build/setup.fs
+++ b/Build/setup.fs
@@ -102,7 +102,7 @@ module Setup =
     Target.description s
 
     let wrap f x =
-      printfn ">> %A <<" x
+      //printfn ">> %A <<" x
       f ()
 
     Target.create s (wrap f)
diff --git a/Build/targets.fs b/Build/targets.fs
index c5c98d8a4..375929ada 100644
--- a/Build/targets.fs
+++ b/Build/targets.fs
@@ -318,7 +318,7 @@ module Targets =
   let coverletcollector =
     ("./packages/"
      + (packageVersion "coverlet.collector")
-     + "/build/netstandard1.0/coverlet.collector.dll")
+     + "/build/netstandard2.0/coverlet.collector.dll")
     |> Path.getFullName
 
   let cliArguments =
@@ -6008,6 +6008,12 @@ module Targets =
               )
 
             Actions.CheckSample4 before x
+
+            Assert.That(
+              File.Exists(
+                "./_Binaries/cake_dotnettest/OutputRoot/__Instrumented_cake_dotnettest/AltCover.Recorder.g.dll"
+              )
+            )
           finally
             Actions.RunDotnet
               (fun o' ->
diff --git a/Demo/Echo/Echo/Echo.csproj b/Demo/Echo/Echo/Echo.csproj
index 21dff5ca2..a269962b5 100644
--- a/Demo/Echo/Echo/Echo.csproj
+++ b/Demo/Echo/Echo/Echo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/Demo/Echo/Test/Test.csproj b/Demo/Echo/Test/Test.csproj
index 43137d35e..28af30b64 100644
--- a/Demo/Echo/Test/Test.csproj
+++ b/Demo/Echo/Test/Test.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AltCover" Version="6.1.708" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="AltCover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Demo/MultiTest/System1/System1.fsproj b/Demo/MultiTest/System1/System1.fsproj
index ad1a657e5..32f842a58 100644
--- a/Demo/MultiTest/System1/System1.fsproj
+++ b/Demo/MultiTest/System1/System1.fsproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Demo/MultiTest/System2/System2.fsproj b/Demo/MultiTest/System2/System2.fsproj
index ad1a657e5..32f842a58 100644
--- a/Demo/MultiTest/System2/System2.fsproj
+++ b/Demo/MultiTest/System2/System2.fsproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Demo/MultiTest/Test1/Test1.fsproj b/Demo/MultiTest/Test1/Test1.fsproj
index 88e8ee202..acb6ec006 100644
--- a/Demo/MultiTest/Test1/Test1.fsproj
+++ b/Demo/MultiTest/Test1/Test1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,14 +11,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="4.0.659" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Demo/MultiTest/Test2/Test2.fsproj b/Demo/MultiTest/Test2/Test2.fsproj
index 2bd4ce558..ec8c9525e 100644
--- a/Demo/MultiTest/Test2/Test2.fsproj
+++ b/Demo/MultiTest/Test2/Test2.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,14 +11,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="4.0.659" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Demo/Service/Service/Service.fsproj b/Demo/Service/Service/Service.fsproj
index b95381fdd..5a6c274e0 100644
--- a/Demo/Service/Service/Service.fsproj
+++ b/Demo/Service/Service/Service.fsproj
@@ -28,11 +28,11 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="altcover" Version="8.0.816" />
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1b5c53e2f..bfdca6e33 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,13 +4,13 @@
     <PackageVersion Include="AltCode.Fake.DotNet.Gendarme" Version="5.23.0.42" />
     <PackageVersion Include="AltCode.Dixon" Version="2022.12.6.11014" />
     <PackageVersion Include="altcode.gendarme" Version="2023.12.27.19054" />
-    <PackageVersion Include="altcover" Version="8.6.95" />
+    <PackageVersion Include="altcover" Version="8.6.125" />
     <PackageVersion Include="AltCover.Api" Version="8.6.95" />
     <PackageVersion Include="AltCover.Fake" Version="8.6.95" />
-    <PackageVersion Include="Avalonia" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.6" />
+    <PackageVersion Include="Avalonia" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.10" />
     <PackageVersion Include="BlackFox.CommandLine" Version="1.0.0" />
     <PackageVersion Include="BlackFox.VsWhere" Version="1.1.0" />
     <PackageVersion Include="Cake.Common" Condition="'$(TargetFramework)' == 'netstandard2.0'" Version="1.0.0" />
@@ -18,7 +18,7 @@
     <PackageVersion Include="Cake.Core" Condition="'$(TargetFramework)' == 'netstandard2.0'" Version="1.0.0" />
     <PackageVersion Include="Cake.Core" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" Version="2.0.0" />
     <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="CsvTextFieldParser" Version="1.2.2" />
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
     <PackageVersion Include="Expecto" Version="10.1.0" />
@@ -40,35 +40,35 @@
     <PackageVersion Include="Fake.Testing.ReportGenerator" Version="5.23.0" />
     <PackageVersion Include="Fake.Tools.git" Version="5.23.0" />
     <PackageVersion Include="FSharp.Compiler.Tools" Version="10.2.3" />
-    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
-    <PackageVersion Include="FsUnit" Version="5.6.0" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.200" />
+    <PackageVersion Include="FsUnit" Version="6.0.0" />
     <PackageVersion Include="FuChu" Version="1.1.0" />
     <PackageVersion Include="GtkSharp" Version="3.24.24.95" />
     <PackageVersion Include="Handlebars.Net" Version="2.1.4" />
-    <PackageVersion Include="Markdig" Version="0.34.0" />
+    <PackageVersion Include="Markdig" Version="0.35.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <!-- PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" / -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="Mono.CSharp" Version="4.0.0.143" />
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
-    <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.2.1" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.2.1" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NuGet.CommandLine" Version="6.8.0" />
-    <PackageVersion Include="NUnit" Version="4.0.1" />
+    <PackageVersion Include="NuGet.CommandLine" Version="6.9.1" />
+    <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
     <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" Version="3.12.0" />
     <!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
-    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.16.3" />
+    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.17.0" />
     <PackageVersion Include="OpenCover" Version="4.7.1221" />
     <PackageVersion Include="Pester" Version="5.5.0" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
@@ -79,15 +79,15 @@
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="Unquote" Version="7.0.0" />
     <PackageVersion Include="XmlDoc2CmdletDoc" Version="0.4.0-dotnetcore0001" />
-    <PackageVersion Include="xunit" Version="2.6.4" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.analyzers" Version="1.8.0" />
-    <PackageVersion Include="xunit.assert" Version="2.6.4" />
-    <PackageVersion Include="xunit.core" Version="2.6.4" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.6.4" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.6.4" />
-    <PackageVersion Include="xunit.runner.console" Version="2.6.4" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="xunit.analyzers" Version="1.11.0" />
+    <PackageVersion Include="xunit.assert" Version="2.7.0" />
+    <PackageVersion Include="xunit.core" Version="2.7.0" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.7.0" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.console" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
     <PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RegressionTesting/issue156/Tests/Tests.csproj b/RegressionTesting/issue156/Tests/Tests.csproj
index b27b5048a..626451ff4 100644
--- a/RegressionTesting/issue156/Tests/Tests.csproj
+++ b/RegressionTesting/issue156/Tests/Tests.csproj
@@ -10,7 +10,10 @@
         <TestProjectType>UnitTest</TestProjectType>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="xunit.runner.console" />
+        <PackageReference Include="xunit.runner.console">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="MSTest.TestFramework" />
         <PackageReference Include="MSTest.TestAdapter" />
     </ItemGroup>
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 3e3e8294d..e505ccd45 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -3,7 +3,11 @@
 A. Start with the Quick Start guide : https://github.com/SteveGilham/altcover/wiki/QuickStart-Guide and 
 read the FAQ : https://github.com/SteveGilham/altcover/wiki/FAQ
 
-# (Habu series release 25)
+# (Habu series release 26)
+* [Enhancement] [Discussion 202](https://github.com/SteveGilham/altcover/discussions/202) : More careful tidying of temporary `.runsettings` files, fixing long-standing errors of both commission and omission.
+* [Enhancement] [Discussion 199](https://github.com/SteveGilham/altcover/discussions/199) : Add `/p:AltCoverOutputRoot=[path]` and associated APIs for `dotnet test` command line creation.  The `[path]` is a directory to be used instead of `$(TargetDir)` for the relative placing of the instrumented or saved files.  The use-case here is when `$(TargetDir)` is close to `MAX_PATH` and the generated sub-folders would overflow that limit.`_`
+
+# 8.6.125 (Habu series release 25)
 * [BUGFIX] Issue 197 : Update `[InternalsVisibleTo]` references during instrumentation.  Finally fixing an issue that's been there since 2010!
 
 # 8.6.95 (Habu series release 24)
diff --git a/Samples/Sample15/Sample15/Sample15.fsproj b/Samples/Sample15/Sample15/Sample15.fsproj
index 3ffc1dd38..b92dbd392 100644
--- a/Samples/Sample15/Sample15/Sample15.fsproj
+++ b/Samples/Sample15/Sample15/Sample15.fsproj
@@ -29,7 +29,7 @@
   <Import Project="$(FSharpTargetsPath)" />
   
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Samples/Sample29/SimpleMix/SimpleMix.vcxproj b/Samples/Sample29/SimpleMix/SimpleMix.vcxproj
index 4417791ec..edca7c6e1 100644
--- a/Samples/Sample29/SimpleMix/SimpleMix.vcxproj
+++ b/Samples/Sample29/SimpleMix/SimpleMix.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
@@ -29,7 +29,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
diff --git a/Samples/Sample4/Sample4LongForm.fsproj b/Samples/Sample4/Sample4LongForm.fsproj
index 9524c68fc..b108b2726 100644
--- a/Samples/Sample4/Sample4LongForm.fsproj
+++ b/Samples/Sample4/Sample4LongForm.fsproj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="_Intermediate\Sample4\Debug+AnyCPU\net8.0\.NETCoreApp,Version=v6.0.AssemblyAttributes.fs" />
+    <Compile Remove="_Intermediate\Sample4\Debug+AnyCPU\net8.0\.NETCoreApp,Version=v8.0.AssemblyAttributes.fs" />
     <Compile Remove="_Intermediate\Sample4\Debug+AnyCPU\net8.0\Sample4.AssemblyInfo.fs" />
   </ItemGroup>
 
diff --git a/Samples/Sample7/Sample7.fsproj b/Samples/Sample7/Sample7.fsproj
index d51caeda3..569337519 100644
--- a/Samples/Sample7/Sample7.fsproj
+++ b/Samples/Sample7/Sample7.fsproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsUnit" />
+    <PackageReference Include="FsUnit" VersionOverride="5.6.0" />
     <PackageReference Include="NUnit" VersionOverride="3.14.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit3TestAdapter">
diff --git a/ToolUpdate.ps1 b/ToolUpdate.ps1
new file mode 100644
index 000000000..ea48435a5
--- /dev/null
+++ b/ToolUpdate.ps1
@@ -0,0 +1,7 @@
+& dotnet tool update dotnet-reportgenerator-globaltool
+& dotnet tool update xmldocmd
+& dotnet tool update altcode.gendarme-tool
+& dotnet tool update dotnet-fsharplint
+& dotnet tool update coveralls.net
+& dotnet tool update nbgv
+& dotnet tool update -g fantomas
\ No newline at end of file
diff --git a/global.json b/global.json
index 989a69caf..82dd9d3bd 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.202",
     "rollForward": "latestMinor"
   }
 }
\ No newline at end of file
diff --git a/nupkg/build/AltCover.targets b/nupkg/build/AltCover.targets
index e399da405..11e37e0af 100644
--- a/nupkg/build/AltCover.targets
+++ b/nupkg/build/AltCover.targets
@@ -5,8 +5,9 @@
     <AltCoverNetStdEngine>$(MSBuildThisFileDirectory)../lib/netstandard2.0/AltCover.Engine.dll</AltCoverNetStdEngine>
     <AltCoverEngine Condition="Exists($(AltCoverNetStdEngine))">$(AltCoverNetStdEngine)</AltCoverEngine>
     <AltCoverEngine Condition="Exists($(AltCoverNetCoreEngine))">$(AltCoverNetCoreEngine)</AltCoverEngine>
-    <AltCoverInstrumentedDirectory>$([System.IO.Path]::Combine($(TargetDir), '__Instrumented'))</AltCoverInstrumentedDirectory>
-    <AltCoverSavedDirectory>$([System.IO.Path]::Combine($(TargetDir), '__Saved'))</AltCoverSavedDirectory>
+    <AltCoverOutputRoot Condition="'$(AltCoverOutputRoot)' == ''">$(TargetDir)</AltCoverOutputRoot>
+    <AltCoverInstrumentedDirectory>$([System.IO.Path]::Combine($(AltCoverOutputRoot), '__Instrumented'))</AltCoverInstrumentedDirectory>
+    <AltCoverSavedDirectory>$([System.IO.Path]::Combine($(AltCoverOutputRoot), '__Saved'))</AltCoverSavedDirectory>
     <AltCoverFileExtension Condition="'$(AltCoverReportFormat).Substring(0,1).ToUpperInvariant()' != 'J'">.xml</AltCoverFileExtension>
     <AltCoverFileExtension Condition="'$(AltCoverReportFormat).Substring(0,1).ToUpperInvariant()' == 'J'">.json</AltCoverFileExtension>
   </PropertyGroup>
@@ -190,6 +191,27 @@
       VSTestNoLogo="$(VSTestNoLogo)" />
 
     <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'">
@@ -212,14 +234,6 @@
     <AltCover.Echo Condition="'$(AltCoverShowSummary)' != '' AND '$(AltCoverSummary)' !=''"
                    Text="$(AltCoverSummary)" Colour="$(AltCoverColour)"
                    Verbosity="$(AltCoverVerbosity)" />
-    <ItemGroup>
-      <AltCoverRecorderGFiles Include="$(TargetDir)/AltCover.Recorder.g.*" />
-      <AltCoverSavedFiles Include="$(AltCoverSavedDirectory))_$(ProjectName)/*.*" />
-      <AltCoverRunSettings Include="$(TEMP)/*.altcover.runsettings" />
-    </ItemGroup>
-    <Delete Files="@(AltCoverRunSettings)" />
-    <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'" />
+    <CallTarget Targets="AltCoverTidy" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/version.json b/version.json
index e197db46a..149ff3e08 100644
--- a/version.json
+++ b/version.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "8.6",
+  "version": "8.7",
   "release": {
-    "branchName" : "release/v{version}",
-    "versionIncrement" : "build",
-    "firstUnstableTag" : "pre-release"
+    "branchName": "release/v{version}",
+    "versionIncrement": "build",
+    "firstUnstableTag": "pre-release"
   },
   "publicReleaseRefSpec": [
     "^refs/heads/release/.*"