Skip to content

Add support for UAP v10.0.10240 #3875

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

Merged
forki merged 1 commit into from
Nov 17, 2020
Merged

Add support for UAP v10.0.10240 #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Add support for UAP v10.0.10240
  • Loading branch information
@BillHally
BillHally committed Jul 1, 2020
commit 946cf4304966c189992a3b4f418150f78445a985
2 changes: 1 addition & 1 deletion src/Paket.Core/Dependencies/NuGetCache.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ type NuGetPackageCache =
Version: string
CacheVersion: string }

static member CurrentCacheVersion = "5.224"
static member CurrentCacheVersion = "5.225"

member this.WithDependencies (dependencies : (PackageName * VersionRequirement * FrameworkRestrictions) list) =
{ this with
Expand Down
11 changes: 9 additions & 2 deletions src/Paket.Core/Versioning/FrameworkHandling.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ type FrameworkVersion =
// Each time a new version is added NuGetPackageCache.CurrentCacheVersion should be bumped.
type UAPVersion =
| V10
| V10_0_10240
| V10_0_14393
| V10_0_15138
| V10_0_16299
Expand All @@ -159,6 +160,7 @@ type UAPVersion =
override this.ToString() =
match this with
| V10 -> "10.0"
| V10_0_10240 -> "10.0.10240"
| V10_0_14393 -> "10.0.14393"
| V10_0_15138 -> "10.0.15138"
| V10_0_16299 -> "10.0.16299"
Expand All @@ -169,6 +171,7 @@ type UAPVersion =
member this.ShortString() =
match this with
| UAPVersion.V10 -> "10.0"
| UAPVersion.V10_0_10240 -> "10.0.10240"
| UAPVersion.V10_0_14393 -> "10.0.14393"
| UAPVersion.V10_0_15138 -> "10.0.15138"
| UAPVersion.V10_0_16299 -> "10.0.16299"
Expand All @@ -181,6 +184,7 @@ type UAPVersion =
match this with
// Assumed from C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore
| UAPVersion.V10
| UAPVersion.V10_0_10240
| UAPVersion.V10_0_14393
| UAPVersion.V10_0_15138
| UAPVersion.V10_0_16299
Expand All @@ -193,6 +197,7 @@ type UAPVersion =
static member TryParse s =
match s with
| "" | "1" | "10" -> Some UAPVersion.V10
| "10.0.10240" -> Some UAPVersion.V10_1
| "10.0.14393" -> Some UAPVersion.V10_1
| "10.0.15138" -> Some UAPVersion.V10_1
| "10.0.16299" -> Some UAPVersion.V10_1
Expand Down Expand Up @@ -659,6 +664,7 @@ type FrameworkIdentifier =
| XamarinTV -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
| XamarinWatch -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
| UAP UAPVersion.V10 -> [ Windows WindowsVersion.V8_1; WindowsPhoneApp WindowsPhoneAppVersion.V8_1; DotNetStandard DotNetStandardVersion.V1_4 ]
| UAP UAPVersion.V10_0_10240 -> [ UAP UAPVersion.V10 ]
| UAP UAPVersion.V10_0_14393 -> [ UAP UAPVersion.V10 ]
| UAP UAPVersion.V10_0_15138 -> [ UAP UAPVersion.V10 ]
| UAP UAPVersion.V10_0_16299 -> [ UAP UAPVersion.V10; DotNetStandard DotNetStandardVersion.V2_0 ]
Expand Down Expand Up @@ -1292,8 +1298,9 @@ module KnownTargetProfiles =
MonoAndroidVersions
|> List.map (MonoAndroid >> TargetProfile.SinglePlatform)

let UAPVersons = [
let UAPVersions = [
UAPVersion.V10
UAPVersion.V10_0_10240
UAPVersion.V10_0_14393
UAPVersion.V10_0_15138
UAPVersion.V10_0_16299
Expand All @@ -1303,7 +1310,7 @@ module KnownTargetProfiles =
]

let UAPProfiles =
UAPVersons
UAPVersions
|> List.map (UAP >> TargetProfile.SinglePlatform)

let WindowsPhoneVersions = [
Expand Down
2 changes: 1 addition & 1 deletion tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ let ``Check that lists are updated``() =
checkList KnownTargetProfiles.DotNetUnityVersions
checkList KnownTargetProfiles.MonoAndroidVersions
checkList KnownTargetProfiles.SilverlightVersions
checkList KnownTargetProfiles.UAPVersons
checkList KnownTargetProfiles.UAPVersions
checkList KnownTargetProfiles.WindowsPhoneAppVersions
checkList KnownTargetProfiles.WindowsPhoneVersions
checkList KnownTargetProfiles.WindowsVersions
Expand Down