Skip to content

Commit e3073fd

Browse files
committed
Merge branch 'bugfix'
# Conflicts: # RELEASE_NOTES.md # src/LockFileComparer/AssemblyInfo.fs # src/Paket.Bootstrapper/Properties/AssemblyInfo.cs # src/Paket.Core/AssemblyInfo.fs # src/Paket/AssemblyInfo.fs
2 parents 5ea1588 + 82dc14c commit e3073fd

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

RELEASE_NOTES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Support for .net5.0
55
* FSharp.DependencyManager.Paket FSI extension for #r "paket: ..."
66

7-
#### 5.253.0 - 2020-11-12
8-
* .NET5 OS dependent frameworks - https://github.com/fsprojects/Paket/pull/3934
7+
#### 5.255.0 - 2020-11-12
8+
frameworks - https://github.com/fsprojects/Paket/pull/3934 https://github.com/fsprojects/Paket/pull/3938
99

1010
#### 5.252.0 - 2020-11-08
1111
* Fix removal of duplicate nodes

integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ let ``#140 windsor should resolve framework dependent dependencies``() =
1818
|> getExplicitRestriction
1919
|> shouldEqual (FrameworkRestriction.Between(DotNetFramework(FrameworkVersion.V3_5), DotNetFramework(FrameworkVersion.V4)))
2020

21-
[<Test; Ignore "slow test">]
22-
let ``#1182 framework restrictions overwrite each other``() =
23-
let cleanup, lockFile = update "i001182-framework-restrictions"
24-
use __ = cleanup
25-
let lockFile = lockFile.ToString()
26-
lockFile.Contains("Microsoft.Data.OData (>= 5.6.2)") |> shouldEqual true
27-
lockFile.Contains("framework: winv4.5") |> shouldEqual false
28-
2921
[<Test>]
3022
#if NO_UNIT_PLATFORMATTRIBUTE
3123
[<Ignore "PlatformAttribute not supported by netstandard NUnit">]

0 commit comments

Comments
 (0)