From e95fca78de36f0a1b683953683c8d98dc4a50084 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 1 Nov 2016 09:39:42 +0100 Subject: [PATCH 01/14] Download .NET Core --- build.fsx | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index e2b0babac2..152502f046 100644 --- a/build.fsx +++ b/build.fsx @@ -3,6 +3,7 @@ // -------------------------------------------------------------------------------------- #r @"packages/build/FAKE/tools/FakeLib.dll" +#r "System.IO.Compression.FileSystem" open Fake open Fake.Git @@ -117,6 +118,25 @@ Target "AssemblyInfo" (fun _ -> csProjs |> Seq.iter genCSAssemblyInfo ) +let dotnetcliVersion = "1.0.0-preview3-003886" +let dotnetPath = DirectoryInfo "./dotnetcore" + +Target "InstallDotNetCore" (fun _ -> + if not dotnetPath.Exists then + dotnetPath.Create() + + let DOTNET_ZIP_NAME = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion + let DOTNET_REMOTE_PATH = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion DOTNET_ZIP_NAME + let DOTNET_LOCAL_PATH = Path.Combine(dotnetPath.FullName, DOTNET_ZIP_NAME) + + tracefn "Installing '%s' to '%s" DOTNET_REMOTE_PATH DOTNET_LOCAL_PATH + + use webclient = new Net.WebClient() + webclient.DownloadFile(DOTNET_REMOTE_PATH, DOTNET_LOCAL_PATH) + + System.IO.Compression.ZipFile.ExtractToDirectory(DOTNET_LOCAL_PATH, dotnetPath.FullName) +) + // -------------------------------------------------------------------------------------- // Clean build results @@ -491,8 +511,9 @@ Target "All" DoNothing "Clean" ==> "AssemblyInfo" - ==> "Build" + =?> ("InstallDotNetCore", not <| hasBuildParam "DISABLE_NETCORE") =?> ("DotnetRestore", not <| hasBuildParam "DISABLE_NETCORE") + ==> "Build" =?> ("DotnetPackage", not <| hasBuildParam "DISABLE_NETCORE") =?> ("BuildPowerShell", not isMono) ==> "RunTests" From 94d688b789a6d5e14ba802b6225e416d4ebf50b5 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 1 Nov 2016 09:45:09 +0100 Subject: [PATCH 02/14] Use latest dotnetcli --- .gitignore | 3 ++- build.fsx | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9f57bc3a95..c8c4fba1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -192,4 +192,5 @@ docs/tools/FSharp.Formatting.svclog docs/content/paket.exe TestResult.xml tests/Paket.Tests/NuGetConfig/PasswordConfig.xml -paket.local \ No newline at end of file +paket.local +dotnetcore diff --git a/build.fsx b/build.fsx index 152502f046..fe57bcb188 100644 --- a/build.fsx +++ b/build.fsx @@ -61,6 +61,11 @@ let gitName = "Paket" // The url for the raw files hosted let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" + + +let dotnetcliVersion = "1.0.0-preview3-003981" +let dotnetPath = DirectoryInfo "./dotnetcore" + // -------------------------------------------------------------------------------------- // END TODO: The rest of the file includes standard build steps // -------------------------------------------------------------------------------------- @@ -118,9 +123,6 @@ Target "AssemblyInfo" (fun _ -> csProjs |> Seq.iter genCSAssemblyInfo ) -let dotnetcliVersion = "1.0.0-preview3-003886" -let dotnetPath = DirectoryInfo "./dotnetcore" - Target "InstallDotNetCore" (fun _ -> if not dotnetPath.Exists then dotnetPath.Create() From 99e3310902dbc2431bcc7268381c65331b7a9f55 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 1 Nov 2016 09:49:54 +0100 Subject: [PATCH 03/14] Don't install cli twice --- build.fsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.fsx b/build.fsx index fe57bcb188..21109269ac 100644 --- a/build.fsx +++ b/build.fsx @@ -126,17 +126,17 @@ Target "AssemblyInfo" (fun _ -> Target "InstallDotNetCore" (fun _ -> if not dotnetPath.Exists then dotnetPath.Create() + else + let DOTNET_ZIP_NAME = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion + let DOTNET_REMOTE_PATH = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion DOTNET_ZIP_NAME + let DOTNET_LOCAL_PATH = Path.Combine(dotnetPath.FullName, DOTNET_ZIP_NAME) - let DOTNET_ZIP_NAME = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion - let DOTNET_REMOTE_PATH = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion DOTNET_ZIP_NAME - let DOTNET_LOCAL_PATH = Path.Combine(dotnetPath.FullName, DOTNET_ZIP_NAME) - - tracefn "Installing '%s' to '%s" DOTNET_REMOTE_PATH DOTNET_LOCAL_PATH - - use webclient = new Net.WebClient() - webclient.DownloadFile(DOTNET_REMOTE_PATH, DOTNET_LOCAL_PATH) + tracefn "Installing '%s' to '%s" DOTNET_REMOTE_PATH DOTNET_LOCAL_PATH + + use webclient = new Net.WebClient() + webclient.DownloadFile(DOTNET_REMOTE_PATH, DOTNET_LOCAL_PATH) - System.IO.Compression.ZipFile.ExtractToDirectory(DOTNET_LOCAL_PATH, dotnetPath.FullName) + System.IO.Compression.ZipFile.ExtractToDirectory(DOTNET_LOCAL_PATH, dotnetPath.FullName) ) // -------------------------------------------------------------------------------------- @@ -161,7 +161,7 @@ Target "Build" (fun _ -> |> MSBuildRelease "" "Rebuild" |> ignore ) - +1 let dotnetExePath = match tryFindFileOnPath (if isWindows then "dotnet.exe" else "dotnet") with | Some p -> p From 1460c01876298f849698c65046f8ba53c6abc61a Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 1 Nov 2016 09:52:31 +0100 Subject: [PATCH 04/14] Don't install cli twice --- build.fsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.fsx b/build.fsx index 21109269ac..23f0abaa76 100644 --- a/build.fsx +++ b/build.fsx @@ -126,6 +126,9 @@ Target "AssemblyInfo" (fun _ -> Target "InstallDotNetCore" (fun _ -> if not dotnetPath.Exists then dotnetPath.Create() + + if FileInfo(Path.Combine(dotnetPath.FullName,"dotnet.exe")).Exists then + tracefn "dotnetcli already installed" else let DOTNET_ZIP_NAME = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion let DOTNET_REMOTE_PATH = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion DOTNET_ZIP_NAME From 957561ddd2ddfad811fc7b04b371ab8caa07a70d Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Tue, 1 Nov 2016 09:54:29 +0100 Subject: [PATCH 05/14] Fix filename --- build.fsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.fsx b/build.fsx index 23f0abaa76..4b926d2e11 100644 --- a/build.fsx +++ b/build.fsx @@ -165,10 +165,7 @@ Target "Build" (fun _ -> |> ignore ) 1 -let dotnetExePath = - match tryFindFileOnPath (if isWindows then "dotnet.exe" else "dotnet") with - | Some p -> p - | None -> "" +let dotnetExePath = if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName Target "DotnetRestore" (fun _ -> // dotnet restore From c9751221d46537aced65fc1b75fc73d76e9d153d Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 2 Nov 2016 09:00:34 +0100 Subject: [PATCH 06/14] Check if core preview has right version --- build.fsx | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/build.fsx b/build.fsx index 4b926d2e11..f2c121facd 100644 --- a/build.fsx +++ b/build.fsx @@ -62,8 +62,7 @@ let gitName = "Paket" let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" - -let dotnetcliVersion = "1.0.0-preview3-003981" +let dotnetcliVersion = "1.0.0-preview3-004007" let dotnetPath = DirectoryInfo "./dotnetcore" // -------------------------------------------------------------------------------------- @@ -123,23 +122,39 @@ Target "AssemblyInfo" (fun _ -> csProjs |> Seq.iter genCSAssemblyInfo ) -Target "InstallDotNetCore" (fun _ -> - if not dotnetPath.Exists then - dotnetPath.Create() +let dotnetExePath = if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName - if FileInfo(Path.Combine(dotnetPath.FullName,"dotnet.exe")).Exists then - tracefn "dotnetcli already installed" +Target "InstallDotNetCore" (fun _ -> + let correctVersionInstalled = + try + if FileInfo(Path.Combine(dotnetPath.FullName,"dotnet.exe")).Exists then + let processResult = + ExecProcessAndReturnMessages (fun info -> + info.FileName <- dotnetExePath + info.WorkingDirectory <- Environment.CurrentDirectory + info.Arguments <- "--version") (TimeSpan.FromMinutes 30.) + + processResult.Messages |> separated "" = dotnetcliVersion + + else + false + with + | _ -> false + + if correctVersionInstalled then + tracefn "dotnetcli %s already installed" dotnetcliVersion else - let DOTNET_ZIP_NAME = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion - let DOTNET_REMOTE_PATH = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion DOTNET_ZIP_NAME - let DOTNET_LOCAL_PATH = Path.Combine(dotnetPath.FullName, DOTNET_ZIP_NAME) + CleanDir dotnetPath.FullName + let zipFileName = sprintf "dotnet-dev-win-x64.%s.zip" dotnetcliVersion + let downloadPath = sprintf "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%s/%s" dotnetcliVersion zipFileName + let localPath = Path.Combine(dotnetPath.FullName, zipFileName) - tracefn "Installing '%s' to '%s" DOTNET_REMOTE_PATH DOTNET_LOCAL_PATH + tracefn "Installing '%s' to '%s" downloadPath localPath use webclient = new Net.WebClient() - webclient.DownloadFile(DOTNET_REMOTE_PATH, DOTNET_LOCAL_PATH) + webclient.DownloadFile(downloadPath, localPath) - System.IO.Compression.ZipFile.ExtractToDirectory(DOTNET_LOCAL_PATH, dotnetPath.FullName) + System.IO.Compression.ZipFile.ExtractToDirectory(localPath, dotnetPath.FullName) ) // -------------------------------------------------------------------------------------- @@ -164,8 +179,6 @@ Target "Build" (fun _ -> |> MSBuildRelease "" "Rebuild" |> ignore ) -1 -let dotnetExePath = if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName Target "DotnetRestore" (fun _ -> // dotnet restore From 9091ea42807d4b6727f178b30c24da810d790f78 Mon Sep 17 00:00:00 2001 From: Mark Gray Date: Wed, 2 Nov 2016 10:41:00 +0000 Subject: [PATCH 07/14] Update the FAQ Indicate that the paket-files directory and packages directory should not be committed to source control. --- docs/content/faq.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/faq.md b/docs/content/faq.md index d53e22a5ba..9081169461 100644 --- a/docs/content/faq.md +++ b/docs/content/faq.md @@ -89,6 +89,7 @@ The following files can be committed, but are not essential: The following files should *not* be committed to your version control system, and should be added to any ignore files: * `.paket/paket.exe` - the main Paket executable, downloaded by [`.paket/paket.bootstrapper.exe`](getting-started.html). This should not be committed, as it is a binary file, which can unnecessarily bloat repositories, and because it is likely to be updated on a regular basis. +* `paket-files` directory, as paket install will restore this. Same goes for the `packages` directory ## Why should I commit the lock file? From faf07982080ea5b4fc4dba1944ea94f374deb92c Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 2 Nov 2016 12:05:36 +0100 Subject: [PATCH 08/14] Use 1.0.0-preview3-003884 for now --- build.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index f2c121facd..337a4c375d 100644 --- a/build.fsx +++ b/build.fsx @@ -62,7 +62,7 @@ let gitName = "Paket" let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" -let dotnetcliVersion = "1.0.0-preview3-004007" +let dotnetcliVersion = "1.0.0-preview3-003884" let dotnetPath = DirectoryInfo "./dotnetcore" // -------------------------------------------------------------------------------------- From e3e7439638ee72bedd7520ca6f3fa8d6365f9671 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Wed, 2 Nov 2016 12:16:08 +0100 Subject: [PATCH 09/14] Restore config --- .paket/Paket.Restore.targets | 22 ++++++++++++++++++++++ .paket/paket.exe.config | 6 ++++++ 2 files changed, 28 insertions(+) create mode 100644 .paket/Paket.Restore.targets create mode 100644 .paket/paket.exe.config diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets new file mode 100644 index 0000000000..af6838f5f2 --- /dev/null +++ b/.paket/Paket.Restore.targets @@ -0,0 +1,22 @@ + + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/.paket/paket.exe.config b/.paket/paket.exe.config new file mode 100644 index 0000000000..2fc733f95b --- /dev/null +++ b/.paket/paket.exe.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From d34e60a9cbde97c04b414a7126975e7205ab67b5 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Wed, 2 Nov 2016 15:13:11 -0700 Subject: [PATCH 10/14] Make download loop to terminate in max N=5 iterations --- src/Paket.Core/NuGetV2.fs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs index 077364f122..33f6970168 100644 --- a/src/Paket.Core/NuGetV2.fs +++ b/src/Paket.Core/NuGetV2.fs @@ -892,7 +892,7 @@ let DownloadPackage(root, (source : PackageSource), caches:Cache list, groupName | _ -> getFromCache rest | [] -> false - let rec download authenticated = + let rec download authenticated attempt = async { if not force && targetFile.Exists && targetFile.Length > 0L then verbosefn "%O %O already downloaded." packageName version @@ -979,16 +979,17 @@ let DownloadPackage(root, (source : PackageSource), caches:Cache list, groupName traceWarnfn "Could not download license for %O %O from %s.%s %s" packageName version nugetPackage.LicenseUrl Environment.NewLine exn.Message with | :? System.Net.WebException as exn when + attempt < 5 && exn.Status = WebExceptionStatus.ProtocolError && (match source.Auth |> Option.map toBasicAuth with | Some(Credentials(_)) -> true | _ -> false) - -> do! download false + -> do! download false (attempt + 1) | exn when String.IsNullOrWhiteSpace !downloadUrl -> failwithf "Could not download %O %O.%s %s" packageName version Environment.NewLine exn.Message | exn -> failwithf "Could not download %O %O from %s.%s %s" packageName version !downloadUrl Environment.NewLine exn.Message } async { - do! download true + do! download true 0 let! files = CopyFromCache(root, groupName, targetFile.FullName, licenseFileName, packageName, version, includeVersionInPath, force, detailed) return targetFileName,files } From a6426947b4b488f49382791680336ffde8d54f1f Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 3 Nov 2016 08:40:13 +0100 Subject: [PATCH 11/14] Version constraint was missing on referenced projects packed separately - fixes #1976 --- RELEASE_NOTES.md | 3 ++ src/Paket.Core/PackageMetaData.fs | 47 ++++++++++++++++++------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index dee72a4d02..ec1f60ca21 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 3.26.1 - 03.11.2016 +* BUGFIX: Version constraint was missing on referenced projects packed separately - https://github.com/fsprojects/Paket/issues/1976 + #### 3.26.0 - 31.10.2016 * New Command: paket why - http://theimowski.com/blog/2016/10-30-paket-why-command/index.html * BUGFIX: Do not remove main group - https://github.com/fsprojects/Paket/issues/1950 diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs index 77cb3c8f30..b724c63a00 100644 --- a/src/Paket.Core/PackageMetaData.fs +++ b/src/Paket.Core/PackageMetaData.fs @@ -213,7 +213,6 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp let assemblyfi = FileInfo(assemblyFileName) let name = Path.GetFileNameWithoutExtension assemblyfi.Name - let projectdir = Path.GetDirectoryName(Path.GetFullPath(project.FileName)) let path = Path.Combine(projectDir, project.GetOutputDirectory config platform) Directory.GetFiles(path, name + ".*") @@ -240,8 +239,8 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp let templateWithOutputAndExcludes = match template.Contents with - | CompleteInfo(core, optional) -> optional.ExcludedGroups - | ProjectInfo(core, optional) -> optional.ExcludedGroups + | CompleteInfo(_, optional) -> optional.ExcludedGroups + | ProjectInfo(_, optional) -> optional.ExcludedGroups |> Seq.collect dependenciesFile.GetDependenciesInGroup |> Seq.fold (fun templatefile package -> excludeDependency templatefile package.Key) templateWithOutput @@ -250,7 +249,7 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp deps |> List.map (fun (templateFile, _) -> match templateFile with - | CompleteTemplate(core, opt) -> + | CompleteTemplate(core, _) -> match core.Version with | Some v -> let versionConstraint = if lockDependencies || pinProjectReferences then Specific v else Minimum v @@ -275,7 +274,7 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp | Some f -> let refFile = ReferencesFile.FromFile f refFile.Groups - |> Seq.map (fun kv -> kv.Value.NugetPackages |> List.map (fun p -> Some kv.Key, p)) + |> Seq.map (fun kv -> kv.Value.NugetPackages |> List.map (fun p -> Some kv.Key, p, None)) |> List.concat | None -> [] @@ -284,15 +283,22 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp match proj.FindTemplatesFile() with | Some templateFileName when TemplateFile.IsProjectType templateFileName -> match TemplateFile.Load(templateFileName, lockFile, None, Seq.empty |> Map.ofSeq).Contents with - | CompleteInfo(core, optional) -> + | CompleteInfo(_) -> yield! getPackages proj - | ProjectInfo(core, optional) -> + | ProjectInfo(core, _) -> let name = match core.Id with | Some name -> name | None -> proj.GetAssemblyName().Replace(".dll","").Replace(".exe","") - - yield None, { Name = PackageName name; Settings = InstallSettings.Default } + + let versionConstraint = + match core.Version with + | Some v -> + let vr = if lockDependencies || pinProjectReferences then Specific v else Minimum v + VersionRequirement(vr, getPreReleaseStatus v) + | None -> VersionRequirement.AllReleases + + yield None, { Name = PackageName name; Settings = InstallSettings.Default }, Some versionConstraint | _ -> yield! getPackages proj yield! getPackages project] @@ -301,10 +307,10 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp let distinctRefs = allReferences |> List.distinct let refs = distinctRefs - |> List.filter (fun (group, settings: Paket.PackageInstallSettings) -> + |> List.filter (fun (group, settings: Paket.PackageInstallSettings, _) -> let isDependencyOfAnyOtherDependency packageName = distinctRefs - |> List.exists (fun (group, settings2) -> + |> List.exists (fun (group, settings2,_) -> settings2.Name <> packageName && match group with | Some groupName -> @@ -321,14 +327,14 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp | Some group -> group.Packages |> List.exists (fun p -> p.Name = settings.Name) || isDependencyOfAnyOtherDependency settings.Name |> not) - |> List.sortByDescending (fun (group, settings) -> settings.Name) + |> List.sortByDescending (fun (_, settings,_) -> settings.Name) match refs with | [] -> withDepsAndIncluded | _ -> let deps = refs - |> List.filter (fun (group, np) -> + |> List.filter (fun (group, np, _) -> match group with | None -> true | Some groupName -> @@ -345,7 +351,8 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp not nuspec.IsDevelopmentDependency with | _ -> true) - |> List.map (fun (group, np) -> + |> List.map (fun (group, np, specificVersionRequirement) -> + let specificVersionRequirement = defaultArg specificVersionRequirement VersionRequirement.AllReleases match group with | None -> match version with @@ -361,18 +368,18 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp |> Option.map fst match groupName with - | None -> np.Name,VersionRequirement.AllReleases + | None -> np.Name,specificVersionRequirement | Some groupName -> let group = lockFile.GetGroup groupName let lockedVersion = match Map.tryFind np.Name group.Resolution with | Some resolvedPackage -> VersionRequirement(GreaterThan resolvedPackage.Version, getPreReleaseStatus resolvedPackage.Version) - | None -> VersionRequirement.AllReleases + | None -> specificVersionRequirement np.Name,lockedVersion else - np.Name,VersionRequirement.AllReleases + np.Name,specificVersionRequirement | Some groupName -> let dependencyVersionRequirement = if not lockDependencies then @@ -402,7 +409,7 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp Some(VersionRequirement(Specific resolvedPackage.Version,pre)) else Some(VersionRequirement(VersionRange.Range(VersionRangeBound.Including,resolvedPackage.Version,v,VersionRangeBound.Including),pre)) - | Range(lb,v,v2,ub) -> + | Range(_,_,v2,ub) -> Some(VersionRequirement(VersionRange.Range(VersionRangeBound.Including,resolvedPackage.Version,v2,ub),pre)) | _ -> Some(VersionRequirement(Minimum resolvedPackage.Version,pre)) | None -> Some requirement.VersionRequirement @@ -430,4 +437,6 @@ let findDependencies (dependenciesFile : DependenciesFile) config platform (temp | Some installed -> installed | None -> failwithf "No package with id '%O' installed in group %O." np.Name groupName np.Name, dep) - deps |> List.fold addDependency withDepsAndIncluded + + deps + |> List.fold addDependency withDepsAndIncluded From 06ddf1cb1132620073a1ffa7776d62fbf5ea7363 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 3 Nov 2016 08:41:01 +0100 Subject: [PATCH 12/14] RELEASE_NOTES --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ec1f60ca21..8b5889da6b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,6 @@ #### 3.26.1 - 03.11.2016 * BUGFIX: Version constraint was missing on referenced projects packed separately - https://github.com/fsprojects/Paket/issues/1976 +* BUGFIX: Make download loop to terminate in max N=5 iterations - https://github.com/fsprojects/Paket/pull/1999 #### 3.26.0 - 31.10.2016 * New Command: paket why - http://theimowski.com/blog/2016/10-30-paket-why-command/index.html From 5272e512f1d5cddf256dda83907479caefa17e67 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 3 Nov 2016 08:52:06 +0100 Subject: [PATCH 13/14] use old dotnet for now --- build.fsx | 8 ++++++-- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 10 +++++----- src/Paket.Core/AssemblyInfo.fs | 10 +++++----- src/Paket.PowerShell/AssemblyInfo.fs | 10 +++++----- src/Paket/AssemblyInfo.fs | 10 +++++----- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/build.fsx b/build.fsx index 337a4c375d..e08e80bc6c 100644 --- a/build.fsx +++ b/build.fsx @@ -62,7 +62,7 @@ let gitName = "Paket" let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" -let dotnetcliVersion = "1.0.0-preview3-003884" +let dotnetcliVersion = "1.0.0-preview3-004031" let dotnetPath = DirectoryInfo "./dotnetcore" // -------------------------------------------------------------------------------------- @@ -122,7 +122,11 @@ Target "AssemblyInfo" (fun _ -> csProjs |> Seq.iter genCSAssemblyInfo ) -let dotnetExePath = if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName +let dotnetExePath = + // TODO: if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName + match tryFindFileOnPath (if isWindows then "dotnet.exe" else "dotnet") with + | Some p -> p + | None -> "" Target "InstallDotNetCore" (fun _ -> let correctVersionInstalled = diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 40a1a34ada..9c91f4ab18 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -4,12 +4,12 @@ [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")] [assembly: AssemblyProductAttribute("Paket")] [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] -[assembly: AssemblyVersionAttribute("3.26.0")] -[assembly: AssemblyFileVersionAttribute("3.26.0")] -[assembly: AssemblyInformationalVersionAttribute("3.26.0")] +[assembly: AssemblyVersionAttribute("3.26.1")] +[assembly: AssemblyFileVersionAttribute("3.26.1")] +[assembly: AssemblyInformationalVersionAttribute("3.26.1")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "3.26.0"; - internal const string InformationalVersion = "3.26.0"; + internal const string Version = "3.26.1"; + internal const string InformationalVersion = "3.26.1"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index a3db4d6efa..d1736160e3 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.26.0" - let [] InformationalVersion = "3.26.0" + let [] Version = "3.26.1" + let [] InformationalVersion = "3.26.1" diff --git a/src/Paket.PowerShell/AssemblyInfo.fs b/src/Paket.PowerShell/AssemblyInfo.fs index 72b6401976..7b3bffe247 100644 --- a/src/Paket.PowerShell/AssemblyInfo.fs +++ b/src/Paket.PowerShell/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.26.0" - let [] InformationalVersion = "3.26.0" + let [] Version = "3.26.1" + let [] InformationalVersion = "3.26.1" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index a3a33c2078..6791d12d3b 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -5,11 +5,11 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.26.0" - let [] InformationalVersion = "3.26.0" + let [] Version = "3.26.1" + let [] InformationalVersion = "3.26.1" From a29dc368ce5c9239f7bb5d92cf5c3d5b0f03bf49 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 3 Nov 2016 08:58:37 +0100 Subject: [PATCH 14/14] Bump version to 3.26.1 --- build.fsx | 7 ++----- src/Paket.Core/Paket.Core/project.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.fsx b/build.fsx index e08e80bc6c..80e1b9ce72 100644 --- a/build.fsx +++ b/build.fsx @@ -63,6 +63,7 @@ let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/fsprojects" let dotnetcliVersion = "1.0.0-preview3-004031" + let dotnetPath = DirectoryInfo "./dotnetcore" // -------------------------------------------------------------------------------------- @@ -122,11 +123,7 @@ Target "AssemblyInfo" (fun _ -> csProjs |> Seq.iter genCSAssemblyInfo ) -let dotnetExePath = - // TODO: if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName - match tryFindFileOnPath (if isWindows then "dotnet.exe" else "dotnet") with - | Some p -> p - | None -> "" +let dotnetExePath = if isWindows then "dotnetcore/dotnet.exe" else "dotnetcore/dotnet" |> FullName Target "InstallDotNetCore" (fun _ -> let correctVersionInstalled = diff --git a/src/Paket.Core/Paket.Core/project.json b/src/Paket.Core/Paket.Core/project.json index 3827dcb04e..c894694684 100644 --- a/src/Paket.Core/Paket.Core/project.json +++ b/src/Paket.Core/Paket.Core/project.json @@ -1,5 +1,5 @@ { - "version": "3.26.0", + "version": "3.26.1", "buildOptions": { "debugType": "portable", "compilerName": "fsc",