diff --git a/global.json b/global.json index b82d24d6c8..e955a599a8 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.101" + "version": "3.1.200" } } diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj index ad953616d9..d56c57d73f 100644 --- a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj +++ b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.0 + net461;netcoreapp3.1 true PAKET_NETCORE;NO_UNIT_PLATFORMATTRIBUTE;TESTSUITE_KNOWN_FAILURE_DOTNETCORE_3005;FAKE_NETSTANDARD_API;@(DefineConstants) diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs index 9ef77278e6..a4f61508e4 100644 --- a/src/Paket.Core/Versioning/FrameworkHandling.fs +++ b/src/Paket.Core/Versioning/FrameworkHandling.fs @@ -202,6 +202,7 @@ type DotNetCoreAppVersion = | V2_2 | V3_0 | V3_1 + | V5_0 member private this.NumKey = match this with @@ -212,6 +213,7 @@ type DotNetCoreAppVersion = | V2_2 -> 4 | V3_0 -> 5 | V3_1 -> 6 + | V5_0 -> 7 static member private FromNum num = match num with @@ -222,6 +224,7 @@ type DotNetCoreAppVersion = | 4 -> V2_2 | 5 -> V3_0 | 6 -> V3_1 + | 7 -> V5_0 | _ -> failwithf "'%i' has no corresponding framework version" num static member (<->) (lower:DotNetCoreAppVersion,upper:DotNetCoreAppVersion) = @@ -240,6 +243,7 @@ type DotNetCoreAppVersion = | V2_2 -> "v2.2" | V3_0 -> "v3.0" | V3_1 -> "v3.1" + | V5_0 -> "v5.0" member this.ShortString() = match this with @@ -250,6 +254,7 @@ type DotNetCoreAppVersion = | DotNetCoreAppVersion.V2_2 -> "2.2" | DotNetCoreAppVersion.V3_0 -> "3.0" | DotNetCoreAppVersion.V3_1 -> "3.1" + | DotNetCoreAppVersion.V5_0 -> "5.0" static member TryParse s = match s with @@ -260,6 +265,7 @@ type DotNetCoreAppVersion = | "2.2" -> Some (DotNetCoreAppVersion.V2_2) | "3" -> Some (DotNetCoreAppVersion.V3_0) | "3.1" -> Some (DotNetCoreAppVersion.V3_1) + | "5.0" -> Some (DotNetCoreAppVersion.V5_0) | _ -> None [] @@ -650,6 +656,7 @@ type FrameworkIdentifier = | DotNetCoreApp DotNetCoreAppVersion.V2_2 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_1 ] | DotNetCoreApp DotNetCoreAppVersion.V3_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_2; DotNetStandard DotNetStandardVersion.V2_1 ] | DotNetCoreApp DotNetCoreAppVersion.V3_1 -> [ DotNetCoreApp DotNetCoreAppVersion.V3_0 ] + | DotNetCoreApp DotNetCoreAppVersion.V5_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V3_1 ] | DotNetUnity DotNetUnityVersion.V3_5_Full -> [ ] | DotNetUnity DotNetUnityVersion.V3_5_Subset -> [ ] | DotNetUnity DotNetUnityVersion.V3_5_Micro -> [ ] @@ -1176,6 +1183,7 @@ module KnownTargetProfiles = DotNetCoreAppVersion.V2_2 DotNetCoreAppVersion.V3_0 DotNetCoreAppVersion.V3_1 + DotNetCoreAppVersion.V5_0 ] let DotNetUnityVersions = [ diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs index b5cca5d9cc..23cbb5a82b 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs @@ -33,7 +33,7 @@ let expected = """ - + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs index fcce70e1d5..32f45a2b92 100644 --- a/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs +++ b/tests/Paket.Tests/InstallModel/Xml/System.Security.Cryptography.Algorithms.fs @@ -54,7 +54,7 @@ let expected = """ - + ..\..\..\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs index a68e248c99..b9a0524c93 100644 --- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs +++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs @@ -20,7 +20,7 @@ let expectedPropertyDefinitionNodes = """ <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + <__paket__xunit_runner_visualstudio_props>portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index e9c1f6b251..2783c9836c 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -2,7 +2,7 @@ Library - net461;netcoreapp3.0 + net461;netcoreapp3.1 true false