Migrate Paket builds to NuGet and all tests to MTP v2

.config/dotnet-tools.json

@@ -2,10 +2,10 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "paket": {
-      "version": "11.0.0",
+    "dotnet-outdated-tool": {
+      "version": "4.8.1",
       "commands": [
-        "paket"
+        "dotnet-outdated"
       ]
     },
     "fsdocs-tool": {

.github/workflows/main.yml

@@ -28,7 +28,5 @@ jobs:
 
     - name: Install local tools
       run: dotnet tool restore
-    - name: Paket Restore
-      run: dotnet paket restore
     - name: Build and Test
       run: dotnet run --project build/build.fsproj

.github/workflows/publish.yml

@@ -0,0 +1,74 @@
+name: Publish NuGet packages
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v7
+      - name: Setup .NET SDKs and .NET 8 runtime
+        uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: 8.0.x
+          global-json-file: global.json
+      - name: Install local tools
+        run: dotnet tool restore
+      - name: Build NuGet packages
+        run: dotnet run --project build/build.fsproj -- NuGet
+      - name: Verify tag version and packages
+        env:
+          TAG: ${{ github.ref_name }}
+        run: |
+          version="${TAG#v}"
+          if [[ "$version" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.0$ ]]; then version="${BASH_REMATCH[1]}"; fi
+          for package in FsUnit FsUnit.xUnit Fs30Unit.MsTest; do
+            test -f "bin/${package}.${version}.nupkg" || {
+              echo "Missing bin/${package}.${version}.nupkg (tag ${TAG} must match RELEASE_NOTES.md)" >&2
+              exit 1
+            }
+          done
+          for package in FsUnit FsUnit.xUnit Fs30Unit.MsTest; do
+            test -f "bin/${package}.${version}.snupkg" || {
+              echo "Missing bin/${package}.${version}.snupkg (tag ${TAG} must match RELEASE_NOTES.md)" >&2
+              exit 1
+            }
+          done
+      - uses: actions/upload-artifact@v4
+        with:
+          name: nuget-packages
+          path: |
+            bin/*.nupkg
+            bin/*.snupkg
+          if-no-files-found: error
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages
+          path: artifacts
+      # Configure a NuGet Trusted Publisher for fsprojects/FsUnit and this workflow (publish.yml).
+      # Store the NuGet.org account username (not email) in the NUGET_USER GitHub secret.
+      - name: NuGet login (Trusted Publishing)
+        id: nuget-login
+        uses: NuGet/login@v1
+        with:
+          user: ${{ secrets.NUGET_USER }}
+      - name: Push packages to NuGet.org
+        env:
+          NUGET_API_KEY: ${{ steps.nuget-login.outputs.NUGET_API_KEY }}
+        run: |
+          for package in artifacts/*.nupkg; do
+            dotnet nuget push "$package" --api-key "$NUGET_API_KEY" --source https://api.nuget.org/v3/index.json --skip-duplicate
+          done

.gitignore

@@ -100,10 +100,6 @@ output/
 # Test results produced by build
 TestResults.xml
 
-# Paket dependency manager
-paket-files
-.paket/
-
 # Nuget outputs
 nuget/*.nupkg
 release.cmd

Directory.Build.props

@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    <Authors>Ray Vernagus; Daniel Mohl; Sergey Tihon; Constantin Tews</Authors>
+    <PackageProjectUrl>https://github.com/fsprojects/FsUnit</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/fsprojects/FsUnit</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Copyright>Copyright 2012-2026</Copyright>
+  </PropertyGroup>
+</Project>

FsUnit.slnx

@@ -7,8 +7,6 @@
   <Folder Name="/global/">
     <File Path="build.cmd" />
     <File Path="build.sh" />
-    <File Path="paket.dependencies" />
-    <File Path="paket.lock" />
     <File Path="RELEASE_NOTES.md" />
   </Folder>
   <Folder Name="/global/docs/">
@@ -21,7 +19,6 @@
     <File Path="docs/content/MsTest.fsx" />
     <File Path="docs/content/NUnit.fsx" />
     <File Path="docs/content/operators.md" />
-    <File Path="docs/content/Paket.fsx" />
     <File Path="docs/content/release-notes.md" />
     <File Path="docs/content/xUnit.fsx" />
   </Folder>

README.md

@@ -28,6 +28,9 @@ A few things to keep in mind:
 
 ## Build Instructions
 - Find and run either `./build.sh` or `build.cmd` (depending on your platform).
+- Restore local tools with `dotnet tool restore`; use `dotnet outdated` to review or update NuGet dependencies.
+- Push a `v<version>` tag matching the latest entry in `RELEASE_NOTES.md` to build and publish all six NuGet packages.
+- Configure a NuGet.org Trusted Publisher for `fsprojects/FsUnit` and `.github/workflows/publish.yml`; add the NuGet account username (not email) as the `NUGET_USER` GitHub secret.
 
 ## Maintainer(s)
 

build.cmd

@@ -2,5 +2,4 @@
 cls
 
 dotnet tool restore
-dotnet paket restore
 dotnet run --project build/build.fsproj -- %*

build.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 
 dotnet tool restore
-dotnet paket restore
 dotnet run --project build/build.fsproj -- "$@"

build/build.fs

@@ -81,13 +81,6 @@
         | Csproj -> AssemblyInfoFile.createCSharp ((folderName @@ "Properties") @@ "AssemblyInfo.cs") attributes
         | Vbproj -> AssemblyInfoFile.createVisualBasic ((folderName @@ "My Project") @@ "AssemblyInfo.vb") attributes))
 
-// Copies binaries from default VS location to expected bin folder
-// But keeps a subdirectory structure for each project in the
-// src folder to support multiple project outputs
-Target.create "CopyBinaries" (fun _ ->
-    !! "src/**/*.??proj"
-    |> Seq.map (fun f -> ((Path.GetDirectoryName f) @@ "bin/Release", "bin" @@ (Path.GetFileNameWithoutExtension f)))
-    |> Seq.iter (fun (fromDir, toDir) -> Shell.copyDir toDir fromDir (fun _ -> true)))
 
 // --------------------------------------------------------------------------------------
 // Clean build results
@@ -172,21 +165,23 @@
 Target.create "RunTests" ignore
 
 // --------------------------------------------------------------------------------------
-// Build a NuGet package
+// Build NuGet packages with the .NET SDK
 
 Target.create "NuGet" (fun _ ->
-    Paket.pack (fun p ->
-        { p with
-            ToolType = ToolType.CreateLocalTool()
-            OutputPath = "bin"
-            Version = version
-            ReleaseNotes = String.toLines release.Notes }))
+    // MSBuild splits -p: values on ',' and ';'; environment variables are read as properties verbatim.
+    Environment.setEnvironVar "PackageReleaseNotes" (String.toLines release.Notes)
+
+    let pack projectPath extraProperties =
+        let result =
+            DotNet.exec id "pack" $"%s{projectPath} -c Release -o bin -p:Version=%s{version} %s{extraProperties}"
+
+        if not result.OK then
+            failwithf "Package build failed for %s: %A" projectPath result.Errors
+    [ "src/FsUnit.NUnit/FsUnit.NUnit.fsproj"
+      "src/FsUnit.Xunit/FsUnit.Xunit.fsproj"
+      "src/FsUnit.MsTestUnit/FsUnit.MsTest.fsproj" ]
+    |> List.iter (fun projectPath -> pack projectPath ""))
 
-Target.create "PublishNuget" (fun _ ->
-    Paket.push (fun p ->
-        { p with
-            ToolType = ToolType.CreateLocalTool()
-            WorkingDir = "bin" }))
 
 
 // --------------------------------------------------------------------------------------
@@ -205,7 +200,7 @@
     Shell.cleanDir tempDocsDir
     Repository.cloneSingleBranch "" cloneUrl "gh-pages" tempDocsDir
 
     Repository.fullclean tempDocsDir
     Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A"
     Staging.stageAll tempDocsDir
     Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" version)
@@ -217,21 +212,21 @@
 Target.create "All" ignore
 Target.create "Release" ignore
 
 "Clean"
   ==> "AssemblyInfo"
   ==> "CheckFormat"
   ==> "Build"
-  ==> "CopyBinaries"
   ==> "RunTests"
   ==> "All"
 
 "Build"
   ==> "NUnit"
   ==> "xUnit"
   ==> "MsTest"
   ==> "RunTests"
 
+
 "All"
   ==> "NuGet"
   ==> "GenerateDocs"
   ==> "ReleaseDocs"

build/build.fsproj

@@ -14,7 +14,6 @@
     <PackageReference Include="Fake.DotNet.Cli" Version="6.1.4" />
     <PackageReference Include="Fake.DotNet.MSBuild" Version="6.1.4" />
     <PackageReference Include="Fake.DotNet.AssemblyInfoFile" Version="6.1.4" />
-    <PackageReference Include="Fake.DotNet.Paket" Version="6.1.4" />
     <PackageReference Include="Fake.DotNet.Fsi" Version="6.1.4" />
     <PackageReference Include="Fake.Tools.Git" Version="6.1.4" />
     <PackageReference Include="Fake.Api.GitHub" Version="6.1.4" />

docs/FsUnitTyped.fsx

@@ -1,8 +1,8 @@
 (*** hide ***)
 // This block of code is omitted in the generated HTML documentation. Use
 // it to define helpers that you do not want to show in the documentation.
-#r "../packages/NUnit/lib/net8.0/nunit.framework.dll"
-#r "../bin/FsUnit.NUnit/net8.0/FsUnit.NUnit.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/nunit.framework.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/FsUnit.NUnit.dll"
 
 (**
 What is FsUnitTyped?

docs/MsTest.fsx

@@ -1,9 +1,9 @@
 (*** hide ***)
 // This block of code is omitted in the generated HTML documentation. Use
 // it to define helpers that you do not want to show in the documentation.
-#r "../packages/MSTest.TestFramework/lib/netstandard2.0/Microsoft.VisualStudio.TestPlatform.TestFramework.dll"
-#r "../packages/NHamcrest/lib/netstandard2.0/NHamcrest.dll"
-#r "../bin/FsUnit.MsTest/netstandard2.0/FsUnit.MsTest.dll"
+#r "../tests/FsUnit.MsTest.Test/bin/Release/net8.0/MSTest.TestFramework.dll"
+#r "../tests/FsUnit.MsTest.Test/bin/Release/net8.0/NHamcrest.dll"
+#r "../tests/FsUnit.MsTest.Test/bin/Release/net8.0/FsUnit.MsTest.dll"
 
 (**
 FsUnit for MsTest
@@ -15,8 +15,6 @@ FsUnit for MsTest
     <div class="well well-small" id="nuget">
       The FsUnit library for MsTest can be <a href="https://www.nuget.org/packages/Fs30Unit.MsTest/">installed from NuGet</a>:
       <pre>PM> Install-Package Fs30Unit.MsTest</pre>
-      Sample FsUnit tests for MsTest can be <a href="https://www.nuget.org/packages/Fs30Unit.MsTest.Sample/">installed from NuGet</a>:
-      <pre>PM> Install-Package Fs30Unit.MsTest.Sample</pre>
     </div>
   </div>
   <div class="span1"></div>

docs/NUnit.fsx

@@ -1,8 +1,8 @@
 (*** hide ***)
 // This block of code is omitted in the generated HTML documentation. Use
 // it to define helpers that you do not want to show in the documentation.
-#r "../packages/NUnit/lib/net8.0/nunit.framework.dll"
-#r "../bin/FsUnit.NUnit/net8.0/FsUnit.NUnit.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/nunit.framework.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/FsUnit.NUnit.dll"
 
 open NUnit.Framework
 (**
@@ -15,8 +15,6 @@ FsUnit for NUnit
     <div class="well well-small" id="nuget">
       The FsUnit library for NUnit can be <a href="https://nuget.org/packages/FsUnit">installed from NuGet</a>:
       <pre>PM> Install-Package FsUnit</pre>
-      Sample FsUnit tests for NUnit can be <a href="https://nuget.org/packages/FsUnit.Sample">installed from NuGet</a>:
-      <pre>PM> Install-Package FsUnit.Sample</pre>
     </div>
   </div>
   <div class="span1"></div>

docs/index.fsx

@@ -1,8 +1,8 @@
 (*** hide ***)
 // This block of code is omitted in the generated HTML documentation. Use
 // it to define helpers that you do not want to show in the documentation.
-#r "../packages/NUnit/lib/net8.0/nunit.framework.dll"
-#r "../bin/FsUnit.NUnit/net8.0/FsUnit.NUnit.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/nunit.framework.dll"
+#r "../tests/FsUnit.NUnit.Test/bin/Release/net8.0/FsUnit.NUnit.dll"
 
 open FsUnit
 
@@ -161,12 +161,12 @@ Supplying an expression that will result in a non-union type as well as supplyin
 *)
 type TestUnion = First | Second of int | Third of string
 
-First |> should be (ofCase<@ First @>)
-First |> should be (ofCase<@ First, Second @>) // checks if on the cases matches the given case
-Second 5 |> should be (ofCase<@ Second 10 @>) // note, the actual value is not checked!
-First |> should not' (be ofCase<@ Second 5 @>)
-5 |> should be (ofCase<@ Second 5 @>) // will throw an exception
-Second 5 |> should be (ofCase<@ int @>) // will throw an exception
+First |> should be (ofCase <@ First @>)
+First |> should be (ofCase <@ First, Second @>) // checks if on the cases matches the given case
+Second 5 |> should be (ofCase <@ Second 10 @>) // note, the actual value is not checked!
+First |> should not' (be ofCase <@ Second 5 @>)
+5 |> should be (ofCase <@ Second 5 @>) // will throw an exception
+Second 5 |> should be (ofCase <@ int @>) // will throw an exception
 
 (**
 

docs/xUnit.fsx

@@ -1,9 +1,11 @@
 (*** hide ***)
 // This block of code is omitted in the generated HTML documentation. Use
 // it to define helpers that you do not want to show in the documentation.
-#r "../packages/xunit.extensibility.core/lib/netstandard1.1/xunit.core.dll"
-#r "../packages/NHamcrest/lib/netstandard2.0/NHamcrest.dll"
-#r "../bin/FsUnit.Xunit/netstandard2.0/FsUnit.Xunit.dll"
+#r "../tests/FsUnit.Xunit.Test/bin/Release/net8.0/xunit.v3.core.dll"
+#r "../tests/FsUnit.Xunit.Test/bin/Release/net8.0/xunit.v3.common.dll"
+#r "../tests/FsUnit.Xunit.Test/bin/Release/net8.0/xunit.v3.assert.dll"
+#r "../tests/FsUnit.Xunit.Test/bin/Release/net8.0/NHamcrest.dll"
+#r "../tests/FsUnit.Xunit.Test/bin/Release/net8.0/FsUnit.Xunit.dll"
 
 (**
 FsUnit for xUnit
@@ -15,8 +17,6 @@ FsUnit for xUnit
     <div class="well well-small" id="nuget">
       The FsUnit library for xUnit can be <a href="https://nuget.org/packages/FsUnit.xUnit">installed from NuGet</a>:
       <pre>PM> Install-Package FsUnit.xUnit</pre>
-      Sample FsUnit tests for xUnit can be <a href="https://nuget.org/packages/FsUnit.xUnit.Sample">installed from NuGet</a>:
-      <pre>PM> Install-Package FsUnit.xUnit.Sample</pre>
     </div>
   </div>
   <div class="span1"></div>

global.json

@@ -2,5 +2,8 @@
     "sdk": {
         "version": "10.0.401",
         "rollForward": "latestPatch"
+    },
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
     }
 }