Merge branch 'main' into repo-assist/fix-issue-924-watch-root-override-c4e35a7b2fb520aa

Author: dsyme

src/fsdocs-tool/BuildCommand.fs

@@ -2448,7 +2448,7 @@ type ConvertCommand() =
 
                     let fsiEvaluator =
                         if this.eval then
-                            Some(FsiEvaluator(options = [| "--multiemit-" |]) :> IFsiEvaluator)
+                            Some(new FsiEvaluator(options = [| "--multiemit-" |]) :> IFsiEvaluator)
                         else
                             None
 

tests/Common/MarkdownUnit.fs

@@ -12,7 +12,7 @@ let shouldMatchPar f pars =
             | MarkdownPatterns.ParagraphNested(_, pars) -> List.exists (List.exists loop) pars
             | _ -> false
 
-    Assert.IsTrue(Seq.exists loop pars, "Should match the specified paragraph")
+    Assert.That(Seq.exists loop pars, Is.True, "Should match the specified paragraph")
 
 let shouldMatchSpan f pars =
     let rec loopSpan sp =
@@ -29,4 +29,4 @@ let shouldMatchSpan f pars =
         | MarkdownPatterns.ParagraphLeaf _ -> false
         | MarkdownPatterns.ParagraphNested(_, pars) -> List.exists (List.exists loopPar) pars
 
-    Assert.IsTrue(Seq.exists loopPar pars, "Should match the specified span")
+    Assert.That(Seq.exists loopPar pars, Is.True, "Should match the specified span")

tests/FSharp.Literate.Tests/DocContentTests.fs

@@ -300,9 +300,9 @@ let ``Parses description and keywords from frontmatter `` () =
         |> List.find (fst >> ((=) ParamKeys.``fsdocs-meta-tags``))
         |> snd
 
-    StringAssert.Contains("<meta name=\"description\"", meta)
-    StringAssert.Contains("Great description about StringAnalyzer!", meta)
-    StringAssert.Contains("fsharp, analyzers, tooling", meta)
+    Assert.That(meta, Does.Contain("<meta name=\"description\""))
+    Assert.That(meta, Does.Contain("Great description about StringAnalyzer!"))
+    Assert.That(meta, Does.Contain("fsharp, analyzers, tooling"))
 
 (* Cannot get this test to evaluate the notebook
 [<Test>]