Skip to content

Move to a more recent version of argu #3112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 5 commits into from
Mar 13, 2018
Merged

Move to a more recent version of argu #3112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93a7bfe
Fix code for new argu
vbfox Mar 12, 2018
75c4c69
Update Argu
vbfox Mar 12, 2018
25722bd
Disable checks in argu at runtime
vbfox Mar 12, 2018
0de5cd1
test argu structure in unit tests
vbfox Mar 12, 2018
279cd77
One more checkStructure = false
vbfox Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/tools/generate.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/Paket.IntegrationTests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
536 changes: 137 additions & 399 deletions integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions integrationtests/Paket.IntegrationTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
14 changes: 7 additions & 7 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

@matthid matthid Mar 12, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file moved to /src/legacy/FakeLib/Globbing/Globbing.fs that was probably the problem?

github fsprojects/FSharp.TypeProviders.SDK:dc5ac01a1ac288eceb1fd6f12a5d388236f4f8e5 src/AssemblyReader.fs
github forki/FsUnit FsUnit.fs

Expand All @@ -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.
Expand Down
1,648 changes: 830 additions & 818 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions src/Paket.Core.preview3/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
Loading