Skip to content
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.

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

[On Hold] add LongPath support with PRI.LongPath #2584

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions Paket.preview3.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PRI.Longpath", "src\PRI.LongPath.preview3\PRI.Longpath.csproj", "{23193B3A-26E3-48D8-A0B2-35B067A99F96}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket.Core", "src\Paket.Core.preview3\Paket.Core.fsproj", "{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Paket", "src\Paket.preview3\Paket.fsproj", "{6CA5144C-5444-46E8-9B89-86122B5E2D32}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{23193B3A-26E3-48D8-A0B2-35B067A99F96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23193B3A-26E3-48D8-A0B2-35B067A99F96}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23193B3A-26E3-48D8-A0B2-35B067A99F96}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23193B3A-26E3-48D8-A0B2-35B067A99F96}.Release|Any CPU.Build.0 = Release|Any CPU
{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{779DA2DD-CEA0-4EC4-9DBD-2CF29C2269EA}.Release|Any CPU.Build.0 = Release|Any CPU
{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CA5144C-5444-46E8-9B89-86122B5E2D32}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B8685609-2523-42CA-A8D0-921436B8674A}
EndGlobalSection
EndGlobal
17 changes: 13 additions & 4 deletions Paket.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.6
VisualStudioVersion = 15.0.26621.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Expand Down Expand Up @@ -108,10 +108,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{62D18A
.paket\paket.targets = .paket\paket.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PRI.LongPath", "src\PRI.LongPath\PRI.LongPath.csproj", "{A7A2E3C6-EAEF-42AC-8E37-23D20160DD3E}"
EndProject
Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down Expand Up @@ -141,6 +140,10 @@ Global
{7234B9B4-8CF5-4E68-AA29-050C087B9246}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7234B9B4-8CF5-4E68-AA29-050C087B9246}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7234B9B4-8CF5-4E68-AA29-050C087B9246}.Release|Any CPU.Build.0 = Release|Any CPU
{A7A2E3C6-EAEF-42AC-8E37-23D20160DD3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7A2E3C6-EAEF-42AC-8E37-23D20160DD3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7A2E3C6-EAEF-42AC-8E37-23D20160DD3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7A2E3C6-EAEF-42AC-8E37-23D20160DD3E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -153,6 +156,12 @@ Global
{7C622582-E281-4EAB-AADA-B5893BB89B45} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{7234B9B4-8CF5-4E68-AA29-050C087B9246} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5CA1A756-A69D-44CF-9622-C3D3E0405AAC}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ Note, that short description and syntax for each command is generated automatica

The [MIT license][6]

Long path support provided by [PRI.LongPath](https://github.com/peteraritchie/longPath) ([LGPL](src/PRI.LongPath/PRI.LongPath/LICENSE))


## Maintainer(s)

- [@forki](https://github.com/forki)
Expand Down
5 changes: 5 additions & 0 deletions _global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sdk": {
"version": "2.0.0-alpha-005165"
}
}
12 changes: 7 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
// --------------------------------------------------------------------------------------

#r @"packages/build/FAKE/tools/FakeLib.dll"
#r "packages/build/Pri.LongPath/lib/net45/Pri.LongPath.dll"
#r "System.IO.Compression.FileSystem"

open Fake
Expand All @@ -13,6 +14,7 @@ open Fake.ReleaseNotesHelper
open Fake.UserInputHelper
open System
open System.IO
open Pri.LongPath
open Fake.Testing.NUnit3
open System.Security.Cryptography

Expand Down Expand Up @@ -62,7 +64,7 @@ let gitName = "Paket"
// The url for the raw files hosted
let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects"

let dotnetcliVersion = "1.0.4"
let dotnetcliVersion = "2.1.0-preview1-007002"

let dotnetSDKPath = System.Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) </> "dotnetcore" |> FullName

Expand Down Expand Up @@ -93,8 +95,8 @@ let stable =
| _ -> release

let genFSAssemblyInfo (projectPath) =
let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath)
let folderName = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(projectPath))
let projectName = Path.GetFileNameWithoutExtension(projectPath)
let folderName = Path.GetFileName(System.IO.Path.GetDirectoryName(projectPath))
let basePath = "src" @@ folderName
let fileName = basePath @@ "AssemblyInfo.fs"
CreateFSharpAssemblyInfo fileName
Expand All @@ -107,8 +109,8 @@ let genFSAssemblyInfo (projectPath) =
Attribute.InformationalVersion release.NugetVersion ]

let genCSAssemblyInfo (projectPath) =
let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath)
let folderName = System.IO.Path.GetDirectoryName(projectPath)
let projectName = Path.GetFileNameWithoutExtension(projectPath)
let folderName = Path.GetDirectoryName(projectPath)
let basePath = folderName @@ "Properties"
let fileName = basePath @@ "AssemblyInfo.cs"
CreateCSharpAssemblyInfo fileName
Expand Down
6 changes: 5 additions & 1 deletion docs/content/reference-from-repl.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ you have on your system.
open System
open System.IO

#r "../../packages/build/Pri.LongPath/lib/net45/Pri.LongPath.dll"

open Pri.LongPath

Environment.CurrentDirectory <- __SOURCE_DIRECTORY__

if not (File.Exists "paket.exe") then
Expand Down Expand Up @@ -90,7 +94,7 @@ dependencies.GetDirectDependenciesForPackage("Main", "FSharp.Compiler.Service")
// [fsi: ...]

// List all usages of a package in Paket.
let paketDependencies = Dependencies.Locate(System.IO.Path.Combine(__SOURCE_DIRECTORY__,".."))
let paketDependencies = Dependencies.Locate(Path.Combine(__SOURCE_DIRECTORY__,".."))
// [fsi:found: D:\code\Paket\paket.dependencies]
paketDependencies.FindReferencesFor "UnionArgParser"
// [fsi:val it : string list = ["D:\code\Paket\src\Paket\Paket.fsproj"]]
3 changes: 3 additions & 0 deletions docs/tools/generate.fsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/// Getting help docs from Paket.exe
#r "../../bin/Argu.dll"
#r "../../bin/Paket.exe"
#r "../../packages/build/Pri.LongPath/lib/net45/Pri.LongPath.dll"
open System.IO
open Pri.LongPath


#if COMMANDS
Expand Down Expand Up @@ -55,6 +57,7 @@ let info =
#r "FakeLib.dll"
open Fake
open System.IO
open Pri.LongPath
open Fake.FileHelper
open FSharp.Literate
open FSharp.MetadataFormat
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.0.0-alpha-005165"
"version": "2.1.0-preview1-007002"
}
}
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/AddSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket
open Paket.Domain
Expand Down
5 changes: 0 additions & 5 deletions integrationtests/Paket.IntegrationTests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="10.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/AutoRestoreSpec.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

open System
open System.IO
open Pri.LongPath
open Fake
open NUnit.Framework
open FsUnit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open System.IO.Compression
open Paket
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if INTERACTIVE
System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
PRI.LongPath.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll"
#r "../../packages/build/FAKE/tools/Fakelib.dll"
#r "../../packages/Chessie/lib/net40/Chessie.dll"
Expand All @@ -18,6 +18,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open Paket.Domain

[<Test>]
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/BindingRedirect.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

open System
open System.IO
open Pri.LongPath
open NUnit.Framework
open FsUnit
open System.Text.RegularExpressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket
open Paket.Domain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open Paket.Domain
open Paket.Requirements

Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/FullGitSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket
open Paket.Domain
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/HttpSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket

Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/InitSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics

[<Test>]
Expand Down
3 changes: 2 additions & 1 deletion integrationtests/Paket.IntegrationTests/InstallSpecs.fs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if INTERACTIVE
System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
PRI.LongPath.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
#r "../../packages/test/NUnit/lib/net45/nunit.framework.dll"
#r "../../packages/build/FAKE/tools/Fakelib.dll"
#r "../../packages/Chessie/lib/net40/Chessie.dll"
Expand All @@ -18,6 +18,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket
open Paket.Domain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Paket.IntegrationTests.LoadingScriptGenerationTests
open System
open System.IO
open Pri.LongPath
open NUnit.Framework
open Paket.IntegrationTests.TestHelpers
open Paket
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Paket.IntegrationTests.LocalOverrideSpecs

open System.IO
open Pri.LongPath
open System.Xml

open Paket
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/NuGetV3Specs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open Paket
open Paket.Domain
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/OutdatedSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics

[<Test>]
Expand Down
1 change: 1 addition & 0 deletions integrationtests/Paket.IntegrationTests/PackSpecs.fs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ open NUnit.Framework
open FsUnit
open System
open System.IO
open Pri.LongPath
open System.Diagnostics
open System.IO.Compression
open Paket.Domain
Expand Down
Loading