Skip to content

Support for BaseIntermediateOutputPath #3527

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 8 commits into from
Apr 11, 2019
Merged

Support for BaseIntermediateOutputPath #3527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1676573
Introduce --output-path restore arg; 'PaketDisableGlobalRestore' option
theimowski Mar 20, 2019
5cc6e41
Don't use argu for restore with --output-path
theimowski Mar 22, 2019
a57c43f
Add OutputPath back to RestoreArgs
theimowski Mar 22, 2019
e38473a
Add section in docs
theimowski Mar 22, 2019
67d7f1c
Link PR in docs
theimowski Mar 22, 2019
b83e1d5
Add integration test
theimowski Mar 26, 2019
38ce587
Trim trailing slashes for BaseIntermediateOutputPath
theimowski Apr 9, 2019
ec76778
Remove double quotes for default BaseIntermediateOutputPath
theimowski Apr 10, 2019
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
Prev Previous commit
Next Next commit
Add OutputPath back to RestoreArgs
  • Loading branch information
@theimowski
theimowski committed Apr 8, 2019
commit a57c43fe22438bd5f881dbcb0ea23714a0c5efc8
2 changes: 2 additions & 0 deletions src/Paket/Commands.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ type RestoreArgs =
| [<Hidden;CustomCommandLine("--references-files")>] References_File_Legacy of path:string list

| [<Unique>] Target_Framework of framework:string
| [<Unique>] Output_Path of path:string
with
interface IArgParserTemplate with
member this.Usage =
Expand All @@ -317,6 +318,7 @@ with
| References_File_Legacy(_) -> "[obsolete]"

| Target_Framework(_) -> "restore only for the specified target framework"
| Output_Path(_) -> "Output path directory of MSBuild. When used in combination with the new dotnet cli based sdk, paket will write supporting files (nuget.config, paket.resolved) there"

type SimplifyArgs =
| [<Unique;AltCommandLine("-i")>] Interactive
Expand Down
7 changes: 4 additions & 3 deletions src/Paket/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,15 +426,16 @@ let restore (results : ParseResults<_>) =
let ignoreChecks = results.Contains <@ RestoreArgs.Ignore_Checks @>
let failOnChecks = results.Contains <@ RestoreArgs.Fail_On_Checks @>
let targetFramework = results.TryGetResult <@ RestoreArgs.Target_Framework @>
let outputPath = results.TryGetResult <@ RestoreArgs.Output_Path @>

match project with
| Some project ->
Dependencies.Locate().Restore(force, group, project, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, None)
Dependencies.Locate().Restore(force, group, project, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, outputPath)
| None ->
if List.isEmpty files then
Dependencies.Locate().Restore(force, group, installOnlyReferenced, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, None)
Dependencies.Locate().Restore(force, group, installOnlyReferenced, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, outputPath)
else
Dependencies.Locate().Restore(force, group, files, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, None)
Dependencies.Locate().Restore(force, group, files, touchAffectedRefs, ignoreChecks, failOnChecks, targetFramework, outputPath)

let simplify (results : ParseResults<_>) =
let interactive = results.Contains <@ SimplifyArgs.Interactive @>
Expand Down