diff --git a/build.fsx b/build.fsx
index dd0539fc2d..aa163f9118 100644
--- a/build.fsx
+++ b/build.fsx
@@ -72,10 +72,10 @@ let mutable dotnetExePath = "dotnet"
let buildDir = "bin"
let buildDirNet461 = buildDir @@ "net461"
-let buildDirNetCore = buildDir @@ "netcoreapp2.1"
+let buildDirNetCore = buildDir @@ "netcoreapp3.1"
let buildDirBootstrapper = "bin_bootstrapper"
let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
-let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
+let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp3.1"
let tempDir = "temp"
let buildMergedDir = buildDir @@ "merged"
let paketFile = buildMergedDir @@ "paket.exe"
@@ -222,7 +222,7 @@ Target "Publish" (fun _ ->
DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket"
- Framework = "netcoreapp2.1"
+ Framework = "netcoreapp3.1"
Output = FullName (currentDirectory > buildDirNetCore)
ToolPath = dotnetExePath
})
@@ -237,7 +237,7 @@ Target "Publish" (fun _ ->
DotNetCli.Publish (fun c ->
{ c with
Project = "src/Paket.Bootstrapper"
- Framework = "netcoreapp2.1"
+ Framework = "netcoreapp3.1"
Output = FullName (currentDirectory > buildDirBootstrapperNetCore)
ToolPath = dotnetExePath
})
diff --git a/integrationtests/Paket.IntegrationTests/App.config b/integrationtests/Paket.IntegrationTests/App.config
index f32aca4a01..a8db2fb656 100644
--- a/integrationtests/Paket.IntegrationTests/App.config
+++ b/integrationtests/Paket.IntegrationTests/App.config
@@ -7,7 +7,7 @@
True
-
+
True
@@ -29,26 +29,6 @@
-
- True
-
-
-
-
- True
-
-
-
-
- True
-
-
-
-
- True
-
-
-
True
@@ -59,21 +39,6 @@
-
- True
-
-
-
-
- True
-
-
-
-
- True
-
-
-
True
diff --git a/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs b/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs
index 89c405a002..77467eac5f 100644
--- a/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs
+++ b/integrationtests/Paket.IntegrationTests/AutocompleteSpecs.fs
@@ -1,31 +1,27 @@
module Paket.IntegrationTests.AutocompleteSpecs
open Fake
-open System
open NUnit.Framework
open FsUnit
-open System
open System.IO
-open System.Diagnostics
-open System.IO.Compression
open Paket
open Paket.PackageSources
[]
-let ``#1298 should autocomplete for dapper on local feed``() =
+let ``#1298 should autocomplete for dapper on local feed``() =
let result = Dependencies.FindPackagesByName([PackageSource.LocalNuGet(Path.Combine(originalScenarioPath "i001219-props-files", "nuget_repo"),None)],"dapp")
result |> shouldContain "Dapper"
result |> shouldNotContain "dapper"
-
+
[]
-let ``#1298 should autocomplete for fake on local feed``() =
+let ``#1298 should autocomplete for fake on local feed``() =
let result = Dependencies.FindPackagesByName([PackageSource.LocalNuGet(Path.Combine(originalScenarioPath "i001219-props-files", "nuget_repo"),None)],"fake")
result |> shouldContain "FAKE.Core"
result |> shouldNotContain "Dapper"
result |> shouldNotContain "dapper"
[]
-let ``#1298 should autocomplete versions for FAKE on NuGet3``() =
+let ``#1298 should autocomplete versions for FAKE on NuGet3``() =
let result = Dependencies.FindPackageVersions("",[PackageSource.NuGetV3Source Constants.DefaultNuGetV3Stream],"fake")
result |> shouldContain "2.6.15"
result |> shouldContain "4.14.9"
@@ -33,14 +29,6 @@ let ``#1298 should autocomplete versions for FAKE on NuGet3``() =
result |> shouldNotContain "FAKE.Core"
[]
-[]
-let ``#1298 should autocomplete versions for msu on local teamcity``() =
- let result = Dependencies.FindPackageVersions("",[PackageSource.NuGetV2Source "http://teamcity/guestAuth/app/nuget/v1/FeedService.svc/"],"msu.Addins")
- result |> shouldNotContain "msu.Addins"
- result |> shouldContain "03.03.7"
-
-[]
-let ``#1298 should autocomplete versions for dapper on local feed``() =
+let ``#1298 should autocomplete versions for dapper on local feed``() =
let result = Dependencies.FindPackageVersions("",[PackageSource.LocalNuGet(DirectoryInfo(Path.Combine(originalScenarioPath "i001219-props-files", "nuget_repo")).FullName,None)],"Dapper")
result |> shouldEqual [|"1.42.0"; "1.40"|]
-
\ No newline at end of file
diff --git a/integrationtests/Paket.IntegrationTests/BindingRedirect.fs b/integrationtests/Paket.IntegrationTests/BindingRedirect.fs
index 4897e3329a..5af073476c 100644
--- a/integrationtests/Paket.IntegrationTests/BindingRedirect.fs
+++ b/integrationtests/Paket.IntegrationTests/BindingRedirect.fs
@@ -8,7 +8,7 @@ open System.Text.RegularExpressions
open Paket
[]
-let ``install should redirect required assemblies only``() =
+let ``install should redirect required assemblies only``() =
use __ = paket "install --redirects --createnewbindingfiles" "i001187-binding-redirect" |> fst
let path = Path.Combine(scenarioTempPath "i001187-binding-redirect")
@@ -86,9 +86,9 @@ let ``#2408 should report wrong app.config parsing``() =
failwith "paket should fail"
with
| exn when exn.Message.Contains("Project1") && exn.Message.Contains("app.config") -> ()
-
+
[]
-let ``#1218 install should replace paket's binding redirects with required only``() =
+let ``#1218 install should replace paket's binding redirects with required only``() =
use __ = paket "install --redirects --createnewbindingfiles" "i001218-binding-redirect" |> fst
let path = Path.Combine(scenarioTempPath "i001218-binding-redirect")
@@ -166,25 +166,7 @@ let ``#1218 install should replace paket's binding redirects with required only`
[]
-let ``#1270 force redirects``() =
- use __ = paket "install --createnewbindingfiles" "i001270-force-redirects" |> fst
- let path = Path.Combine(scenarioTempPath "i001270-force-redirects")
- let configPath = Path.Combine(path, "MyClassLibrary", "MyClassLibrary", "app.config")
-
- let ``FSharp.Core`` = """"""
- let AlphaFS = """"""
- let ``Newtonsoft.Json`` = """"""
- let ``Newtonsoft.Json.Schema`` = """"""
-
- let config = File.ReadAllText(configPath)
-
- config |> shouldContainText ``FSharp.Core``
- config.Contains AlphaFS |> shouldEqual false
- config.Contains ``Newtonsoft.Json`` |> shouldEqual false
- config.Contains ``Newtonsoft.Json.Schema`` |> shouldEqual false
-
-[]
-let ``#1270 redirects from references``() =
+let ``#1270 redirects from references``() =
use __ = paket "install --createnewbindingfiles" "i001270-force-redirects" |> fst
let path = Path.Combine(scenarioTempPath "i001270-force-redirects")
let configPath = Path.Combine(path, "MyClassLibrary", "MyClassLibrary2", "app.config")
@@ -202,7 +184,7 @@ let ``#1270 redirects from references``() =
config.Contains ``Newtonsoft.Json`` |> shouldEqual false
[]
-let ``#1574 redirects GAC``() =
+let ``#1574 redirects GAC``() =
use __ = paket "install --clean-redirects" "i001574-redirect-gac" |> fst
let path = Path.Combine(scenarioTempPath "i001574-redirect-gac")
let configPath = Path.Combine(path, "BindingRedirectPaketBug", "App.config")
@@ -220,12 +202,12 @@ let ``#1621 generates binding redirect when references project with another targ
use __ = install scenario |> fst
let ``NUnit`` = """"""
let ``NUnit correct version`` = "newVersion=\"3.0.5813.39031\""
-
+
let path = Path.Combine(scenarioTempPath scenario, "projectB")
let configPath = Path.Combine(path, "app.config")
let config = File.ReadAllText(configPath) |> normalizeLineEndings
-
+
config |> shouldContainText ``NUnit``
config |> shouldContainText ``NUnit correct version``
@@ -233,13 +215,11 @@ let ``#1621 generates binding redirect when references project with another targ
let ``#1783 generates binding redirect when assembly with different version of main group``() =
let scenario = "i001783-different-versions"
use __ = install scenario |> fst
- let ``FSharp.Core`` = """"""
let ``Newtonsoft.Json`` = """"""
-
+
let path = Path.Combine(scenarioTempPath scenario, "projectB")
let configPath = Path.Combine(path, "app.config")
let config = File.ReadAllText(configPath) |> normalizeLineEndings
-
- config |> shouldContainText ``FSharp.Core``
+
config |> shouldContainText ``Newtonsoft.Json``
\ No newline at end of file
diff --git a/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs b/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs
index b76156ca8c..01a0edeb71 100644
--- a/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs
+++ b/integrationtests/Paket.IntegrationTests/FrameworkRestrictionsSpecs.fs
@@ -18,13 +18,6 @@ let ``#140 windsor should resolve framework dependent dependencies``() =
|> getExplicitRestriction
|> shouldEqual (FrameworkRestriction.Between(DotNetFramework(FrameworkVersion.V3_5), DotNetFramework(FrameworkVersion.V4)))
-[]
-let ``#1182 framework restrictions overwrite each other``() =
- let cleanup, lockFile = update "i001182-framework-restrictions"
- use __ = cleanup
- let lockFile = lockFile.ToString()
- lockFile.Contains("Microsoft.Data.OData (>= 5.6.2)") |> shouldEqual true
- lockFile.Contains("framework: winv4.5") |> shouldEqual false
[]
#if NO_UNIT_PLATFORMATTRIBUTE
@@ -33,34 +26,34 @@ let ``#1182 framework restrictions overwrite each other``() =
[] // PATH TOO LONG on Windows...
[] // failure on assert
#endif
-let ``#1190 paket add nuget should handle transitive dependencies``() =
+let ``#1190 paket add nuget should handle transitive dependencies``() =
use __ = paket "add nuget xunit version 2.1.0" "i001190-transitive-dependencies-with-restr" |> fst
let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001190-transitive-dependencies-with-restr","paket.lock"))
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "xunit.abstractions"].Settings.FrameworkRestrictions
|> getExplicitRestriction
|> fun res -> res.ToString() |> shouldEqual "|| (>= dnx451) (>= dnxcore50) (>= portable-net45+win8+wp8+wpa81)"
-
+
[]
-let ``#1190 paket add nuget should handle transitive dependencies with restrictions``() =
+let ``#1190 paket add nuget should handle transitive dependencies with restrictions``() =
use __ = paket "add nuget xunit version 2.1.0" "i001190-transitive-deps" |> fst
-
+
let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001190-transitive-deps","paket.lock"))
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "xunit.abstractions"].Settings.FrameworkRestrictions
|> getExplicitRestriction
|> shouldEqual FrameworkRestriction.NoRestriction
-
-
+
+
[]
-let ``#1197 framework dependencies are not restricting each other``() =
+let ``#1197 framework dependencies are not restricting each other``() =
let cleanup, lockFile = update "i001197-too-strict-frameworks"
use __ = cleanup
-
+
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "log4net"].Version
|> shouldBeGreaterThan (SemVer.Parse "0")
-
+
[]
-let ``#1213 framework dependencies propagate``() =
+let ``#1213 framework dependencies propagate``() =
let cleanup, lockFile = update "i001213-framework-propagation"
use __ = cleanup
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Newtonsoft.Json"].Settings.FrameworkRestrictions
@@ -68,7 +61,7 @@ let ``#1213 framework dependencies propagate``() =
|> shouldEqual FrameworkRestriction.NoRestriction
[]
-let ``#1215 framework dependencies propagate``() =
+let ``#1215 framework dependencies propagate``() =
let cleanup, lockFile = update "i001215-framework-propagation-no-restriction"
use __ = cleanup
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Microsoft.Bcl.Async"].Settings.FrameworkRestrictions
@@ -76,7 +69,7 @@ let ``#1215 framework dependencies propagate``() =
|> shouldEqual FrameworkRestriction.NoRestriction
[]
-let ``#1232 framework dependencies propagate``() =
+let ``#1232 framework dependencies propagate``() =
let cleanup, lockFile = update "i001232-sql-lite"
use __ = cleanup
let restriction =
@@ -90,7 +83,7 @@ let ``#1232 framework dependencies propagate``() =
|> shouldEqual true
[]
-let ``#1494 detect platform 5.0``() =
+let ``#1494 detect platform 5.0``() =
use __ = update "i001494-download" |> fst
-
+
()
\ No newline at end of file
diff --git a/integrationtests/Paket.IntegrationTests/FsiExtension.fs b/integrationtests/Paket.IntegrationTests/FsiExtension.fs
index ee2e783d92..f74097fec1 100644
--- a/integrationtests/Paket.IntegrationTests/FsiExtension.fs
+++ b/integrationtests/Paket.IntegrationTests/FsiExtension.fs
@@ -13,7 +13,7 @@ module FsiExtension =
"Release"
#endif
- let pathToExtension = Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "src", "FSharp.DependencyManager.Paket", "bin", configuration, "netstandard2.0")
+ let pathToExtension = Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "src", "FSharp.DependencyManager.Paket", "bin", configuration, "netstandard2.1")
let extensionFileName = "FSharp.DependencyManager.Paket.dll"
[]
@@ -25,23 +25,29 @@ module FsiExtension =
printfn "binding redirect for FSharp.Core..."
typedefof