chore: add paket

mausch · Aug 20, 2021 · cfea5f5 · cfea5f5
1 parent 64defd5
commit cfea5f5
Show file tree

Hide file tree

Showing 19 changed files with 122 additions and 53 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,18 +2,11 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fake-cli" : {
-      "version": "5.20.3",
+    "paket": {
+      "version": "6.0.6",
       "commands": [
-        "fake"
-      ]
-    },
-    "fable": {
-      "version": "3.0.0-nagareyama-rc-004",
-      "commands": [
-        "fable"
+        "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/Fuchu.CSharpTests/Fuchu.CSharpTests.csproj b/Fuchu.CSharpTests/Fuchu.CSharpTests.csproj
@@ -14,5 +14,5 @@
   <!-- <ItemGroup> -->
   <!--   <PackageReference Include="FSharp.Core" Version="4.6.2" /> -->
   <!-- </ItemGroup> -->
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu.FableTests/Fuchu.FableTests.fsproj b/Fuchu.FableTests/Fuchu.FableTests.fsproj
@@ -13,6 +13,7 @@
     <DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Prelude.fs" />
     <Compile Include="Tests.fs" />
     <Compile Include="Main.fs" />
@@ -26,5 +27,5 @@
   <!--   <PackageReference Include="Fable.Promise" Version="2.1.0" /> -->
   <!--   <PackageReference Include="Fable.Fetch" Version="2.2.0" /> -->
   <!-- </ItemGroup> -->
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu.FableTests/paket.references b/Fuchu.FableTests/paket.references
diff --git a/Fuchu.FsCheck/FsCheck.fs b/Fuchu.FsCheck/FsCheck.fs
@@ -16,43 +16,44 @@ module FuchuFsCheck =
         | :? IgnoreException as e -> Some e
         | _ -> None
 
-    let internal wrapRunner (r : IRunner) =
+    let internal wrapRunner (r: IRunner) =
         { new IRunner with
             member x.OnStartFixture t = r.OnStartFixture t
-            member x.OnArguments (ntest, args, every) = r.OnArguments (ntest, args, every)
+            member x.OnArguments(ntest, args, every) = r.OnArguments(ntest, args, every)
             member x.OnShrink(args, everyShrink) = r.OnShrink(args, everyShrink)
-            member x.OnFinished(name,testResult) = 
+
+            member x.OnFinished(name, testResult) =
                 let msg = onFinishedToString name testResult
+
                 match testResult with
                 | FsCheck.TestResult.True _ -> ()
-                | FsCheck.TestResult.False (_,_,_, Outcome.Exception (Ignored e),_) -> raise e
-                | _ -> failtest msg
-        }
+                | FsCheck.TestResult.False (_, _, _, Outcome.Exception (Ignored e), _) -> raise e
+                | _ -> failtest msg }
 
-    let internal config = 
+    let internal config =
         { Config.Default with
-            Runner = wrapRunner Config.Default.Runner }
+              Runner = wrapRunner Config.Default.Runner }
 
-    let testPropertyWithConfig (config: Config) name property = 
+    let testPropertyWithConfig (config: Config) name property =
         let config =
             { config with
-                Runner = wrapRunner config.Runner }
-        testCase name <|
-            fun _ ->
-                ignore Runner.init.Value
-                FsCheck.Check.One(name, config, property)
-
+                  Runner = wrapRunner config.Runner }
+
+        testCase name
+        <| fun _ ->
+            ignore Runner.init.Value
+            FsCheck.Check.One(name, config, property)
+
     let testProperty name = testPropertyWithConfig config name
 
 type FsCheck =
-    static member Property(name, property: Func<_,bool>) =
-        testProperty name property.Invoke
+    static member Property(name, property: Func<_, bool>) = testProperty name property.Invoke
 
-    static member Property(name, property: Func<_,_,bool>) =
-        testProperty name (fun a b -> property.Invoke(a,b))
+    static member Property(name, property: Func<_, _, bool>) =
+        testProperty name (fun a b -> property.Invoke(a, b))
 
-    static member Property(name, property: Func<_,_,_,bool>) =
-        testProperty name (fun a b c -> property.Invoke(a,b,c))
+    static member Property(name, property: Func<_, _, _, bool>) =
+        testProperty name (fun a b c -> property.Invoke(a, b, c))
 
-    static member Property(name, property: Func<_,_,_,_,bool>) =
-        testProperty name (fun a b c d -> property.Invoke(a,b,c,d))
+    static member Property(name, property: Func<_, _, _, _, bool>) =
+        testProperty name (fun a b c d -> property.Invoke(a, b, c, d))
diff --git a/Fuchu.FsCheck/Fuchu.FsCheck.fsproj b/Fuchu.FsCheck/Fuchu.FsCheck.fsproj
@@ -13,6 +13,7 @@
     <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FsCheck.fs" />
   </ItemGroup>
@@ -23,5 +24,5 @@
   <!--   <PackageReference Update="FSharp.Core" Version="4.6.2" /> -->
   <!--   <PackageReference Include="FsCheck" Version="2.14.0" /> -->
   <!-- </ItemGroup> -->
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu.FsCheck/paket.references b/Fuchu.FsCheck/paket.references
diff --git a/Fuchu.MbUnit/Fuchu.MbUnit.fsproj b/Fuchu.MbUnit/Fuchu.MbUnit.fsproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Fuchu.MbUnit</RootNamespace>
     <AssemblyName>Fuchu.MbUnit</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <Name>Fuchu.MbUnit</Name>
     <Authors>Mauricio Scheffer</Authors>
     <Description>Converts Fuchu tests to MbUnit tests</Description>
@@ -13,6 +13,7 @@
     <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FuchuTestToMbUnit.fs" />
   </ItemGroup>
@@ -25,4 +26,5 @@
   <ItemGroup>
     <PackageReference Include="Gallio_MbUnit" Version="3.4.14.0" />
   </ItemGroup>
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/Fuchu.MbUnit/paket.references b/Fuchu.MbUnit/paket.references
diff --git a/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj b/Fuchu.PerfUtil.Charting/Fuchu.PerfUtil.Charting.fsproj
@@ -4,11 +4,12 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Fuchu.PerfUtil.Charting</RootNamespace>
     <AssemblyName>Fuchu.PerfUtil.Charting</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <Name>Fuchu.PerfUtil.Charting</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Charting.fs" />
   </ItemGroup>
   <ItemGroup>
@@ -27,4 +28,5 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Charting" Version="2.1.0" />
   </ItemGroup>
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj b/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj
@@ -15,6 +15,7 @@
 
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="PerfUtil.fs" />
   </ItemGroup>
@@ -25,4 +26,5 @@
     <!-- <PackageReference Update="FSharp.Core" Version="4.6.2" /> -->
     <!-- <PackageReference Include="PerfUtil" Version="0.1.8" /> -->
   </ItemGroup>
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu.PerfUtil/paket.references b/Fuchu.PerfUtil/paket.references
diff --git a/Fuchu.TeamCity/Fuchu.TeamCity.fsproj b/Fuchu.TeamCity/Fuchu.TeamCity.fsproj
@@ -4,10 +4,11 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Fuchu.TeamCity</RootNamespace>
     <AssemblyName>Fuchu.TeamCity</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <Name>Fuchu.TeamCity</Name>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Runner.fs" />
   </ItemGroup>
   <ItemGroup>
@@ -24,4 +25,5 @@
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/Fuchu.TeamCity/paket.references b/Fuchu.TeamCity/paket.references
diff --git a/Fuchu.Tests/Fuchu.Tests.fsproj b/Fuchu.Tests/Fuchu.Tests.fsproj
@@ -13,6 +13,7 @@
     <DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Prelude.fs" />
     <Compile Include="NUnitTestTypes.fs" />
     <Compile Include="NUnitTests.fs" />
@@ -35,5 +36,5 @@
   <!--   <PackageReference Update="FSharp.Core" Version="4.6.2" /> -->
   <!--   <PackageReference Include="NUnit" Version="3.12.0" /> -->
   <!-- </ItemGroup> -->
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu.Tests/paket.references b/Fuchu.Tests/paket.references
diff --git a/Fuchu/Fuchu.fsproj b/Fuchu/Fuchu.fsproj
@@ -18,6 +18,7 @@
 
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Fuchu.fs" />
     <Compile Include="xUnitHelpers.fs" />
     <Compile Include="Fuchu.NUnit.fs" />
@@ -35,5 +36,5 @@
   <ItemGroup>
     <Content Include="*.fsproj; *.fs" PackagePath="fable/" />
   </ItemGroup>
-
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Fuchu/paket.references b/Fuchu/paket.references