Skip to content

Commit 9709b8c

Browse files
forkiforki
committed
Implement XamarinTV, XamarinWatch - fixes #2532 
1 parent dbb8169 commit 9709b8c

4 files changed

Lines changed: 24 additions & 2 deletions

File tree

‎src/Paket.Core/Versioning/FrameworkHandling.fs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ type FrameworkIdentifier =
373373
| MonoTouch
374374
| MonoMac
375375
| Native of BuildMode * Platform
376+
| XamarinTV
377+
| XamarinWatch
376378
| XamariniOS
377379
| XamarinMac
378380
| Windows of WindowsVersion
@@ -393,6 +395,8 @@ type FrameworkIdentifier =
393395
| MonoTouch -> "monotouch"
394396
| MonoMac -> "monomac"
395397
| Native(_) -> "native"
398+
| XamarinTV -> "xamarintvos"
399+
| XamarinWatch -> "xamarinwatchos"
396400
| XamariniOS -> "xamarinios"
397401
| UAP v -> "uap" + v.ShortString()
398402
| XamarinMac -> "xamarinmac"
@@ -445,6 +449,8 @@ type FrameworkIdentifier =
445449
| Native(_) -> [ ]
446450
| XamariniOS -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
447451
| XamarinMac -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
452+
| XamarinTV -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
453+
| XamarinWatch -> [ DotNetStandard DotNetStandardVersion.V1_6 ]
448454
| UAP UAPVersion.V10 -> [ Windows WindowsVersion.V8_1; WindowsPhoneApp WindowsPhoneAppVersion.V8_1; DotNetStandard DotNetStandardVersion.V1_4 ]
449455
| DotNetFramework FrameworkVersion.V1 -> [ ]
450456
| DotNetFramework FrameworkVersion.V1_1 -> [ DotNetFramework FrameworkVersion.V1 ]
@@ -570,6 +576,8 @@ module FrameworkDetection =
570576
| "monoandroid71" | "monoandroid7.1"-> Some (MonoAndroid MonoAndroidVersion.V71)
571577
| "monomac" | "monomac10" | "monomac1" -> Some MonoMac
572578
| "xamarinios" | "xamarinios10" | "xamarinios1" | "xamarin.ios10" -> Some XamariniOS
579+
| "xamarinwatchos" | "xamarinwatchos10" | "xamarinwatchos1" | "xamarin.watchos10" -> Some XamarinWatch
580+
| "xamarintvos" | "xamarintvos10" | "xamarintvos1" | "xamarin.tvos10" -> Some XamarinTV
573581
| "xamarinmac" | "xamarinmac20" | "xamarin.mac20" -> Some XamarinMac
574582
| "native/x86/debug" -> Some(Native(Debug,Win32))
575583
| "native/x64/debug" -> Some(Native(Debug,X64))
@@ -1002,6 +1010,8 @@ module KnownTargetProfiles =
10021010
[SinglePlatform(MonoTouch)
10031011
SinglePlatform(XamariniOS)
10041012
SinglePlatform(XamarinMac)
1013+
SinglePlatform(XamarinTV)
1014+
SinglePlatform(XamarinWatch)
10051015
SinglePlatform(WindowsPhoneApp WindowsPhoneAppVersion.V8_1)] @
10061016
(AllPortableProfiles |> List.map PortableProfile)
10071017

@@ -1201,6 +1211,8 @@ module SupportCalculation =
12011211
| MonoTouch
12021212
| MonoAndroid _
12031213
| XamariniOS
1214+
| XamarinTV
1215+
| XamarinWatch
12041216
| XamarinMac ->
12051217
// http://danrigby.com/2014/05/14/supported-pcl-profiles-xamarin-for-visual-studio-2/
12061218
[ Profile5

‎src/Paket.Core/Versioning/PlatformMatching.fs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ let getTargetCondition (target:TargetProfile) =
219219
| MonoTouch -> "$(TargetFrameworkIdentifier) == 'MonoTouch'", ""
220220
| MonoMac -> "$(TargetFrameworkIdentifier) == 'MonoMac'", ""
221221
| XamariniOS -> "$(TargetFrameworkIdentifier) == 'Xamarin.iOS'", ""
222+
| XamarinTV -> "$(TargetFrameworkIdentifier) == 'Xamarin.tvOS'", ""
223+
| XamarinWatch -> "$(TargetFrameworkIdentifier) == 'Xamarin.watchOS'", ""
222224
| UAP(version) -> "$(TargetFrameworkIdentifier) == '.NETCore'", sprintf "$(TargetFrameworkVersion) == '%O'" version.NetCoreVersion
223225
| XamarinMac -> "$(TargetFrameworkIdentifier) == 'Xamarin.Mac'", ""
224226
| Native(NoBuildMode,NoPlatform) -> "true", ""

‎src/Paket/Paket.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<StartAction>Project</StartAction>
3232
<StartProgram>paket.exe</StartProgram>
3333
<StartAction>Project</StartAction>
34-
<StartArguments>install</StartArguments>
35-
<StartWorkingDirectory>D:\temp\test</StartWorkingDirectory>
34+
<StartArguments>convert-from-nuget</StartArguments>
35+
<StartWorkingDirectory>D:\temp\freya</StartWorkingDirectory>
3636
</PropertyGroup>
3737
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3838
<Optimize>true</Optimize>

‎tests/Paket.Tests/InstallModel/FrameworkIdentifierSpecs.fs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ let ``should understand xamarinios``() =
3838
let ``should serialize xamarinios``() =
3939
XamariniOS.ToString() |> shouldEqual "xamarinios"
4040

41+
[<Test>]
42+
let ``should serialize xamarintvos``() =
43+
XamarinTV.ToString() |> shouldEqual "xamarintvos"
44+
45+
[<Test>]
46+
let ``should serialize xamarinwtchos``() =
47+
XamarinWatch.ToString() |> shouldEqual "xamarinwatchos"
48+
4149
[<Test>]
4250
let ``should understand xamarinmac``() =
4351
FrameworkDetection.Extract("xamarinmac20").Value |> shouldEqual (XamarinMac)

0 commit comments

Comments
 (0)