Merge pull request #4450 from fsprojects/test/migrate-legacy-tests

Migrate legacy-only tests to net10.0 ahead of the tool-only 12.0

Author: fpellet

RELEASE_NOTES.md

@@ -1,5 +1,6 @@
 #### Unreleased
 
+* The `paket` .NET tool now honours `no_proxy` and the system proxy settings, as `paket.exe` already did; as in curl, a `no_proxy` entry matches the host and its subdomains
 
 #### 11.0.0 - 2026-10-05
 

integrationtests/Paket.IntegrationTests/DotnetToolSpecs.fs

@@ -0,0 +1,53 @@
+module Paket.IntegrationTests.DotnetToolSpecs
+
+open System
+open System.IO
+open Fake
+open NUnit.Framework
+open FsUnit
+
+// Paket.Restore.targets has to find the Paket .NET tool on its own: these tests install the
+// paket under test as a .NET tool and leave PaketExePath unset.
+
+let scenario = "dotnet-tool-locator"
+
+/// Restores the project of the scenario and checks that the installed tool did the Paket restore
+let restoreShouldUseTool version env =
+    let scenarioPath = scenarioTempPath scenario
+    let output =
+        directDotnetEx env false "restore" (scenarioPath @@ "project")
+        |> Seq.map (fun msg -> msg.Message)
+        |> String.concat Environment.NewLine
+    output |> shouldContainText $"Paket version %s{version}"
+    File.Exists(scenarioPath @@ "paket-files" @@ "paket.restore.cached") |> shouldEqual true
+
+/// Installs the packed tool into the scenario, at the location the arguments give
+let installTool env location =
+    directDotnetEx env false $"tool install paket %s{location} --version %s{paketToolPackageVersion} --configfile nuget.config" (scenarioTempPath scenario)
+    |> ignore
+
+[<Test>]
+let ``restore finds paket as a local tool of the manifest``() =
+    let cleanup, version, env = prepareSdkForTool scenario
+    use __ = cleanup
+    installTool env "--local"
+
+    restoreShouldUseTool version env
+
+[<Test>]
+let ``restore finds paket installed with --tool-path .paket``() =
+    let cleanup, version, env = prepareSdkForTool scenario
+    use __ = cleanup
+    installTool env "--tool-path .paket"
+
+    restoreShouldUseTool version env
+
+[<Test>]
+let ``restore finds paket on the PATH like a global tool``() =
+    let cleanup, version, env = prepareSdkForTool scenario
+    use __ = cleanup
+    let toolPath = scenarioTempPath scenario @@ "global-tools"
+    installTool env $"--tool-path \"%s{toolPath}\""
+
+    let path = toolPath + string Path.PathSeparator + Environment.GetEnvironmentVariable "PATH"
+    restoreShouldUseTool version (("PATH", path) :: env)

integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs

@@ -20,11 +20,8 @@ let ``#140 windsor should resolve framework dependent dependencies``() =
 
 [<Test>]
 [<Flaky>] // failure on assert
-#if NO_UNIT_PLATFORMATTRIBUTE
-#else
-[<Platform("Mono")>] // PATH TOO LONG on Windows...
-#endif
 let ``#1190 paket add nuget should handle transitive dependencies``() =
+    if Paket.Utils.isWindows then Assert.Ignore "PATH TOO LONG on Windows..."
     use __ = paket "add nuget xunit version 2.1.0" "i001190-transitive-dependencies-with-restr" |> fst
     let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001190-transitive-dependencies-with-restr","paket.lock"))
     lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "xunit.abstractions"].Settings.FrameworkRestrictions

integrationtests/Paket.IntegrationTests/FsiExtension.fs

@@ -28,6 +28,13 @@ module FsiExtension =
               e.RequestingAssembly
       )
       let checker = FSharpChecker.Create(suggestNamesForErrors=true, keepAssemblyContents=true)
+      // The package manager looks for a paket.dependencies from the folder of the script up.
+      // A script inside the repository would pull in the one of Paket itself, whose github
+      // dependencies hit the rate-limited api.github.com. The folder name stays fixed, since
+      // the package manager keeps its work in a temp folder named after it.
+      let scriptDir = Path.Combine(Path.GetTempPath(), "paket-fsi-extension-test")
+      Directory.CreateDirectory scriptDir |> ignore
+      let scriptPath = Path.Combine(scriptDir, "test.fsx")
       let sourceText = """
       #r "paket: nuget FSharp.Data"
       let v = FSharp.Data.JsonValue.Boolean true
@@ -36,7 +43,7 @@ module FsiExtension =
         // "--", not "/": the compiler only honours slash-prefixed options on Windows, since
         // elsewhere "/compilertool:..." is indistinguishable from a path. Passing them with a
         // slash on Linux left the paket package manager unregistered.
-        checker.GetProjectOptionsFromScript("test.fsx", SourceText.ofString sourceText, otherFlags = [| "--langversion:preview"; $"--compilertool:%s{pathToExtension}" |] )
+        checker.GetProjectOptionsFromScript(scriptPath, SourceText.ofString sourceText, otherFlags = [| "--langversion:preview"; $"--compilertool:%s{pathToExtension}" |] )
         |> Async.RunSynchronously
 
       // Without this the `#r "paket:"` resolution failing shows up further down as an
@@ -48,7 +55,7 @@ module FsiExtension =
           |> String.concat Environment.NewLine
           |> failwithf "Resolving '#r \"paket: nuget FSharp.Data\"' through %s reported:%s%s" pathToExtension Environment.NewLine
 
-      let _, answer = checker.ParseAndCheckFileInProject("test.fsx", 0, SourceText.ofString sourceText, projectOptions) |> Async.RunSynchronously
+      let _, answer = checker.ParseAndCheckFileInProject(scriptPath, 0, SourceText.ofString sourceText, projectOptions) |> Async.RunSynchronously
       match answer with
       | FSharpCheckFileAnswer.Succeeded(result) ->
         Assert.IsTrue result.HasFullTypeCheckInfo

integrationtests/Paket.IntegrationTests/InitSpecs.fs

@@ -21,18 +21,25 @@ let ``#1040 init should download release version of bootstrapper``() =
     productVersion.Contains("-") |> shouldEqual false
 
 [<Test>]
-#if PAKET_NETCORE
-[<Ignore(".net core paket doesnt init the boostrapper")>]
-#endif
 let ``#1743 empty log file``() =
     try
-        use __ = paket "init --log-file" "i001040-init-downloads-bootstrapper" |> fst
+        use __ = paket "init --log-file" "i001743-empty-log-file" |> fst
         failwith "expected error"
     with
     | ProcessFailedWithExitCode(_, _, msgs) ->
         (msgs.Errors |> Seq.head).Contains "--log-file"
             |> shouldEqual true
 
+[<Test>]
+let ``init creates paket.dependencies``() =
+    let scenario = "init-creates-dependencies-file"
+    use __ = paket "init" scenario |> fst
+    File.Exists(Path.Combine(scenarioTempPath scenario, "paket.dependencies")) |> shouldEqual true
+#if PAKET_NETCORE
+    // only the legacy paket.exe downloads the bootstrapper into .paket
+    File.Exists(Path.Combine(scenarioTempPath scenario, ".paket", "paket.exe")) |> shouldEqual false
+#endif
+
 [<Test>]
 #if PAKET_NETCORE
 [<Ignore(".net core paket doesnt init the boostrapper")>]

integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs

@@ -16,24 +16,16 @@ let ``#183 outdated without params``() =
     msg |> shouldContainText "FSharp.Formatting 2.4 ->"
 
 [<Test>]
-#if NO_UNIT_PLATFORMATTRIBUTE
-[<Ignore "PlatformAttribute not supported by netstandard NUnit">]
-#else
-[<Platform "Mono">] // PATH TOO LONG on Windows...
-#endif
 let ``#183 outdated --ignore-constraint``() =
+    if Paket.Utils.isWindows then Assert.Ignore "PATH TOO LONG on Windows..."
     let cleanup, msg = paket "outdated --ignore-constraints" "i000183-outdated-with-special-parameters"
     use cleanup = cleanup
     msg.Contains("Newtonsoft.Json 6.0.7 -> 6.0.8") |> shouldEqual false
 
 
 [<Test>]
-#if NO_UNIT_PLATFORMATTRIBUTE
-[<Ignore "PlatformAttribute not supported by netstandard NUnit">]
-#else
-[<Platform "Mono">] // PATH TOO LONG on Windows...
-#endif
 let ``#183 outdated --include-prereleases``() =
+    if Paket.Utils.isWindows then Assert.Ignore "PATH TOO LONG on Windows..."
     let cleanup, msg = paket "outdated --include-prereleases" "i000183-outdated-with-special-parameters"
     use cleanup = cleanup
     msg |> shouldContainText "Newtonsoft.Json 6.0.7 ->"

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net461;net10.0</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <DefineConstants Condition=" '$(TargetFramework)' != 'net461'">PAKET_NETCORE;NO_UNIT_PLATFORMATTRIBUTE;TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;FAKE_NETSTANDARD_API;@(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFramework)' != 'net461'">PAKET_NETCORE;@(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FsiExtension.fs" />
@@ -23,6 +23,7 @@
     <Compile Include="PackSpecs.fs" />
     <Compile Include="InstallSpecs.fs" />
     <Compile Include="RestoreSpecs.fs" />
+    <Compile Include="DotnetToolSpecs.fs" />
     <Compile Include="FrameworkRestrictionsSpecs.fs" />
     <Compile Include="HttpSpecs.fs" />
     <Compile Include="PaketCoreSpecs.fs" />

integrationtests/Paket.IntegrationTests/ResolverSkipsConflictsFastSpecs.fs

@@ -41,11 +41,6 @@ let ``#2289 Paket 4.x install command takes hours to complete``() =
     |> shouldBeSmallerThan (SemVer.Parse "3.0")
 
 [<Test>]
-#if NO_UNIT_PLATFORMATTRIBUTE
-[<Ignore "PlatformAttribute not supported by netstandard NUnit">]
-#else
-[<Platform("Net")>]
-#endif
 let ``#1174 Should find Ninject error``() =
     updateShouldFindPackageConflict "Ninject" "i001174-resolve-fast-conflict"
 

integrationtests/Paket.IntegrationTests/RestoreSpecs.fs

@@ -134,12 +134,8 @@ let ``#3012 Paket restore silently fails when TargetFramework(s) are specified i
     directDotnet false "build" projectDir |> ignore
 
 [<Test>]
-#if NO_UNIT_PLATFORMATTRIBUTE
-[<Ignore "PlatformAttribute not supported by netstandard NUnit">]
-#else
-[<Platform "Win">] // read-only filesystem entries are really only a Windows thing
-#endif
 let ``#3410 Paket restore fails when obj files are readonly`` () =
+    if not isWindows then Assert.Ignore "read-only filesystem entries are really only a Windows thing"
     let scenario = "i003410-readonly-obj"
     let projectName = "dotnet"
     let packageName = "AutoMapper"
@@ -162,7 +158,7 @@ let ``#3410 Paket restore fails when obj files are readonly`` () =
         cachedReferencesFile.IsReadOnly <- false
 
 let private excludeAssetsForFSharpCore (propsPath: string) =
-    let propsXml = System.Xml.Linq.XDocument.Load(System.IO.File.OpenRead propsPath)
+    let propsXml = System.Xml.Linq.XDocument.Load propsPath
     let fsharpCorePackageRef =
         propsXml.Descendants()
         |> Seq.find (fun elem -> elem.Name.LocalName = "PackageReference")

integrationtests/Paket.IntegrationTests/TestHelper.fs

@@ -8,6 +8,7 @@ open NUnit.Framework
 open FsUnit
 open System
 open System.IO
+open System.IO.Compression
 open Paket.Logging
 
 let disableScenarioCleanup = false // change to true to debug a single test temporarily.
@@ -86,19 +87,98 @@ let prepare scenario =
         if not (isNull shouldDispose) then shouldDispose.Dispose()
 
 
-let prepareSdk scenario =
+let private copyRestoreTargets scenario =
     let tmpPaketFolder = (scenarioTempPath scenario) @@ ".paket"
     let targetsFile = FullName(__SOURCE_DIRECTORY__ + "../../../src/Paket.Core/embedded/Paket.Restore.targets")
-    let paketExe = snd paketToolPath
-
-    setEnvironVar "PaketExePath" paketExe
-    let cleanup = prepare scenario
     if (not (Directory.Exists tmpPaketFolder)) then
         Directory.CreateDirectory tmpPaketFolder |> ignore
 
     FileHelper.CopyFile tmpPaketFolder targetsFile
+
+let prepareSdk scenario =
+    let paketExe = snd paketToolPath
+
+    setEnvironVar "PaketExePath" paketExe
+    let cleanup = prepare scenario
+    copyRestoreTargets scenario
     cleanup
 
+/// The version of the Paket tool package packTool makes. Any version does: the package is made
+/// again for each test, from the build under test, and installed into a scenario folder.
+let paketToolPackageVersion = "0.0.0-integrationtest"
+
+/// Packs the paket of bin/net10.0 as a .NET tool into the folder, the way PackAsTool lays it out
+let private packTool folder =
+    let toolDir = FullName(__SOURCE_DIRECTORY__ + "../../../bin/net10.0")
+    Directory.CreateDirectory folder |> ignore
+    use zip = ZipFile.Open(folder @@ $"Paket.%s{paketToolPackageVersion}.nupkg", ZipArchiveMode.Create)
+    let addText (name:string) (text:string) =
+        use writer = new StreamWriter(zip.CreateEntry(name).Open())
+        writer.Write text
+    addText "Paket.nuspec" (sprintf """<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Paket</id>
+    <version>%s</version>
+    <authors>Paket</authors>
+    <description>The paket under test, packed as a .NET tool</description>
+    <packageTypes>
+      <packageType name="DotnetTool" />
+    </packageTypes>
+  </metadata>
+</package>
+""" paketToolPackageVersion)
+    addText "tools/net10.0/any/DotnetToolSettings.xml" """<?xml version="1.0" encoding="utf-8"?>
+<DotNetCliTool Version="1">
+  <Commands>
+    <Command Name="paket" EntryPoint="paket.dll" Runner="dotnet" />
+  </Commands>
+</DotNetCliTool>
+"""
+    for file in Directory.GetFiles(toolDir, "*", SearchOption.AllDirectories) do
+        let relativePath = file.Substring(toolDir.Length).TrimStart(Path.DirectorySeparatorChar).Replace('\\', '/')
+        zip.CreateEntryFromFile(file, "tools/net10.0/any/" + relativePath) |> ignore
+
+/// Like prepareSdk, but lets Paket.Restore.targets find paket on its own, the way it does
+/// for a user of the Paket .NET tool. Returns the cleanup, the full version of the paket
+/// under test (with its "+<commit>"), and the environment to run dotnet with.
+/// The tool is packed from bin/net10.0 into a feed of the scenario, the only source of its
+/// nuget.config, and installed into a packages folder of the scenario: the global one may
+/// hold a package of the same version.
+let prepareSdkForTool scenario =
+    let productVersion =
+        Diagnostics.FileVersionInfo.GetVersionInfo(FullName(__SOURCE_DIRECTORY__ + "../../../bin/net10.0/paket.dll")).ProductVersion
+
+    let cleanup = prepare scenario
+    copyRestoreTargets scenario
+    let scenarioPath = scenarioTempPath scenario
+    let feed = scenarioPath @@ "tool-feed"
+    packTool feed
+    File.WriteAllText(
+        scenarioPath @@ "nuget.config",
+        sprintf """<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="paket-build" value="%s" />
+  </packageSources>
+</configuration>
+""" feed)
+    // A manifest of its own, so that dotnet doesn't walk up to the one of the Paket repository,
+    // neither to run `dotnet paket` nor to install a local tool
+    Directory.CreateDirectory(scenarioPath @@ ".config") |> ignore
+    File.WriteAllText(scenarioPath @@ ".config" @@ "dotnet-tools.json", """{ "version": 1, "isRoot": true, "tools": {} }""")
+
+    let env = [
+        "NUGET_PACKAGES", scenarioPath @@ "nuget-packages"
+        // prepareSdk sets it for the whole test process
+        "PaketExePath", ""
+        // The Linux CI sets it, and it makes the restore ask for Microsoft.WindowsDesktop.App.Ref,
+        // which the feed of the scenario doesn't have
+        "EnableWindowsTargeting", "false"
+    ]
+    cleanup, productVersion, env
+
 type OutputMsg =
   { IsError : bool; Message : string }
     static member isError ({ IsError = e}:OutputMsg) = e