Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add .NET Standard 2.1 support #3530

Merged
merged 29 commits into from
Apr 2, 2019
Merged

Add .NET Standard 2.1 support #3530

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
470f66a
Add .NET Standard 2.1 support
forki Mar 25, 2019
8648231
Remove DNXCore monikers and add .NET 4.8
forki Mar 25, 2019
655707d
remove that .NET 4.8 -> .NET Standard 2.1 arrow
forki Mar 25, 2019
a71ea67
Make test project compilable
forki Mar 25, 2019
742f550
Add the .NET 4.8 cases
forki Mar 25, 2019
7809c64
Handle .NET Standard 2.1 cases
forki Mar 25, 2019
e7be471
remove flaky test
forki Mar 25, 2019
ed038bc
Remove flaky tests
forki Mar 25, 2019
f5689e0
Remove flaky test
forki Mar 25, 2019
0a23d45
Remove flaky test
forki Mar 25, 2019
216015f
fix build
forki Mar 25, 2019
8b4fbca
Remove flaky tests
forki Mar 26, 2019
dc84446
Allow to parse DNX
forki Mar 26, 2019
377994b
Revert "remove flaky test"
forki Mar 26, 2019
7b939eb
DotNetCore is not PCL
forki Mar 26, 2019
f66564a
Remove flaky test
forki Mar 26, 2019
5e57ef4
Remove flaky test
forki Mar 26, 2019
3bbcb3f
Remove super slow test
forki Mar 26, 2019
38918f0
Test no longer needed
forki Mar 26, 2019
52b21d6
Tests no longer needed
forki Mar 26, 2019
b68a351
remove flaky test
forki Mar 26, 2019
9c9b032
Fody is missing
forki Mar 27, 2019
3635394
Ignore if a symlink is already there
forki Mar 27, 2019
65c0703
fix test on mono
forki Mar 28, 2019
2e35f92
remove flaky test
forki Mar 28, 2019
edfd7a4
Remove flaky tests
forki Mar 28, 2019
3079ff4
Test does not work on linux
forki Apr 1, 2019
0ef5d93
Remove flaky test
forki Apr 1, 2019
b58d5cd
Run on newer travis
forki Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/Paket.Core/Versioning/FrameworkHandling.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type DotNetStandardVersion =
| V1_5
| V1_6
| V2_0
| V2_1
override this.ToString() =
match this with
| V1_0 -> "v1.0"
Expand All @@ -28,6 +29,7 @@ type DotNetStandardVersion =
| V1_5 -> "v1.5"
| V1_6 -> "v1.6"
| V2_0 -> "v2.0"
| V2_1 -> "v2.1"
member this.ShortString() =
match this with
| DotNetStandardVersion.V1_0 -> "1.0"
Expand All @@ -38,17 +40,21 @@ type DotNetStandardVersion =
| DotNetStandardVersion.V1_5 -> "1.5"
| DotNetStandardVersion.V1_6 -> "1.6"
| DotNetStandardVersion.V2_0 -> "2.0"
| DotNetStandardVersion.V2_1 -> "2.1"
static member TryParse s =
match s with
| "" | "1" -> Some(DotNetStandardVersion.V1_0)
| ""
| "1" -> Some(DotNetStandardVersion.V1_0)
| "1.1" -> Some(DotNetStandardVersion.V1_1)
| "1.2" -> Some(DotNetStandardVersion.V1_2)
| "1.3" -> Some(DotNetStandardVersion.V1_3)
| "1.4" -> Some(DotNetStandardVersion.V1_4)
| "1.5" -> Some(DotNetStandardVersion.V1_5)
| "1.6" -> Some(DotNetStandardVersion.V1_6)
| "2" -> Some(DotNetStandardVersion.V2_0)
| "2" -> Some(DotNetStandardVersion.V2_0)
| "2.1" -> Some(DotNetStandardVersion.V2_1)
| _ -> None

[<RequireQualifiedAccess>]
/// The Framework version.
// Each time a new version is added NuGetPackageCache.CurrentCacheVersion should be bumped.
Expand Down Expand Up @@ -634,12 +640,13 @@ type FrameworkIdentifier =
| DotNetStandard DotNetStandardVersion.V1_5 -> [ DotNetStandard DotNetStandardVersion.V1_4 ]
| DotNetStandard DotNetStandardVersion.V1_6 -> [ DotNetStandard DotNetStandardVersion.V1_5 ]
| DotNetStandard DotNetStandardVersion.V2_0 -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
| DotNetStandard DotNetStandardVersion.V2_1 -> [ DotNetStandard DotNetStandardVersion.V2_0 ]
| DotNetCoreApp DotNetCoreAppVersion.V1_0 -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
| DotNetCoreApp DotNetCoreAppVersion.V1_1 -> [ DotNetCoreApp DotNetCoreAppVersion.V1_0 ]
| DotNetCoreApp DotNetCoreAppVersion.V2_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V1_1; DotNetStandard DotNetStandardVersion.V2_0 ]
| DotNetCoreApp DotNetCoreAppVersion.V2_1 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_0 ]
| DotNetCoreApp DotNetCoreAppVersion.V2_2 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_1 ]
| DotNetCoreApp DotNetCoreAppVersion.V3_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_2 ]
| DotNetCoreApp DotNetCoreAppVersion.V3_0 -> [ DotNetCoreApp DotNetCoreAppVersion.V2_2; DotNetStandard DotNetStandardVersion.V2_1 ]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cartermp @terrajobst is this correct?
.NET Core 3.0 is compatible to .NET Standard 2.1?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and what about ..NET 4.8? Is that supposed to be compatible with .NET Standard 2.1?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from what I read .NET will not be compatible with the 2.1 "standard"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok so I will remove that .NET 4.8 -> .NET Standard 2.1 arrow for now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.NET Standard 2.1 is only compatible with .NET Core 3.0 at the moment; no plans for compat with .NWT Framework. It will also eventually be supported by Mono.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will also eventually be supported by Mono.

This will be funny when that happens

| DotNetUnity DotNetUnityVersion.V3_5_Full -> [ ]
| DotNetUnity DotNetUnityVersion.V3_5_Subset -> [ ]
| DotNetUnity DotNetUnityVersion.V3_5_Micro -> [ ]
Expand Down Expand Up @@ -1145,6 +1152,7 @@ module KnownTargetProfiles =
DotNetStandardVersion.V1_5
DotNetStandardVersion.V1_6
DotNetStandardVersion.V2_0
DotNetStandardVersion.V2_1
]

let DotNetStandardProfiles =
Expand Down