diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e482c08ab..6026ae5db 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -2,12 +2,6 @@ "version": 1, "isRoot": true, "tools": { - "fake-cli": { - "version": "5.23.0", - "commands": [ - "fake" - ] - }, "paket": { "version": "7.1.5", "commands": [ diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 3c6df1f20..db72a6354 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -15,14 +15,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Setup .NET Core - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 - name: Restore .NET local tools run: dotnet tool restore - name: Restore packages run: dotnet paket restore - - name: Check code formatting conforms (run 'dotnet fantomas src tests docs build.fsx --recurse' to repair) - run: dotnet fantomas src tests docs build.fsx -r --check + - name: Check code formatting conforms (run 'dotnet fantomas src tests docs build --recurse' to repair) + run: dotnet fantomas src tests docs build -r --check - name: Build and test - run: dotnet fake run build.fsx + run: dotnet run --project ./build/build.fsproj diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml index ca0a58694..d35e2ff6f 100644 --- a/.github/workflows/push-main.yml +++ b/.github/workflows/push-main.yml @@ -15,17 +15,17 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Setup .NET Core - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 - name: Restore .NET local tools run: dotnet tool restore - name: Restore packages run: dotnet paket restore - - name: Check code formatting conforms (run 'dotnet fantomas src tests docs build.fsx --recurse' to repair) - run: dotnet fantomas src tests docs build.fsx -r --check + - name: Check code formatting conforms (run 'dotnet fantomas src tests docs build --recurse' to repair) + run: dotnet fantomas src tests docs build -r --check - name: Build and test - run: dotnet fake run build.fsx + run: dotnet run --project ./build/build.fsproj - name: Deploy docs uses: peaceiris/actions-gh-pages@v3 with: diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln index ba5a155db..9788ba162 100644 --- a/FSharp.Formatting.sln +++ b/FSharp.Formatting.sln @@ -129,6 +129,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{FAD5 docs\content\navbar-fixed-right.css = docs\content\navbar-fixed-right.css EndProjectSection EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{8B442E7B-A6B3-4B6B-A127-895E20FDAE84}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -227,6 +229,10 @@ Global {CB78F0EA-8005-4735-A02C-B86CEDC29D85}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB78F0EA-8005-4735-A02C-B86CEDC29D85}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB78F0EA-8005-4735-A02C-B86CEDC29D85}.Release|Any CPU.Build.0 = Release|Any CPU + {8B442E7B-A6B3-4B6B-A127-895E20FDAE84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B442E7B-A6B3-4B6B-A127-895E20FDAE84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B442E7B-A6B3-4B6B-A127-895E20FDAE84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B442E7B-A6B3-4B6B-A127-895E20FDAE84}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index 95190df6d..b7818f0a7 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,13 @@ See https://fsprojects.github.io/FSharp.Formatting/ Once built, you can run the command-line tool to self-build the docs for this directory using dotnet build - src\fsdocs-tool\bin\Debug\net6.0\fsdocs.exe watch - src\fsdocs-tool\bin\Debug\net6.0\fsdocs.exe build --clean + src\fsdocs-tool\bin\Debug\net7.0\fsdocs.exe watch + src\fsdocs-tool\bin\Debug\net7.0\fsdocs.exe build --clean ## Maintainer(s) - [@dsyme](https://github.com/dsyme) -- [@eiriktsarpalis](https://github.com/eiriktsarpalis) +- [@baronfel](https://github.com/baronfel) +- [@nhirschey](https://github.com/nhirschey) +- [@nojaf](https://github.com/nojaf) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6c13a89c0..83d5e94b6 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,15 @@ -## 16.2.0 +## 17.2.0 * Resolve markdown links in raw html [#769](https://github.com/fsprojects/FSharp.Formatting/issues/769) +## 17.1.0 + +* [Add syntax highlighting to API docs](https://github.com/fsprojects/FSharp.Formatting/pull/780) + +## 17.0.0 + +* Update to .NET 7.0.100 + ## 16.1.1 * [Fix arguments naming and escape operator name in usageHtml](https://github.com/fsprojects/FSharp.Formatting/pull/765/) diff --git a/build.cmd b/build.cmd index 1bdd5157d..f0b7721cb 100644 --- a/build.cmd +++ b/build.cmd @@ -4,4 +4,4 @@ set PAKET_SKIP_RESTORE_TARGETS true dotnet tool restore dotnet paket restore -dotnet fake build %* \ No newline at end of file +dotnet run --project .\build\build.fsproj -- %* \ No newline at end of file diff --git a/build.sh b/build.sh index c52a54a2e..732b8deea 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,4 @@ export PAKET_SKIP_RESTORE_TARGETS=true dotnet tool restore && \ dotnet paket restore && \ -dotnet fake run build.fsx "$@" \ No newline at end of file +dotnet run --project ./build/build.fsproj -- "$@" \ No newline at end of file diff --git a/build.fsx b/build/build.fs similarity index 67% rename from build.fsx rename to build/build.fs index d97692eba..eec34fa93 100644 --- a/build.fsx +++ b/build/build.fs @@ -1,13 +1,3 @@ -// This is a FAKE 5.0 script, run using -// dotnet fake build - -#r "paket: groupref fake //" - -#if !FAKE -#load ".fake/build.fsx/intellisense.fsx" -#r "netstandard" -#endif - open System open System.Xml.Linq open Fake.Core @@ -16,23 +6,21 @@ open Fake.IO.Globbing.Operators open Fake.IO.FileSystemOperators open Fake.DotNet open Fake.IO -open Fake.Tools -Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ +let root = Path.combine __SOURCE_DIRECTORY__ ".." +Environment.CurrentDirectory <- root // Information about the project to be used at NuGet and in AssemblyInfo files let project = "FSharp.Formatting" -let summary = - "A package of libraries for building great F# documentation, samples and blogs" +let summary = "A package of libraries for building great F# documentation, samples and blogs" let license = "Apache 2.0 License" -let configuration = - DotNet.BuildConfiguration.fromEnvironVarOrDefault "configuration" DotNet.BuildConfiguration.Release +let configuration = DotNet.BuildConfiguration.fromEnvironVarOrDefault "configuration" DotNet.BuildConfiguration.Release // Folder to deposit deploy artifacts -let artifactsDir = __SOURCE_DIRECTORY__ @@ "artifacts" +let artifactsDir = root @@ "artifacts" // Read release notes document let release = ReleaseNotes.load "RELEASE_NOTES.md" @@ -41,8 +29,7 @@ let projectRepo = "https://github.com/fsprojects/FSharp.Formatting" // -------------------------------------------------------------------------------------- // Generate assembly info files with the right version & up-to-date information - -Target.create "AssemblyInfo" (fun _ -> +let assemblyInfo _ = let info = [ AssemblyInfo.Product project AssemblyInfo.Description summary @@ -64,51 +51,48 @@ Target.create "AssemblyInfo" (fun _ -> ) ) - versionProps.Save("version.props")) + versionProps.Save("version.props") // Clean build results // -------------------------------------------------------------------------------------- - -Target.create "Clean" (fun _ -> +let clean _ = !!artifactsDir ++ "temp" |> Shell.cleanDirs // in case the above pattern is empty as it only matches existing stuff - [ "bin"; "temp"; "tests/bin" ] |> Seq.iter Directory.ensure) + [ "bin"; "temp"; "tests/bin" ] |> Seq.iter Directory.ensure // Build library // -------------------------------------------------------------------------------------- let solutionFile = "FSharp.Formatting.sln" -Target.create "Build" (fun _ -> +let build _ = solutionFile - |> DotNet.build (fun opts -> { opts with Configuration = configuration })) + |> DotNet.build (fun opts -> { opts with Configuration = configuration }) -Target.create "Tests" (fun _ -> +let tests _ = solutionFile |> DotNet.test (fun opts -> { opts with Blame = true NoBuild = true - Framework = Some "net6.0" + Framework = Some "net7.0" Configuration = configuration ResultsDirectory = Some "TestResults" - Logger = Some "trx" })) + Logger = Some "trx" }) // -------------------------------------------------------------------------------------- // Build a NuGet package - -Target.create "NuGet" (fun _ -> +let nuget _ = DotNet.pack (fun pack -> { pack with OutputPath = Some artifactsDir Configuration = configuration }) - solutionFile) + solutionFile // Generate the documentation by dogfooding the tools pacakge // -------------------------------------------------------------------------------------- - -Target.create "GenerateDocs" (fun _ -> +let generateDocs _ = Shell.cleanDir ".fsdocs" Shell.cleanDir ".packages" // Τhe tool has been uninstalled when the @@ -119,9 +103,13 @@ Target.create "GenerateDocs" (fun _ -> ("install --no-cache --version " + release.NugetVersion + " --add-source " + + "\"" + artifactsDir + + "\"" + " --tool-path " + + "\"" + artifactsDir + + "\"" + " fsdocs-tool") |> ignore @@ -133,17 +121,40 @@ Target.create "GenerateDocs" (fun _ -> |> ignore // DotNet.exec id "fsdocs" "build --strict --clean --properties Configuration=Release" |> ignore // DotNet.exec id "tool" "uninstall --local fsdocs-tool" |> ignore - Shell.cleanDir ".packages") + Shell.cleanDir ".packages" + +let initTargets () = + Target.create "AssemblyInfo" assemblyInfo + Target.create "Clean" clean + Target.create "Build" build + Target.create "Tests" tests + Target.create "NuGet" nuget + Target.create "GenerateDocs" generateDocs + Target.create "All" ignore + + // clean and recreate assembly inform on release + "Clean" + ==> "AssemblyInfo" + ==> "Build" + ==> "NuGet" + ==> "Tests" + ==> "GenerateDocs" + ==> "All" + |> ignore + +//----------------------------------------------------------------------------- +// Target Start +//----------------------------------------------------------------------------- +[] +let main argv = + argv + |> Array.toList + |> Context.FakeExecutionContext.Create false "build.fsx" + |> Context.RuntimeContext.Fake + |> Context.setExecutionContext -Target.create "All" ignore + initTargets () -// clean and recreate assembly inform on release -"Clean" -==> "AssemblyInfo" -==> "Build" -==> "NuGet" -==> "Tests" -==> "GenerateDocs" -==> "All" + Target.runOrDefaultWithArguments "All" -Target.runOrDefault "All" + 0 // return an integer exit code diff --git a/build/build.fsproj b/build/build.fsproj new file mode 100644 index 000000000..866164296 --- /dev/null +++ b/build/build.fsproj @@ -0,0 +1,14 @@ + + + + Exe + net7.0 + 3390;$(WarnOn) + false + true + + + + + + \ No newline at end of file diff --git a/build/paket.references b/build/paket.references new file mode 100644 index 000000000..f2880c957 --- /dev/null +++ b/build/paket.references @@ -0,0 +1,12 @@ +group Fake + +FSharp.Core +Fake.Core.Target +Fake.Core.ReleaseNotes +Fake.DotNet.AssemblyInfoFile +Fake.DotNet.Cli +Fake.DotNet.Testing.NUnit +Fake.DotNet.NuGet +Fake.DotNet.MsBuild +Fake.Tools.Git +Fake.DotNet.Paket \ No newline at end of file diff --git a/csharp/MarkdownSharp/MarkdownSharp.csproj b/csharp/MarkdownSharp/MarkdownSharp.csproj index ba7d4f98d..e888e4103 100644 --- a/csharp/MarkdownSharp/MarkdownSharp.csproj +++ b/csharp/MarkdownSharp/MarkdownSharp.csproj @@ -83,4 +83,789 @@ --> + + + + + ..\..\..\..\.nuget\packages\blackfox.vswhere\1.1.0\lib\netstandard2.0\BlackFox.VsWhere.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.commandlineparsing\5.23.1\lib\netstandard2.0\Fake.Core.CommandLineParsing.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.context\5.23.1\lib\netstandard2.0\Fake.Core.Context.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.environment\5.23.1\lib\netstandard2.0\Fake.Core.Environment.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.fakevar\5.23.1\lib\netstandard2.0\Fake.Core.FakeVar.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.process\5.23.1\lib\netstandard2.0\Fake.Core.Process.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.releasenotes\5.23.1\lib\netstandard2.0\Fake.Core.ReleaseNotes.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.semver\5.23.1\lib\netstandard2.0\Fake.Core.SemVer.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.string\5.23.1\lib\netstandard2.0\Fake.Core.String.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.target\5.23.1\lib\netstandard2.0\Fake.Core.Target.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.tasks\5.23.1\lib\netstandard2.0\Fake.Core.Tasks.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.trace\5.23.1\lib\netstandard2.0\Fake.Core.Trace.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.xml\5.23.1\lib\netstandard2.0\Fake.Core.Xml.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.assemblyinfofile\5.23.1\lib\netstandard2.0\Fake.DotNet.AssemblyInfoFile.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.cli\5.23.1\lib\netstandard2.0\Fake.DotNet.Cli.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.msbuild\5.23.1\lib\netstandard2.0\Fake.DotNet.MSBuild.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.nuget\5.23.1\lib\netstandard2.0\Fake.DotNet.NuGet.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.paket\5.23.1\lib\netstandard2.0\Fake.DotNet.Paket.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.testing.nunit\5.23.1\lib\netstandard2.0\Fake.DotNet.Testing.NUnit.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.io.filesystem\5.23.1\lib\netstandard2.0\Fake.IO.FileSystem.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.net.http\5.23.1\lib\netstandard2.0\Fake.Net.Http.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.testing.common\5.23.1\lib\netstandard2.0\Fake.Testing.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.tools.git\5.23.1\lib\netstandard2.0\Fake.Tools.Git.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fparsec\1.1.1\lib\netstandard2.0\FParsec.dll + True + True + + + ..\..\..\..\.nuget\packages\fparsec\1.1.1\lib\netstandard2.0\FParsecCS.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fsharp.control.reactive\5.0.5\lib\net6.0\FSharp.Control.Reactive.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fsharp.core\7.0.0\lib\netstandard2.1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build\17.3.1\lib\net6.0\Microsoft.Build.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.framework\17.3.1\lib\net6.0\Microsoft.Build.Framework.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.tasks.core\17.3.1\lib\net6.0\Microsoft.Build.Tasks.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.utilities.core\17.3.1\lib\net6.0\Microsoft.Build.Utilities.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.net.stringtools\17.3.1\lib\net6.0\Microsoft.NET.StringTools.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.win32.registry\5.0.0\lib\netstandard2.0\Microsoft.Win32.Registry.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.win32.systemevents\6.0.1\lib\net6.0\Microsoft.Win32.SystemEvents.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\msbuild.structuredlogger\2.1.669\lib\netstandard2.0\StructuredLogger.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.common\6.3.0\lib\netstandard2.0\NuGet.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.configuration\6.3.0\lib\netstandard2.0\NuGet.Configuration.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.frameworks\6.3.0\lib\netstandard2.0\NuGet.Frameworks.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.packaging\6.3.0\lib\net5.0\NuGet.Packaging.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.protocol\6.3.0\lib\net5.0\NuGet.Protocol.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.versioning\6.3.0\lib\netstandard2.0\NuGet.Versioning.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.codedom\6.0.0\lib\net6.0\System.CodeDom.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.collections.immutable\6.0.0\lib\net6.0\System.Collections.Immutable.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.configuration.configurationmanager\6.0.0\lib\net6.0\System.Configuration.ConfigurationManager.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.drawing.common\6.0.0\lib\net6.0\System.Drawing.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.formats.asn1\6.0.0\lib\net6.0\System.Formats.Asn1.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reactive\5.0.0\lib\net5.0\System.Reactive.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reflection.metadata\6.0.1\lib\net6.0\System.Reflection.Metadata.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reflection.metadataloadcontext\6.0.0\lib\net6.0\System.Reflection.MetadataLoadContext.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.resources.extensions\6.0.0\lib\net6.0\System.Resources.Extensions.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.runtime.compilerservices.unsafe\6.0.0\lib\net6.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.accesscontrol\6.0.0\lib\net6.0\System.Security.AccessControl.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.cng\5.0.0\lib\netcoreapp3.0\System.Security.Cryptography.Cng.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.pkcs\6.0.1\lib\net6.0\System.Security.Cryptography.Pkcs.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.protecteddata\6.0.0\lib\net6.0\System.Security.Cryptography.ProtectedData.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.xml\6.0.1\lib\net6.0\System.Security.Cryptography.Xml.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.permissions\6.0.0\lib\net6.0\System.Security.Permissions.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.principal.windows\5.0.0\lib\netstandard2.0\System.Security.Principal.Windows.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.encoding.codepages\6.0.0\lib\net6.0\System.Text.Encoding.CodePages.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.encodings.web\6.0.0\lib\net6.0\System.Text.Encodings.Web.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.json\6.0.5\lib\net6.0\System.Text.Json.dll + True + True + + + + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + + + ..\..\..\..\.nuget\packages\system.threading.tasks.dataflow\6.0.0\lib\net6.0\System.Threading.Tasks.Dataflow.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.windows.extensions\6.0.0\lib\net6.0\System.Windows.Extensions.dll + True + True + + + + \ No newline at end of file diff --git a/csharp/MarkdownSharpTests/App.config b/csharp/MarkdownSharpTests/App.config index ff3420975..7e94e5341 100644 --- a/csharp/MarkdownSharpTests/App.config +++ b/csharp/MarkdownSharpTests/App.config @@ -26,6 +26,4 @@ - - \ No newline at end of file diff --git a/csharp/MarkdownSharpTests/MarkdownSharpTests.csproj b/csharp/MarkdownSharpTests/MarkdownSharpTests.csproj index 09e960926..9469b808b 100644 --- a/csharp/MarkdownSharpTests/MarkdownSharpTests.csproj +++ b/csharp/MarkdownSharpTests/MarkdownSharpTests.csproj @@ -31,6 +31,7 @@ false false true + true true @@ -242,4 +243,789 @@ --> + + + + + ..\..\..\..\.nuget\packages\blackfox.vswhere\1.1.0\lib\netstandard2.0\BlackFox.VsWhere.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.commandlineparsing\5.23.1\lib\netstandard2.0\Fake.Core.CommandLineParsing.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.context\5.23.1\lib\netstandard2.0\Fake.Core.Context.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.environment\5.23.1\lib\netstandard2.0\Fake.Core.Environment.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.fakevar\5.23.1\lib\netstandard2.0\Fake.Core.FakeVar.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.process\5.23.1\lib\netstandard2.0\Fake.Core.Process.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.releasenotes\5.23.1\lib\netstandard2.0\Fake.Core.ReleaseNotes.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.semver\5.23.1\lib\netstandard2.0\Fake.Core.SemVer.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.string\5.23.1\lib\netstandard2.0\Fake.Core.String.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.target\5.23.1\lib\netstandard2.0\Fake.Core.Target.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.tasks\5.23.1\lib\netstandard2.0\Fake.Core.Tasks.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.trace\5.23.1\lib\netstandard2.0\Fake.Core.Trace.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.core.xml\5.23.1\lib\netstandard2.0\Fake.Core.Xml.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.assemblyinfofile\5.23.1\lib\netstandard2.0\Fake.DotNet.AssemblyInfoFile.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.cli\5.23.1\lib\netstandard2.0\Fake.DotNet.Cli.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.msbuild\5.23.1\lib\netstandard2.0\Fake.DotNet.MSBuild.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.nuget\5.23.1\lib\netstandard2.0\Fake.DotNet.NuGet.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.paket\5.23.1\lib\netstandard2.0\Fake.DotNet.Paket.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.dotnet.testing.nunit\5.23.1\lib\netstandard2.0\Fake.DotNet.Testing.NUnit.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.io.filesystem\5.23.1\lib\netstandard2.0\Fake.IO.FileSystem.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.net.http\5.23.1\lib\netstandard2.0\Fake.Net.Http.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.testing.common\5.23.1\lib\netstandard2.0\Fake.Testing.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fake.tools.git\5.23.1\lib\netstandard2.0\Fake.Tools.Git.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fparsec\1.1.1\lib\netstandard2.0\FParsec.dll + True + True + + + ..\..\..\..\.nuget\packages\fparsec\1.1.1\lib\netstandard2.0\FParsecCS.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fsharp.control.reactive\5.0.5\lib\net6.0\FSharp.Control.Reactive.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\fsharp.core\7.0.0\lib\netstandard2.1\FSharp.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build\17.3.1\lib\net6.0\Microsoft.Build.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.framework\17.3.1\lib\net6.0\Microsoft.Build.Framework.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.tasks.core\17.3.1\lib\net6.0\Microsoft.Build.Tasks.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.build.utilities.core\17.3.1\lib\net6.0\Microsoft.Build.Utilities.Core.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.net.stringtools\17.3.1\lib\net6.0\Microsoft.NET.StringTools.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.win32.registry\5.0.0\lib\netstandard2.0\Microsoft.Win32.Registry.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\microsoft.win32.systemevents\6.0.1\lib\net6.0\Microsoft.Win32.SystemEvents.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\msbuild.structuredlogger\2.1.669\lib\netstandard2.0\StructuredLogger.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.common\6.3.0\lib\netstandard2.0\NuGet.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.configuration\6.3.0\lib\netstandard2.0\NuGet.Configuration.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.frameworks\6.3.0\lib\netstandard2.0\NuGet.Frameworks.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.packaging\6.3.0\lib\net5.0\NuGet.Packaging.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.protocol\6.3.0\lib\net5.0\NuGet.Protocol.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\nuget.versioning\6.3.0\lib\netstandard2.0\NuGet.Versioning.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.codedom\6.0.0\lib\net6.0\System.CodeDom.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.collections.immutable\6.0.0\lib\net6.0\System.Collections.Immutable.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.configuration.configurationmanager\6.0.0\lib\net6.0\System.Configuration.ConfigurationManager.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.drawing.common\6.0.0\lib\net6.0\System.Drawing.Common.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.formats.asn1\6.0.0\lib\net6.0\System.Formats.Asn1.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reactive\5.0.0\lib\net5.0\System.Reactive.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reflection.metadata\6.0.1\lib\net6.0\System.Reflection.Metadata.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.reflection.metadataloadcontext\6.0.0\lib\net6.0\System.Reflection.MetadataLoadContext.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.resources.extensions\6.0.0\lib\net6.0\System.Resources.Extensions.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.runtime.compilerservices.unsafe\6.0.0\lib\net6.0\System.Runtime.CompilerServices.Unsafe.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.accesscontrol\6.0.0\lib\net6.0\System.Security.AccessControl.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.cng\5.0.0\lib\netcoreapp3.0\System.Security.Cryptography.Cng.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.pkcs\6.0.1\lib\net6.0\System.Security.Cryptography.Pkcs.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.protecteddata\6.0.0\lib\net6.0\System.Security.Cryptography.ProtectedData.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.cryptography.xml\6.0.1\lib\net6.0\System.Security.Cryptography.Xml.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.permissions\6.0.0\lib\net6.0\System.Security.Permissions.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.security.principal.windows\5.0.0\lib\netstandard2.0\System.Security.Principal.Windows.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.encoding.codepages\6.0.0\lib\net6.0\System.Text.Encoding.CodePages.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.encodings.web\6.0.0\lib\net6.0\System.Text.Encodings.Web.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.text.json\6.0.5\lib\net6.0\System.Text.Json.dll + True + True + + + + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + + + ..\..\..\..\.nuget\packages\system.threading.tasks.dataflow\6.0.0\lib\net6.0\System.Threading.Tasks.Dataflow.dll + True + True + + + + + + + + + ..\..\..\..\.nuget\packages\system.windows.extensions\6.0.0\lib\net6.0\System.Windows.Extensions.dll + True + True + + + + \ No newline at end of file diff --git a/docs/_template.html b/docs/_template.html index 01e1c3bcd..3baf0ece5 100644 --- a/docs/_template.html +++ b/docs/_template.html @@ -13,7 +13,7 @@ - + diff --git a/docs/apidocs.fsx b/docs/apidocs.fsx index 94e1e50ed..10bde06a5 100644 --- a/docs/apidocs.fsx +++ b/docs/apidocs.fsx @@ -169,7 +169,7 @@ type GenericClass2<'T>() = /// and let referringFunction2 () = "result" -(* +(** ## Go to Source links diff --git a/global.json b/global.json index a79a2eaf5..34db1db96 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.400", + "version": "7.0.100", "rollForward": "minor" } } diff --git a/paket.dependencies b/paket.dependencies index a8480d59e..caf0fa0fb 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -5,13 +5,13 @@ framework: auto-detect storage: none nuget FSharp.Core >= 4.7 lowest_matching:true -nuget FSharp.Compiler.Service 41.0.5 +nuget FSharp.Compiler.Service 42.7.101 nuget CommandLineParser ~> 2.8 nuget Microsoft.Build.Framework nuget Microsoft.Build.Tasks.Core nuget Microsoft.Build.Utilities.Core -nuget Ionide.ProjInfo -nuget Ionide.ProjInfo.Sln +nuget Ionide.ProjInfo 0.61.0 +nuget Ionide.ProjInfo.Sln 0.61.0 nuget Newtonsoft.Json nuget Suave nuget System.Memory @@ -34,7 +34,7 @@ nuget Microsoft.NET.Test.Sdk group Fake source https://api.nuget.org/v3/index.json storage: none - framework: net6.0 + framework: net7.0 nuget FSharp.Core nuget Fake.Core.Target @@ -45,4 +45,4 @@ group Fake nuget Fake.DotNet.NuGet nuget Fake.DotNet.MsBuild nuget Fake.Tools.Git - nuget Fake.DotNet.Paket \ No newline at end of file + nuget Fake.DotNet.Paket \ No newline at end of file diff --git a/paket.lock b/paket.lock index 3cc64f104..2c7e53dea 100644 --- a/paket.lock +++ b/paket.lock @@ -1,66 +1,51 @@ STORAGE: NONE -RESTRICTION: || (== net6.0) (== netstandard2.1) +RESTRICTION: || (== net7.0) (== netstandard2.1) NUGET remote: https://api.nuget.org/v3/index.json CommandLineParser (2.9.1) - FSharp.Compiler.Service (41.0.5) - FSharp.Core (6.0.5) - Microsoft.Build.Framework (>= 17.0) - Microsoft.Build.Tasks.Core (>= 17.0) - Microsoft.Build.Utilities.Core (>= 17.0) + FSharp.Compiler.Service (42.7.101) + FSharp.Core (7.0) + Microsoft.Build.Framework (>= 17.4) + Microsoft.Build.Tasks.Core (>= 17.4) + Microsoft.Build.Utilities.Core (>= 17.4) System.Buffers (>= 4.5.1) - System.Collections.Immutable (>= 5.0) - System.Diagnostics.Process (>= 4.3) - System.Diagnostics.TraceSource (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Linq.Queryable (>= 4.3) - System.Memory (>= 4.5.4) - System.Net.Requests (>= 4.3) - System.Net.Security (>= 4.3.1) - System.Reflection.Emit (>= 4.3) - System.Reflection.Metadata (>= 5.0) - System.Reflection.TypeExtensions (>= 4.3) - System.Runtime (>= 4.3) + System.Collections.Immutable (>= 6.0) + System.Memory (>= 4.5.5) + System.Reflection.Emit (>= 4.7) + System.Reflection.Metadata (>= 6.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Loader (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Principal (>= 4.3) - System.Threading.Tasks.Parallel (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - FSharp.Core (6.0.5) + FSharp.Core (7.0) FSharp.Data (3.3.3) FSharp.Core (>= 4.3.4) FsUnit (3.9) FSharp.Core (>= 4.2.3) NETStandard.Library (>= 2.0.3) NUnit (>= 3.12 < 4.0) - Ionide.ProjInfo (0.60) - FSharp.Core (>= 6.0.5) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - Ionide.ProjInfo.Sln (>= 0.60) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - Microsoft.Build (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - Microsoft.Build.Framework (>= 17.2) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - SemanticVersioning (>= 2.0.2) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - Ionide.ProjInfo.Sln (0.60) - Microsoft.Build (17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - Microsoft.Build.Framework (>= 17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - Microsoft.NET.StringTools (>= 17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - System.Collections.Immutable (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - System.Configuration.ConfigurationManager (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - System.Reflection.Metadata (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - System.Reflection.MetadataLoadContext (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - System.Security.Principal.Windows (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - System.Text.Encoding.CodePages (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) - System.Text.Json (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) - Microsoft.Build.Framework (17.3.1) + Ionide.ProjInfo (0.61) + FSharp.Core (>= 6.0.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + Ionide.ProjInfo.Sln (>= 0.61) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + Microsoft.Build (>= 17.2) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + Microsoft.Build.Framework (>= 17.2) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + SemanticVersioning (>= 2.0.2) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + Ionide.ProjInfo.Sln (0.61) + Microsoft.Build (17.3.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + Microsoft.Build.Framework (>= 17.3.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + Microsoft.NET.StringTools (>= 17.3.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + System.Collections.Immutable (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + System.Configuration.ConfigurationManager (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + System.Reflection.Metadata (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + System.Reflection.MetadataLoadContext (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + System.Security.Principal.Windows (>= 5.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + System.Text.Encoding.CodePages (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) + System.Text.Json (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + System.Threading.Tasks.Dataflow (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net472)) (&& (== netstandard2.1) (>= net6.0)) + Microsoft.Build.Framework (17.4) + Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1 System.Security.Permissions (>= 6.0) - Microsoft.Build.Tasks.Core (17.3.1) - Microsoft.Build.Framework (>= 17.3.1) - Microsoft.Build.Utilities.Core (>= 17.3.1) - Microsoft.NET.StringTools (>= 17.3.1) + Microsoft.Build.Tasks.Core (17.4) + Microsoft.Build.Framework (>= 17.4) + Microsoft.Build.Utilities.Core (>= 17.4) + Microsoft.NET.StringTools (>= 17.4) Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1 System.CodeDom (>= 6.0) System.Collections.Immutable (>= 6.0) @@ -70,9 +55,9 @@ NUGET System.Security.Cryptography.Xml (>= 6.0) System.Security.Permissions (>= 6.0) System.Threading.Tasks.Dataflow (>= 6.0) - Microsoft.Build.Utilities.Core (17.3.1) - Microsoft.Build.Framework (>= 17.3.1) - Microsoft.NET.StringTools (>= 17.3.1) + Microsoft.Build.Utilities.Core (17.4) + Microsoft.Build.Framework (>= 17.4) + Microsoft.NET.StringTools (>= 17.4) Microsoft.Win32.Registry (>= 5.0) - restriction: == netstandard2.1 System.Collections.Immutable (>= 6.0) System.Configuration.ConfigurationManager (>= 6.0) @@ -89,651 +74,224 @@ NUGET System.Threading.Tasks.Extensions (>= 4.5.4) Microsoft.CodeAnalysis.CSharp (3.11) Microsoft.CodeAnalysis.Common (3.11) - Microsoft.CodeCoverage (17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net45)) (&& (== netstandard2.1) (>= netcoreapp1.0)) - Microsoft.NET.StringTools (17.3.1) + Microsoft.CodeCoverage (17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.NET.StringTools (17.4) System.Memory (>= 4.5.5) System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.NET.Test.Sdk (17.3.1) - Microsoft.CodeCoverage (>= 17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net45)) (&& (== netstandard2.1) (>= netcoreapp1.0)) - Microsoft.TestPlatform.TestHost (>= 17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) + Microsoft.NET.Test.Sdk (17.4) + Microsoft.CodeCoverage (>= 17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net462)) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.TestPlatform.TestHost (>= 17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) Microsoft.NETCore.Platforms (6.0.5) - Microsoft.NETCore.Targets (5.0) - Microsoft.TestPlatform.ObjectModel (17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) + Microsoft.TestPlatform.ObjectModel (17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) NuGet.Frameworks (>= 5.11) System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) - Microsoft.TestPlatform.ObjectModel (>= 17.3.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) (&& (== netstandard2.1) (>= uap10.0)) - Newtonsoft.Json (>= 9.0.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) (&& (== netstandard2.1) (>= uap10.0)) - Microsoft.Win32.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - Microsoft.Win32.Registry (5.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monoandroid) (< netstandard1.3)) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.1) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.1) + Microsoft.TestPlatform.TestHost (17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.TestPlatform.ObjectModel (>= 17.4) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Newtonsoft.Json (>= 13.0.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Win32.Registry (5.0) - restriction: == netstandard2.1 + System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= monoandroid) (< netstandard1.3)) (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.1) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) NETStandard.Library (2.0.3) Microsoft.NETCore.Platforms (>= 1.1) Newtonsoft.Json (13.0.1) - NuGet.Frameworks (6.3) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp1.0)) (&& (== netstandard2.1) (>= netcoreapp2.1)) + NuGet.Frameworks (6.3) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) NUnit (3.13.3) NETStandard.Library (>= 2.0) - NUnit3TestAdapter (4.2.1) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.native.System (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Http (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Security (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - SemanticVersioning (2.0.2) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) + NUnit3TestAdapter (4.3) + SemanticVersioning (2.0.2) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) Suave (2.6.2) FSharp.Core System.Buffers (4.5.1) System.CodeDom (6.0) - System.Collections (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Collections.Concurrent (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) System.Collections.Immutable (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.1) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Configuration.ConfigurationManager (6.0) System.Security.Cryptography.ProtectedData (>= 6.0) System.Security.Permissions (>= 6.0) - System.Diagnostics.Debug (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Diagnostics.DiagnosticSource (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< net5.0)) (== netstandard2.1) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Diagnostics.Process (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - Microsoft.Win32.Registry (>= 4.3) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encoding.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Diagnostics.TraceSource (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Diagnostics.Tracing (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Drawing.Common (6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) - Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Drawing.Common (6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) System.Formats.Asn1 (6.0) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.1) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.1) - System.Globalization (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Globalization.Calendars (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Runtime (>= 4.3) - System.Globalization.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.IO (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem.Primitives (4.3) - System.Runtime (>= 4.3) - System.Linq (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Linq.Expressions (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Linq (>= 4.3) - System.ObjectModel (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Emit.Lightweight (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Reflection.TypeExtensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Linq.Queryable (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Linq (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1) System.Memory (4.5.5) - System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.1) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.1) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.1) - System.Net.Http (4.3.4) - Microsoft.NETCore.Platforms (>= 1.1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.DiagnosticSource (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Primitives (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (>= 4.3) - System.Net.Requests (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Net.Http (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Net.WebHeaderCollection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Security (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Security (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Security.Principal (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Net.WebHeaderCollection (4.3) - System.Collections (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.1) - System.ObjectModel (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Reflection (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) + System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.1) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.1) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.1) System.Reflection.Emit (4.7) - System.Reflection.Emit.ILGeneration (4.7) - System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) System.Reflection.Metadata (6.0.1) System.Collections.Immutable (>= 6.0) - System.Reflection.MetadataLoadContext (6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) + System.Reflection.MetadataLoadContext (6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) System.Collections.Immutable (>= 6.0) System.Reflection.Metadata (>= 6.0) - System.Reflection.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Reflection.TypeExtensions (4.7) System.Resources.Extensions (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.1) - System.Resources.ResourceManager (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1) System.Runtime.CompilerServices.Unsafe (6.0) - System.Runtime.Extensions (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Runtime.InteropServices (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.Loader (4.3) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Numerics (4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) System.Security.AccessControl (6.0) - System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.1) - System.Security.Claims (4.3) - System.Collections (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Security.Principal (>= 4.3) - System.Security.Cryptography.Algorithms (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Security.Cryptography.Cng (5.0) - System.Security.Cryptography.Csp (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Security.Cryptography.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Linq (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (5.0) - System.Formats.Asn1 (>= 5.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.0)) + System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< net6.0)) (== netstandard2.1) + System.Security.Cryptography.Cng (5.0) - restriction: || (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netcoreapp3.1)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.1) System.Security.Cryptography.Pkcs (6.0.1) System.Formats.Asn1 (>= 6.0) - System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.1) - System.Security.Cryptography.Primitives (4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) + System.Security.Cryptography.Cng (>= 5.0) - restriction: || (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netcoreapp3.1)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.1) System.Security.Cryptography.ProtectedData (6.0) - System.Memory (>= 4.5.4) - restriction: == netstandard2.1 - System.Security.Cryptography.X509Certificates (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Calendars (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Cng (>= 4.3) - System.Security.Cryptography.Csp (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.1) System.Security.Cryptography.Xml (6.0.1) - System.Memory (>= 4.5.4) - restriction: == netstandard2.1 + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (< net6.0)) (== netstandard2.1) System.Security.AccessControl (>= 6.0) System.Security.Cryptography.Pkcs (>= 6.0.1) System.Security.Permissions (6.0) System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Security.Principal (4.3) - System.Runtime (>= 4.3) + System.Windows.Extensions (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) System.Security.Principal.Windows (5.0) - System.Text.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Text.Encoding.CodePages (6.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.1) + System.Memory (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.1) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encoding.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encodings.Web (6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) + System.Text.Encodings.Web (6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0.5) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= net6.0)) + System.Text.Json (6.0.5) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= net6.0)) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Text.Encodings.Web (>= 6.0) - System.Threading (4.3) - System.Runtime (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Tasks (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Threading.Tasks.Dataflow (6.0) System.Threading.Tasks.Extensions (4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.1) - System.Threading.Tasks.Parallel (4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (4.3) - System.Runtime (>= 4.3) - System.Threading.ThreadPool (4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Windows.Extensions (6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) - System.Drawing.Common (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.0)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= wp8)) (== netstandard2.1) + System.Windows.Extensions (6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) + System.Drawing.Common (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.1) (>= netcoreapp3.1)) GROUP Fake STORAGE: NONE -RESTRICTION: == net6.0 +RESTRICTION: == net7.0 NUGET remote: https://api.nuget.org/v3/index.json BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Core.CommandLineParsing (5.23) + Fake.Core.CommandLineParsing (5.23.1) FParsec (>= 1.1.1) FSharp.Core (>= 6.0) - Fake.Core.Context (5.23) + Fake.Core.Context (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Environment (5.23) + Fake.Core.Environment (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.FakeVar (5.23) - Fake.Core.Context (>= 5.23) + Fake.Core.FakeVar (5.23.1) + Fake.Core.Context (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Process (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.FakeVar (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.Core.Process (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) System.Collections.Immutable (>= 5.0) - Fake.Core.ReleaseNotes (5.23) - Fake.Core.SemVer (>= 5.23) - Fake.Core.String (>= 5.23) + Fake.Core.ReleaseNotes (5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.SemVer (5.23) + Fake.Core.SemVer (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.String (5.23) + Fake.Core.String (5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Target (5.23) - Fake.Core.CommandLineParsing (>= 5.23) - Fake.Core.Context (>= 5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.FakeVar (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) + Fake.Core.Target (5.23.1) + Fake.Core.CommandLineParsing (>= 5.23.1) + Fake.Core.Context (>= 5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Control.Reactive (>= 5.0.2) FSharp.Core (>= 6.0) - Fake.Core.Tasks (5.23) - Fake.Core.Trace (>= 5.23) + Fake.Core.Tasks (5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Trace (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.FakeVar (>= 5.23) + Fake.Core.Trace (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.FakeVar (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Core.Xml (5.23) - Fake.Core.String (>= 5.23) + Fake.Core.Xml (5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.DotNet.AssemblyInfoFile (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.DotNet.AssemblyInfoFile (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.DotNet.Cli (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.DotNet.MsBuild (>= 5.23) - Fake.DotNet.NuGet (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.DotNet.Cli (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.DotNet.MsBuild (>= 5.23.1) + Fake.DotNet.NuGet (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) Mono.Posix.NETStandard (>= 1.0) Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.MsBuild (5.23) + Fake.DotNet.MsBuild (5.23.1) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.SemVer (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Tasks (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.Core.Xml (>= 5.23) - Fake.IO.FileSystem (>= 5.23) - Fake.Net.Http (>= 5.23) + Fake.DotNet.NuGet (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Tasks (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.Core.Xml (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) + Fake.Net.Http (>= 5.23.1) FSharp.Core (>= 6.0) Newtonsoft.Json (>= 13.0.1) NuGet.Protocol (>= 5.11) - Fake.DotNet.Paket (5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.DotNet.Cli (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.DotNet.Paket (5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.DotNet.Cli (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.DotNet.Testing.NUnit (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.IO.FileSystem (>= 5.23) - Fake.Testing.Common (>= 5.23) + Fake.DotNet.Testing.NUnit (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) + Fake.Testing.Common (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.IO.FileSystem (5.23) - Fake.Core.String (>= 5.23) + Fake.IO.FileSystem (5.23.1) + Fake.Core.String (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Net.Http (5.23) - Fake.Core.Trace (>= 5.23) + Fake.Net.Http (5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Testing.Common (5.23) - Fake.Core.Trace (>= 5.23) + Fake.Testing.Common (5.23.1) + Fake.Core.Trace (>= 5.23.1) FSharp.Core (>= 6.0) - Fake.Tools.Git (5.23) - Fake.Core.Environment (>= 5.23) - Fake.Core.Process (>= 5.23) - Fake.Core.SemVer (>= 5.23) - Fake.Core.String (>= 5.23) - Fake.Core.Trace (>= 5.23) - Fake.IO.FileSystem (>= 5.23) + Fake.Tools.Git (5.23.1) + Fake.Core.Environment (>= 5.23.1) + Fake.Core.Process (>= 5.23.1) + Fake.Core.SemVer (>= 5.23.1) + Fake.Core.String (>= 5.23.1) + Fake.Core.Trace (>= 5.23.1) + Fake.IO.FileSystem (>= 5.23.1) FSharp.Core (>= 6.0) FParsec (1.1.1) FSharp.Core (>= 4.3.4) FSharp.Control.Reactive (5.0.5) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0 < 6.0) - FSharp.Core (6.0.5) + FSharp.Core (7.0) Microsoft.Build (17.3.1) Microsoft.Build.Framework (>= 17.3.1) Microsoft.NET.StringTools (>= 17.3.1) diff --git a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs index 2aa57e1c8..db4d83746 100644 --- a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs +++ b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs @@ -1380,7 +1380,7 @@ module internal SymbolReader = customOpName.IsSome || isItemIndexer || not v.IsMember - || PrettyNaming.IsMangledOpName v.CompiledName + || PrettyNaming.IsLogicalOpName v.CompiledName || Char.IsLower(v.DisplayName.[0]) let fullArgUsage = @@ -1407,7 +1407,7 @@ module internal SymbolReader = fullArgUsage ] // op_XYZ operators - | _, false, _, name, _ when PrettyNaming.IsMangledOpName v.CompiledName -> + | _, false, _, name, _ when PrettyNaming.IsLogicalOpName v.CompiledName -> match argInfos with // binary operators (taking a tuple) | [ [ x; y ] ] @@ -1415,7 +1415,7 @@ module internal SymbolReader = | [ [ x ]; [ y ] ] -> let left = formatArgUsageAsHtml 0 x - let nm = PrettyNaming.DecompileOpName v.CompiledName + let nm = PrettyNaming.ConvertValLogicalNameToDisplayNameCore v.CompiledName let right = formatArgUsageAsHtml 1 y @@ -1423,7 +1423,7 @@ module internal SymbolReader = // unary operators | [ [ x ] ] -> - let nm = PrettyNaming.DecompileOpName v.CompiledName + let nm = PrettyNaming.ConvertValLogicalNameToDisplayNameCore v.CompiledName let right = formatArgUsageAsHtml 0 x @@ -1877,22 +1877,11 @@ module internal SymbolReader = html.Append("") |> ignore | "code" -> - let lang = - match elem.Attributes("lang") |> Seq.isEmpty with - | true -> "" - | false -> - let lang = elem.Attribute("lang").Value - $"{lang} language-{lang}" + let code = + let code = Literate.ParseMarkdownString("```\n" + elem.Value.TrimEnd('\r', '\n', ' ') + "\n```") + Literate.ToHtml(code, lineNumbers = false) - html.Append("
") |> ignore
-                    html.Append($"") |> ignore
-
-                    let code = elem.Value.TrimEnd('\r', '\n', ' ')
-                    let codeAsHtml = HttpUtility.HtmlEncode code
-                    html.Append(codeAsHtml) |> ignore
-
-                    html.Append("") |> ignore
-                    html.Append("
") |> ignore + html.Append(code) |> ignore // 'a' is not part of the XML doc standard but is widely used | "a" -> html.Append(elem.ToString()) |> ignore // This allows any HTML to be transferred through diff --git a/src/fsdocs-tool/BuildCommand.fs b/src/fsdocs-tool/BuildCommand.fs index 2cd1b096b..b97ae74df 100644 --- a/src/fsdocs-tool/BuildCommand.fs +++ b/src/fsdocs-tool/BuildCommand.fs @@ -1228,7 +1228,7 @@ type CoreBuildOptions(watch) = let projects = Seq.toList this.projects let cacheFile = ".fsdocs/cache" - let getTime p = + let getTime (p: string) = try File.GetLastWriteTimeUtc(p) with _ -> diff --git a/src/fsdocs-tool/fsdocs-tool.fsproj b/src/fsdocs-tool/fsdocs-tool.fsproj index f8e47a1f8..7100626ee 100644 --- a/src/fsdocs-tool/fsdocs-tool.fsproj +++ b/src/fsdocs-tool/fsdocs-tool.fsproj @@ -3,7 +3,7 @@ Exe fsdocs - net6.0 + net7.0 fsdocs-tool LatestMajor true diff --git a/tests/FSharp.ApiDocs.Tests/ApiDocsTests.fs b/tests/FSharp.ApiDocs.Tests/ApiDocsTests.fs index c0dc356e2..c4456c8b1 100644 --- a/tests/FSharp.ApiDocs.Tests/ApiDocsTests.fs +++ b/tests/FSharp.ApiDocs.Tests/ApiDocsTests.fs @@ -1080,6 +1080,11 @@ let ``ApiDocs test examples`` () = let content = files.[testFile] content.Contains "has-id" |> shouldEqual true + // Check that the favicon href points to the root. + let testFile = $"fslib.{OutputFormat.Html.Extension}" + files.ContainsKey testFile |> shouldEqual true + let content = files[testFile] + content.Contains "href=\"/root/img/favicon.ico\"" |> shouldEqual true // -------------------Indirect links---------------------------------- [] diff --git a/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj b/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj index 9fef79609..0d8ab7122 100644 --- a/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj +++ b/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 LatestMajor true diff --git a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj index 09fe2ba28..59ad85204 100644 --- a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj +++ b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 LatestMajor true diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj index ed154e0c6..e354cbe00 100644 --- a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj +++ b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 LatestMajor true diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj index 211d1f195..17818a421 100644 --- a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj +++ b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 LatestMajor true