Merge pull request #3112 from vbfox/new_argu

Move to a more recent version of argu
fsprojects · Mar 13, 2018 · fa80569 · fa80569
2 parents 018dc5b + 279cd77
commit fa80569
Show file tree

Hide file tree

Showing 21 changed files with 1,631 additions and 2,635 deletions.
diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx
@@ -10,20 +10,20 @@ let MaxCodeWidth = 100
 Paket.Commands.getAllCommands()
 |> List.iter (fun command ->
     let metadata = command.ParentInfo |> Option.get
-    let additionalText = 
+    let additionalText =
         let verboseOption = """
 
 If you add the `--verbose` flag Paket will run in verbose mode and show detailed information.
 
 With `--log-file [path]` you can trace the logged information into a file.
 
 """
-        let optFile = sprintf "../content/commands/%s.md" metadata.Name
+        let optFile = sprintf "../content/commands/%s.md" metadata.Name.Value
         if File.Exists optFile
         then verboseOption + File.ReadAllText optFile
         else verboseOption
 
-    File.WriteAllText(sprintf "../content/paket-%s.md" metadata.Name, Paket.Commands.markdown command MaxCodeWidth additionalText))
+    File.WriteAllText(sprintf "../content/paket-%s.md" metadata.Name.Value, Paket.Commands.markdown command MaxCodeWidth additionalText))
 #endif
 
 
@@ -87,7 +87,7 @@ subDirectories (directoryInfo templates)
 let copyFiles () =
   CopyRecursive files output true |> Log "Copying file: "
   ensureDirectory (output @@ "content")
-  CopyRecursive (formatting @@ "styles") (output @@ "content") true 
+  CopyRecursive (formatting @@ "styles") (output @@ "content") true
     |> Log "Copying styles and scripts: "
 
 // Build API reference from XML comments

diff --git a/integrationtests/Paket.IntegrationTests/App.config b/integrationtests/Paket.IntegrationTests/App.config
@@ -7,7 +7,7 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
   </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>

diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
diff --git a/integrationtests/Paket.IntegrationTests/packages.config b/integrationtests/Paket.IntegrationTests/packages.config
@@ -6,6 +6,8 @@
   <package id="System.ComponentModel.EventBasedAsync" version="4.3.0" />
   <package id="System.Diagnostics.Process" version="4.3" />
   <package id="System.Security.AccessControl" version="4.4" />
+  <package id="System.Security.Claims" version="4.3" />
+  <package id="System.Security.Principal" version="4.3" />
   <package id="System.Security.Principal.Windows" version="4.4" />
   <package id="System.Xml.XPath" version="4.3" />
   <package id="System.Xml.XPath.XmlDocument" version="4.3" />

diff --git a/paket.dependencies b/paket.dependencies
@@ -2,12 +2,12 @@ source https://nuget.org/api/v2
 content: none
 
 nuget Newtonsoft.Json redirects: force
-nuget Argu prerelease
+nuget Argu >= 5.1.0
 nuget FSharp.Core redirects: force
 nuget Chessie >= 0.6
 nuget Mono.Cecil prerelease
 
-nuget System.Security.Cryptography.ProtectedData 
+nuget System.Security.Cryptography.ProtectedData
 
 nuget FSharp.Compiler.Tools
 
@@ -23,7 +23,7 @@ nuget NUnit.Console
 nuget NUnit3TestAdapter version_in_path: true
 clitool dotnet-mergenupkg
 
-github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
+github fsharp/FAKE:0341a2e614eb2a7f34607cec914eb0ed83ce9add src/app/FakeLib/Globbing/Globbing.fs
 github fsprojects/FSharp.TypeProviders.SDK:dc5ac01a1ac288eceb1fd6f12a5d388236f4f8e5 src/AssemblyReader.fs
 github forki/FsUnit FsUnit.fs
 
@@ -39,18 +39,18 @@ group Build
   framework >= net461
   source https://nuget.org/api/v2
   source https://ci.appveyor.com/nuget/fsharp-formatting
-  
+
   nuget FAKE
   nuget FSharp.Formatting prerelease
   nuget System.ValueTuple
   nuget Microsoft.AspNet.Razor
   nuget ILRepack
-  
+
   github fsharp/FAKE modules/Octokit/Octokit.fsx
-  
+
   # Note: this package was produced using https://github.com/jaredpar/xcopy-msbuild and contains the two directories ".NETFramework\v4.5" and ".NETPortable\v4.5"
   nuget 0x53A.ReferenceAssemblies.Paket 0.2.0
-  
+
   source https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
   nuget RoslynTools.MSBuild prerelease
   # Note: RoslynTools.ReferenceAssemblies does not contain the required reference assemblies for net45, so I created 0x53A.ReferenceAssemblies.Paket. It is much smaller, anyway.

diff --git a/paket.lock b/paket.lock
diff --git a/src/Paket.Core.preview3/app.config b/src/Paket.Core.preview3/app.config
@@ -4,7 +4,7 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.3.0" />
   </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
@@ -26,11 +26,6 @@
     <assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
   </dependentAssembly>
-  <dependentAssembly>
-    <Paket>True</Paket>
-    <assemblyIdentity name="System.Reflection.Emit.Lightweight" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.2.0" />
-  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="System.Runtime.Serialization.Formatters" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />