Merge branch 'master' of github.com:fsprojects/Paket

# Conflicts:
#	RELEASE_NOTES.md

Author: forki

RELEASE_NOTES.md

@@ -1,5 +1,7 @@
-#### 7.0.0-alpha004 - 2022-01-18
+#### 7.0.0 - 2022-03-01
+* Support for .NET 7.0
 * Support as .NET 6.0 tool
+* Auto-Restore after paket install an paket update
 
 #### 6.2.1 - 2021-10-13
 * Roll forward for .NET tool - https://github.com/fsprojects/Paket/pull/4089

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-      "version": "6.0.100"
+      "version": "6.0.200"
     }
 }

integrationtests/Paket.IntegrationTests/PackSpecs.fs

@@ -998,3 +998,57 @@ let ``allow repositoryFull``() =
     let expected = """<repository type="git" url="https://github.com/my-org/my-custom-repo" branch="test-branch" commit="e1c65e4524cd70ee6e22abe33e6cb6ec73938cb3" />"""
     if not (nuspec.Contains expected) then
         failwith nuspec
+open System.Xml
+
+let private scrapeDeps (nuspecPath: string) =
+    let rec allDeps (doc: XmlNode) = seq {
+        for node in doc.ChildNodes do
+            if node.Name = "dependency" then
+              yield node.Attributes.["id"].Value, node.Attributes.["version"].Value
+            else yield! allDeps node
+    }
+    let text = File.ReadAllText nuspecPath
+    let doc = Xml.XmlDocument()
+    doc.LoadXml text
+
+    allDeps doc
+    |> Map.ofSeq
+
+[<Test>]
+let ``#2883 writes warning for missing direct dependencies``() =
+    let scenario = "i002883-fixup-nuspecs"
+    use __ = prepareSdk scenario
+    let scenarioRoot = scenarioTempPath scenario
+    let fsprojPath = Path.Combine(scenarioRoot, "lib.csproj")
+
+    let inputNuspecPath = Path.Combine(scenarioRoot, "lib.1.0.0.nuspec")
+
+    let dispose, messages = paket (sprintf "fix-nuspecs files %s project-file %s" inputNuspecPath fsprojPath) scenario
+    use __ = dispose
+
+    match messages
+          |> String.split [|'\n'|]
+          |> Seq.tryFind (fun msg -> msg.Contains "Microsoft.Extensions.DependencyInjection" && msg.Contains "is this package in your paket.dependencies file?") with
+    | Some _ -> ()
+    | None -> failwithf "Expected paket to warn user about missing top-level reference while packaging dependencies"
+
+[<Test>]
+let ``#2883 writes ranges for floating deps``() =
+    let scenario = "i002883-apply-version-ranges"
+    use __ = prepareSdk scenario
+    let scenarioRoot = scenarioTempPath scenario
+    let fsprojPath = Path.Combine(scenarioRoot, "before.fsproj")
+
+    let inputNuspecPath = Path.Combine(scenarioRoot, "before.nuspec")
+    let inputDeps = scrapeDeps inputNuspecPath
+    let dispose, messages = paket (sprintf "fix-nuspecs files %s project-file %s" inputNuspecPath fsprojPath) scenario
+    use __ = dispose
+    let outputDeps = scrapeDeps inputNuspecPath
+
+    match outputDeps |> Map.tryFind "FSharp.Compiler.Service" with
+    | Some "[35.0.0,36.0.0)" -> ()
+    | _ ->
+        failwithf "Expected to modify deps for FSharp.Compiler.Service package with floating version constraint.\nBefore:\t%A\nAfter:\t%A\nMessages:\t%A"
+            inputDeps
+            outputDeps
+            messages

integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs

@@ -1,7 +1,7 @@
 module Paket.IntegrationTests.PaketCoreSpecs
 
 open Fake
-open System
+open System 
 open NUnit.Framework
 open FsUnit
 open System
@@ -26,7 +26,7 @@ let ``#1251 full installer demo``() =
         // get from references file
         [GroupName "Main",PackageName "FAKE"
          GroupName "Main",PackageName "FSharp.Formatting"]
-    let lockFile,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, PackageResolver.UpdateMode.Install, SemVerUpdateMode.NoRestriction, force)
+    let lockFile,_,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, PackageResolver.UpdateMode.Install, SemVerUpdateMode.NoRestriction, force)
     let model = Paket.InstallProcess.CreateModel(alternativeProjectRoot, Path.GetDirectoryName dependenciesFile.FileName, force, dependenciesFile, lockFile, Set.ofSeq packagesToInstall, Map.empty) |> Map.ofArray
 
     lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "FAKE"].Version
@@ -44,7 +44,7 @@ let ``#1251 install FSharp.Collections.ParallelSeq``() =
         // get from references file
         [GroupName "Main",PackageName "FSharp.Collections.ParallelSeq"] 
 
-    let lockFile,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, PackageResolver.UpdateMode.Install, SemVerUpdateMode.NoRestriction, force)
+    let lockFile,_,_,_ = UpdateProcess.SelectiveUpdate(dependenciesFile, alternativeProjectRoot, PackageResolver.UpdateMode.Install, SemVerUpdateMode.NoRestriction, force)
 
     lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "FSharp.Collections.ParallelSeq"].Version
     |> shouldBeGreaterThan (SemVer.Parse "1.0.1")

integrationtests/scenarios/i002883-apply-version-ranges/before/Library.fs

@@ -0,0 +1,5 @@
+namespace before
+
+module Say =
+    let hello name =
+        printfn "Hello %s" name

integrationtests/scenarios/i002883-apply-version-ranges/before/before.fsproj

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+  </ItemGroup>
+  <Import Project=".paket\Paket.Restore.targets" />
+</Project>

integrationtests/scenarios/i002883-apply-version-ranges/before/before.nuspec

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>before</id>
+    <version>1.0.0</version>
+    <authors>before</authors>
+    <owners>before</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Package Description</description>
+    <dependencies>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="FSharp.Compiler.Service" version="35.0.0" exclude="Build,Analyzers" />
+        <dependency id="FSharp.Core" version="4.7.1" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+  </metadata>
+</package>

integrationtests/scenarios/i002883-apply-version-ranges/before/paket.dependencies

@@ -0,0 +1,4 @@
+source https://api.nuget.org/v3/index.json
+storage: none
+nuget FSharp.Core
+nuget FSharp.Compiler.Service ~> 35.0