net6.0; paket tool update

fsprojects · May 28, 2022 · 19a1f91 · 19a1f91
1 parent 64c5666
commit 19a1f91
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 93 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.251.0",
+      "version": "7.1.5",
       "commands": [
         "paket"
       ]

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -159,7 +159,7 @@
 		This value should match the version in the props generated by paket
 		If they differ, this means we need to do a restore in order to ensure correct dependencies
 	-->
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '6.0.0' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -236,13 +236,16 @@
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
-        <CopyLocal Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
+        <ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
         <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
@@ -289,14 +292,16 @@
     <PropertyGroup>
       <PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
       <ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
+      <UseMSBuild16_10_Pack>false</UseMSBuild16_10_Pack>
+      <UseMSBuild16_10_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND '@(MSBuildMinorVersion)' > '10' ">true</UseMSBuild16_10_Pack>
       <UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
-      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
+      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild16_0_Pack>
       <UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
       <UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
       <UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
-      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
+      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild15_8_Pack>
       <UseNuGet4_Pack>false</UseNuGet4_Pack>
-      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
+      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseNuGet4_Pack>
       <AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath>
       <AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath>
     </PropertyGroup>
@@ -314,6 +319,55 @@
     </ConvertToAbsolutePath>
 
     <!-- Call Pack -->
+    <PackTask Condition="$(UseMSBuild16_10_Pack)"
+              PackItem="$(PackProjectInputFile)"
+              PackageFiles="@(_PackageFiles)"
+              PackageFilesToExclude="@(_PackageFilesToExclude)"
+              PackageVersion="$(PackageVersion)"
+              PackageId="$(PackageId)"
+              Title="$(Title)"
+              Authors="$(Authors)"
+              Description="$(Description)"
+              Copyright="$(Copyright)"
+              RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
+              LicenseUrl="$(PackageLicenseUrl)"
+              ProjectUrl="$(PackageProjectUrl)"
+              IconUrl="$(PackageIconUrl)"
+              ReleaseNotes="$(PackageReleaseNotes)"
+              Tags="$(PackageTags)"
+              DevelopmentDependency="$(DevelopmentDependency)"
+              BuildOutputInPackage="@(_BuildOutputInPackage)"
+              TargetPathsToSymbols="@(_TargetPathsToSymbols)"
+              SymbolPackageFormat="$(SymbolPackageFormat)"
+              TargetFrameworks="@(_TargetFrameworks)"
+              AssemblyName="$(AssemblyName)"
+              PackageOutputPath="$(PackageOutputAbsolutePath)"
+              IncludeSymbols="$(IncludeSymbols)"
+              IncludeSource="$(IncludeSource)"
+              PackageTypes="$(PackageType)"
+              IsTool="$(IsTool)"
+              RepositoryUrl="$(RepositoryUrl)"
+              RepositoryType="$(RepositoryType)"
+              SourceFiles="@(_SourceFiles->Distinct())"
+              NoPackageAnalysis="$(NoPackageAnalysis)"
+              MinClientVersion="$(MinClientVersion)"
+              Serviceable="$(Serviceable)"
+              FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
+              ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
+              NuspecOutputPath="$(AdjustedNuspecOutputPath)"
+              IncludeBuildOutput="$(IncludeBuildOutput)"
+              BuildOutputFolders="$(BuildOutputTargetFolder)"
+              ContentTargetFolders="$(ContentTargetFolders)"
+              RestoreOutputPath="$(RestoreOutputAbsolutePath)"
+              NuspecFile="$(NuspecFileAbsolutePath)"
+              NuspecBasePath="$(NuspecBasePath)"
+              NuspecProperties="$(NuspecProperties)"
+              PackageLicenseFile="$(PackageLicenseFile)"
+              PackageLicenseExpression="$(PackageLicenseExpression)"
+              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
+              Readme="$(PackageReadmeFile)"
+              NoDefaultExcludes="$(NoDefaultExcludes)"/>
+
     <PackTask Condition="$(UseMSBuild16_0_Pack)"
               PackItem="$(PackProjectInputFile)"
               PackageFiles="@(_PackageFiles)"
@@ -343,6 +397,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -359,7 +415,8 @@
               NuspecProperties="$(NuspecProperties)"
               PackageLicenseFile="$(PackageLicenseFile)"
               PackageLicenseExpression="$(PackageLicenseExpression)"
-              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" />
+              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
+              NoDefaultExcludes="$(NoDefaultExcludes)" />
 
     <PackTask Condition="$(UseMSBuild15_9_Pack)"
               PackItem="$(PackProjectInputFile)"
@@ -390,6 +447,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -433,6 +492,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -475,6 +536,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"

diff --git a/paket.dependencies b/paket.dependencies
@@ -8,13 +8,13 @@ nuget DotNet.ReproducibleBuilds
 
 group Tests
   source https://api.nuget.org/v3/index.json
-  framework: net5.0
+  framework: net6.0
   storage: none
 
   nuget FSharp.Core ~> 6.0
   nuget Microsoft.NET.Test.Sdk ~> 17.0
   nuget xunit ~> 2.4
-  nuget xunit.runner.visualstudio ~> 2.4.0 version_in_path: true
+  nuget xunit.runner.visualstudio ~> 2.4 version_in_path: true
   nuget Unquote ~> 4.0
   nuget FsCheck ~> 3.0 prerelease
 
@@ -24,10 +24,10 @@ group Build
   framework: netstandard2.0
   storage: none
 
-  nuget Fake.Core.UserInput	    
-  nuget Fake.Core.ReleaseNotes 
-  nuget Fake.Core.Target      
-  nuget Fake.IO.FileSystem   
-  nuget Fake.DotNet.Cli	    
-  nuget Fake.Tools.Git     
-  nuget Fake.Api.Github   
+  nuget Fake.Core.UserInput	    ~> 5.20.0
+  nuget Fake.Core.ReleaseNotes  ~> 5.20.0
+  nuget Fake.Core.Target        ~> 5.20.0
+  nuget Fake.IO.FileSystem      ~> 5.20.0
+  nuget Fake.DotNet.Cli	        ~> 5.20.0
+  nuget Fake.Tools.Git          ~> 5.20.0
+  nuget Fake.Api.Github         ~> 5.20.0
diff --git a/paket.lock b/paket.lock
@@ -43,9 +43,9 @@ NUGET
     BlackFox.VsWhere (1.1)
       FSharp.Core (>= 4.2.3)
       Microsoft.Win32.Registry (>= 4.7)
-    Fake.Api.GitHub (5.22)
-      FSharp.Core (>= 6.0)
-      Octokit (>= 0.50)
+    Fake.Api.GitHub (5.20.4)
+      FSharp.Core (>= 4.7.2)
+      Octokit (>= 0.48)
     Fake.Core.CommandLineParsing (5.22)
       FParsec (>= 1.1.1)
       FSharp.Core (>= 6.0)
@@ -56,91 +56,91 @@ NUGET
     Fake.Core.FakeVar (5.22)
       Fake.Core.Context (>= 5.22)
       FSharp.Core (>= 6.0)
-    Fake.Core.Process (5.22)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.FakeVar (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      Fake.IO.FileSystem (>= 5.22)
-      FSharp.Core (>= 6.0)
-      System.Collections.Immutable (>= 5.0)
-    Fake.Core.ReleaseNotes (5.22)
-      Fake.Core.SemVer (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      FSharp.Core (>= 6.0)
+    Fake.Core.Process (5.20.4)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.FakeVar (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      Fake.IO.FileSystem (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
+      System.Collections.Immutable (>= 1.7.1)
+    Fake.Core.ReleaseNotes (5.20.4)
+      Fake.Core.SemVer (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
     Fake.Core.SemVer (5.22)
       FSharp.Core (>= 6.0)
     Fake.Core.String (5.22)
       FSharp.Core (>= 6.0)
-    Fake.Core.Target (5.22)
-      Fake.Core.CommandLineParsing (>= 5.22)
-      Fake.Core.Context (>= 5.22)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.FakeVar (>= 5.22)
-      Fake.Core.Process (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      FSharp.Control.Reactive (>= 5.0.2)
-      FSharp.Core (>= 6.0)
+    Fake.Core.Target (5.20.4)
+      Fake.Core.CommandLineParsing (>= 5.20.4)
+      Fake.Core.Context (>= 5.20.4)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.FakeVar (>= 5.20.4)
+      Fake.Core.Process (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      FSharp.Control.Reactive (>= 4.4.2)
+      FSharp.Core (>= 4.7.2)
     Fake.Core.Tasks (5.22)
       Fake.Core.Trace (>= 5.22)
       FSharp.Core (>= 6.0)
     Fake.Core.Trace (5.22)
       Fake.Core.Environment (>= 5.22)
       Fake.Core.FakeVar (>= 5.22)
       FSharp.Core (>= 6.0)
-    Fake.Core.UserInput (5.22)
-      FSharp.Core (>= 6.0)
+    Fake.Core.UserInput (5.20.4)
+      FSharp.Core (>= 4.7.2)
     Fake.Core.Xml (5.22)
       Fake.Core.String (>= 5.22)
       FSharp.Core (>= 6.0)
-    Fake.DotNet.Cli (5.22)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.Process (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      Fake.DotNet.MSBuild (>= 5.22)
-      Fake.DotNet.NuGet (>= 5.22)
-      Fake.IO.FileSystem (>= 5.22)
-      FSharp.Core (>= 6.0)
+    Fake.DotNet.Cli (5.20.4)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.Process (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      Fake.DotNet.MSBuild (>= 5.20.4)
+      Fake.DotNet.NuGet (>= 5.20.4)
+      Fake.IO.FileSystem (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
       Mono.Posix.NETStandard (>= 1.0)
-      Newtonsoft.Json (>= 13.0.1)
-    Fake.DotNet.MSBuild (5.22)
+      Newtonsoft.Json (>= 12.0.3)
+    Fake.DotNet.MSBuild (5.20.4)
       BlackFox.VsWhere (>= 1.1)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.Process (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      Fake.IO.FileSystem (>= 5.22)
-      FSharp.Core (>= 6.0)
-      MSBuild.StructuredLogger (>= 2.1.545)
-    Fake.DotNet.NuGet (5.22)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.Process (>= 5.22)
-      Fake.Core.SemVer (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Tasks (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      Fake.Core.Xml (>= 5.22)
-      Fake.IO.FileSystem (>= 5.22)
-      Fake.Net.Http (>= 5.22)
-      FSharp.Core (>= 6.0)
-      Newtonsoft.Json (>= 13.0.1)
-      NuGet.Protocol (>= 5.11)
-    Fake.IO.FileSystem (5.22)
-      Fake.Core.String (>= 5.22)
-      FSharp.Core (>= 6.0)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.Process (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      Fake.IO.FileSystem (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
+      MSBuild.StructuredLogger (>= 2.1.176)
+    Fake.DotNet.NuGet (5.20.4)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.Process (>= 5.20.4)
+      Fake.Core.SemVer (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Tasks (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      Fake.Core.Xml (>= 5.20.4)
+      Fake.IO.FileSystem (>= 5.20.4)
+      Fake.Net.Http (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
+      Newtonsoft.Json (>= 12.0.3)
+      NuGet.Protocol (>= 5.6)
+    Fake.IO.FileSystem (5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
     Fake.Net.Http (5.22)
       Fake.Core.Trace (>= 5.22)
       FSharp.Core (>= 6.0)
-    Fake.Tools.Git (5.22)
-      Fake.Core.Environment (>= 5.22)
-      Fake.Core.Process (>= 5.22)
-      Fake.Core.SemVer (>= 5.22)
-      Fake.Core.String (>= 5.22)
-      Fake.Core.Trace (>= 5.22)
-      Fake.IO.FileSystem (>= 5.22)
-      FSharp.Core (>= 6.0)
+    Fake.Tools.Git (5.20.4)
+      Fake.Core.Environment (>= 5.20.4)
+      Fake.Core.Process (>= 5.20.4)
+      Fake.Core.SemVer (>= 5.20.4)
+      Fake.Core.String (>= 5.20.4)
+      Fake.Core.Trace (>= 5.20.4)
+      Fake.IO.FileSystem (>= 5.20.4)
+      FSharp.Core (>= 4.7.2)
     FParsec (1.1.1)
       FSharp.Core (>= 4.3.4)
     FSharp.Control.Reactive (5.0.5)
@@ -260,12 +260,12 @@ NUGET
 
 GROUP Tests
 STORAGE: NONE
-RESTRICTION: == net5.0
+RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FsCheck (3.0.0-beta2)
       FSharp.Core (>= 4.5)
-    FSharp.Core (5.0.2)
+    FSharp.Core (6.0.4)
     Microsoft.CodeCoverage (17.2)
     Microsoft.NET.Test.Sdk (17.2)
       Microsoft.CodeCoverage (>= 17.2)
@@ -282,9 +282,7 @@ NUGET
     Newtonsoft.Json (13.0.1)
     NuGet.Frameworks (6.2)
     System.Collections.Immutable (6.0)
-      System.Memory (>= 4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Memory (4.5.5)
     System.Reflection.Metadata (6.0.1)
       System.Collections.Immutable (>= 6.0)
     System.Runtime.CompilerServices.Unsafe (6.0)

diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>ls</AssemblyName>
   </PropertyGroup>