Skip to content

Commit 2ad5227

Browse files
author
Paul Saunders
committed
Merge remote-tracking branch 'upstream/master' into symbols-source
2 parents 5470188 + 4241c4b commit 2ad5227

9 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎RELEASE_NOTES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
#### 2.42.6 - 13.01.2016
2+
* BUGFIX: Fix path issue
3+
4+
#### 2.42.5 - 13.01.2016
5+
* USABILITY: Fail if credentials are invalid - https://github.com/fsprojects/Paket/issues/1382
6+
17
#### 2.42.4 - 12.01.2016
28
* BUGFIX: $(SolutionDir) in ProjectReference include attribute will be parsed - https://github.com/fsprojects/Paket/issues/1377
39

‎src/Paket.Bootstrapper/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
[assembly: AssemblyTitleAttribute("Paket.Bootstrapper")]
55
[assembly: AssemblyProductAttribute("Paket")]
66
[assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")]
7-
[assembly: AssemblyVersionAttribute("2.42.4")]
8-
[assembly: AssemblyFileVersionAttribute("2.42.4")]
9-
[assembly: AssemblyInformationalVersionAttribute("2.42.4")]
7+
[assembly: AssemblyVersionAttribute("2.42.6")]
8+
[assembly: AssemblyFileVersionAttribute("2.42.6")]
9+
[assembly: AssemblyInformationalVersionAttribute("2.42.6")]
1010
namespace System {
1111
internal static class AssemblyVersionInformation {
12-
internal const string Version = "2.42.4";
12+
internal const string Version = "2.42.6";
1313
}
1414
}

‎src/Paket.Core/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ open System.Reflection
55
[<assembly: AssemblyProductAttribute("Paket")>]
66
[<assembly: AssemblyCompanyAttribute("Paket team")>]
77
[<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
8-
[<assembly: AssemblyVersionAttribute("2.42.4")>]
9-
[<assembly: AssemblyFileVersionAttribute("2.42.4")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("2.42.4")>]
8+
[<assembly: AssemblyVersionAttribute("2.42.6")>]
9+
[<assembly: AssemblyFileVersionAttribute("2.42.6")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("2.42.6")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
14-
let [<Literal>] Version = "2.42.4"
14+
let [<Literal>] Version = "2.42.6"

‎src/Paket.Core/ConfigFile.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ let GetAuthenticationForUrl (source : string) url =
156156
if checkCredentials (url, Some auth) then
157157
Some auth
158158
else
159-
traceWarnfn "credentials for %s source are invalid" source
159+
failwithf "Credentials from authentication store for %s are invalid" source
160160
None
161161
| _ -> None
162162

‎src/Paket.Core/ProjectFile.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,8 @@ type ProjectFile =
902902
if Path.IsPathRooted path then Path.GetFullPath path else
903903
let di = FileInfo(normalizePath this.FileName).Directory
904904
Path.Combine(di.FullName,path) |> Path.GetFullPath
905-
RelativePath = path
905+
906+
RelativePath = path.Replace("/","\\")
906907
Name = forceGetInnerText node "Name"
907908
GUID = forceGetInnerText node "Project" |> Guid.Parse }]
908909

‎src/Paket.PowerShell/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ open System.Reflection
55
[<assembly: AssemblyProductAttribute("Paket")>]
66
[<assembly: AssemblyCompanyAttribute("Paket team")>]
77
[<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
8-
[<assembly: AssemblyVersionAttribute("2.42.4")>]
9-
[<assembly: AssemblyFileVersionAttribute("2.42.4")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("2.42.4")>]
8+
[<assembly: AssemblyVersionAttribute("2.42.6")>]
9+
[<assembly: AssemblyFileVersionAttribute("2.42.6")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("2.42.6")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
14-
let [<Literal>] Version = "2.42.4"
14+
let [<Literal>] Version = "2.42.6"

‎src/Paket/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ open System.Reflection
55
[<assembly: AssemblyProductAttribute("Paket")>]
66
[<assembly: AssemblyCompanyAttribute("Paket team")>]
77
[<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
8-
[<assembly: AssemblyVersionAttribute("2.42.4")>]
9-
[<assembly: AssemblyFileVersionAttribute("2.42.4")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("2.42.4")>]
8+
[<assembly: AssemblyVersionAttribute("2.42.6")>]
9+
[<assembly: AssemblyFileVersionAttribute("2.42.6")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("2.42.6")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
14-
let [<Literal>] Version = "2.42.4"
14+
let [<Literal>] Version = "2.42.6"

‎src/Paket/Commands.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ with
113113

114114
type FindRefsArgs =
115115
| [<CustomCommandLine("group")>] Group of string
116-
| [<Rest>][<CustomCommandLine("nuget")>][<Mandatory>] Packages of string
116+
| [<Rest>][<CustomCommandLine("nuget")>][<Mandatory>] Packages of string
117117
with
118118
interface IArgParserTemplate with
119119
member this.Usage =

‎src/Paket/Paket.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<StartArguments>pack output D:\code\paketbug\output</StartArguments>
3939
<StartArguments>install</StartArguments>
4040
<StartArguments>restore</StartArguments>
41-
<StartArguments>install --hard -v</StartArguments>
41+
<StartArguments>restore</StartArguments>
4242
<StartAction>Project</StartAction>
4343
<StartProgram>paket.exe</StartProgram>
4444
<StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
@@ -48,7 +48,7 @@
4848
<StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
4949
<StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001270-net461\temp</StartWorkingDirectory>
5050
<StartWorkingDirectory>C:\code\restore</StartWorkingDirectory>
51-
<StartWorkingDirectory>C:\Work\ManagedCodeGit\CrossPoint.Database</StartWorkingDirectory>
51+
<StartWorkingDirectory>D:\code\paket-repro</StartWorkingDirectory>
5252
</PropertyGroup>
5353
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5454
<DebugType>pdbonly</DebugType>

0 commit comments

Comments
 (0)