Skip to content

Commit f1f7cef

Browse files
jeromelabanjeromelaban
committed
feat: Add tvOS support
1 parent 0ea4825 commit f1f7cef

File tree

7 files changed

+54
-45
lines changed

7 files changed

+54
-45
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ jobs:
123123
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
124124
manifest_name: Test net9.0-browserwasm TFM
125125
tool_params: '--tfm net9.0-browserwasm'
126+
- manifest: 'manifests\uno.ui-preview-major.manifest.json'
127+
manifest_name: Test net9.0-tvos TFM
128+
tool_params: '--tfm net9.0-tvos'
126129

127130
steps:
128131
- name: Checkout
@@ -313,6 +316,9 @@ jobs:
313316
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
314317
manifest_name: Test net9.0-browserwasm TFM
315318
tool_params: '--tfm net9.0-browserwasm'
319+
- manifest: 'manifests/uno.ui-preview-major.manifest.json'
320+
manifest_name: Test net9.0-tvos TFM
321+
tool_params: '--tfm net9.0-tvos'
316322

317323
steps:
318324
- name: Checkout

‎UnoCheck/CheckCommand.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,10 @@ internal static string[] ParseTfmsToTargetPlatforms(CheckSettings settings)
416416
break;
417417
case "android":
418418
targetPlatforms.Add("android");
419+
break;
420+
case "tvos":
421+
targetPlatforms.Add("tvos");
419422
break;
420-
case "macos":
421423
case "maccatalyst":
422424
targetPlatforms.Add("macos");
423425
break;

‎UnoCheck/Checkups/DotNetWorkloadsCheckup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private bool FilterPlatform(Manifest.DotNetWorkload w)
5353
|| TargetPlatforms.HasFlag(TargetPlatform.iOS)
5454
|| TargetPlatforms.HasFlag(TargetPlatform.macOS)):
5555
case "ios" when TargetPlatforms.HasFlag(TargetPlatform.iOS):
56-
case "macos" when TargetPlatforms.HasFlag(TargetPlatform.macOS):
56+
case "tvos" when TargetPlatforms.HasFlag(TargetPlatform.tvOS):
5757
case "maccatalyst" when TargetPlatforms.HasFlag(TargetPlatform.macOS):
5858
case "wasm-tools" when TargetPlatforms.HasFlag(TargetPlatform.WebAssembly):
5959
return true;

‎UnoCheck/TargetPlatform.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public enum TargetPlatform
1515
SkiaDesktop = 16,
1616
Windows = 128,
1717
WinAppSDK = 256,
18+
tvOS = 512,
1819

1920
All = -1
2021
}

‎manifests/uno.ui-preview-major.manifest.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"toolVersion": "1.14.0",
44
"variables": {
55
"OPENJDK_VERSION": "11.0.20.1",
6-
"DOTNET_SDK_VERSION": "9.0.200",
7-
"MACCATALYST_SDK_VERSION": "18.2.9180/9.0.100",
8-
"IOS_SDK_VERSION": "18.2.9180/9.0.100",
9-
"MACOS_SDK_VERSION": "15.1.9163/9.0.100",
10-
"ANDROID_SDK_VERSION": "35.0.39/9.0.100",
11-
"MAUI_VERSION": "9.0.20/9.0.100",
12-
"WASMTOOLS_VERSION": "9.0.2/9.0.100"
6+
"DOTNET_SDK_VERSION": "9.0.101",
7+
"MACCATALYST_SDK_VERSION": "18.1.9163/9.0.100",
8+
"IOS_SDK_VERSION": "18.1.9163/9.0.100",
9+
"TVOS_SDK_VERSION": "18.1.9163/9.0.100",
10+
"ANDROID_SDK_VERSION": "35.0.24/9.0.100",
11+
"MAUI_VERSION": "9.0.0/9.0.100",
12+
"WASMTOOLS_VERSION": "9.0.0/9.0.100"
1313
},
1414
"variableMappers": [
1515
],
@@ -119,10 +119,10 @@
119119
"supportedPlatforms": [ "Windows", "OSX" ]
120120
},
121121
{
122-
"workloadId": "macos",
123-
"workloadManifestId": "microsoft.net.sdk.macos",
124-
"packageId": "Microsoft.NET.Sdk.macOS.Manifest-9.0.100",
125-
"version": "$(MACOS_SDK_VERSION)",
122+
"workloadId": "tvos",
123+
"workloadManifestId": "microsoft.net.sdk.tvos",
124+
"packageId": "Microsoft.NET.Sdk.tvos.Manifest-9.0.100",
125+
"version": "$(TVOS_SDK_VERSION)",
126126
"supportedPlatforms": [ "Windows", "OSX" ]
127127
},
128128
{
@@ -140,11 +140,11 @@
140140
"supportedPlatforms": [ "Linux/x64" ]
141141
},
142142
{
143-
"workloadId": "wasm-tools",
144-
"workloadManifestId": "microsoft.net.workload.mono.toolchain.current",
145-
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-9.0.100",
146-
"version": "$(WASMTOOLS_VERSION)",
147-
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64", "Linux/arm64" ]
143+
"workloadId": "wasm-tools",
144+
"workloadManifestId": "microsoft.net.workload.mono.toolchain.current",
145+
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-9.0.100",
146+
"version": "$(WASMTOOLS_VERSION)",
147+
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64", "Linux/arm64" ]
148148
}
149149
],
150150
"packs": []

‎manifests/uno.ui-preview.manifest.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"toolVersion": "1.14.0",
44
"variables": {
55
"OPENJDK_VERSION": "11.0.20.1",
6-
"DOTNET_SDK_VERSION": "9.0.200",
7-
"MACCATALYST_SDK_VERSION": "18.2.9180/9.0.100",
8-
"IOS_SDK_VERSION": "18.2.9180/9.0.100",
9-
"MACOS_SDK_VERSION": "15.1.9163/9.0.100",
10-
"ANDROID_SDK_VERSION": "35.0.39/9.0.100",
11-
"MAUI_VERSION": "9.0.20/9.0.100",
12-
"WASMTOOLS_VERSION": "9.0.2/9.0.100"
6+
"DOTNET_SDK_VERSION": "9.0.101",
7+
"MACCATALYST_SDK_VERSION": "18.1.9163/9.0.100",
8+
"IOS_SDK_VERSION": "18.1.9163/9.0.100",
9+
"TVOS_SDK_VERSION": "18.1.9163/9.0.100",
10+
"ANDROID_SDK_VERSION": "35.0.24/9.0.100",
11+
"MAUI_VERSION": "9.0.0/9.0.100",
12+
"WASMTOOLS_VERSION": "9.0.0/9.0.100"
1313
},
1414
"variableMappers": [
1515
],
@@ -119,10 +119,10 @@
119119
"supportedPlatforms": [ "Windows", "OSX" ]
120120
},
121121
{
122-
"workloadId": "macos",
123-
"workloadManifestId": "microsoft.net.sdk.macos",
124-
"packageId": "Microsoft.NET.Sdk.macOS.Manifest-9.0.100",
125-
"version": "$(MACOS_SDK_VERSION)",
122+
"workloadId": "tvos",
123+
"workloadManifestId": "microsoft.net.sdk.tvos",
124+
"packageId": "Microsoft.NET.Sdk.tvos.Manifest-9.0.100",
125+
"version": "$(TVOS_SDK_VERSION)",
126126
"supportedPlatforms": [ "Windows", "OSX" ]
127127
},
128128
{
@@ -140,11 +140,11 @@
140140
"supportedPlatforms": [ "Linux/x64" ]
141141
},
142142
{
143-
"workloadId": "wasm-tools",
144-
"workloadManifestId": "microsoft.net.workload.mono.toolchain.current",
145-
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-9.0.100",
146-
"version": "$(WASMTOOLS_VERSION)",
147-
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64", "Linux/arm64" ]
143+
"workloadId": "wasm-tools",
144+
"workloadManifestId": "microsoft.net.workload.mono.toolchain.current",
145+
"packageId": "Microsoft.NET.Workload.Mono.ToolChain.Manifest-9.0.100",
146+
"version": "$(WASMTOOLS_VERSION)",
147+
"supportedPlatforms": [ "Windows", "OSX", "Linux/x64", "Linux/arm64" ]
148148
}
149149
],
150150
"packs": []

‎manifests/uno.ui.manifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"toolVersion": "1.14.0",
44
"variables": {
55
"OPENJDK_VERSION": "11.0.20.1",
6-
"DOTNET_SDK_VERSION": "9.0.200",
7-
"MACCATALYST_SDK_VERSION": "18.2.9180/9.0.100",
8-
"IOS_SDK_VERSION": "18.2.9180/9.0.100",
9-
"MACOS_SDK_VERSION": "15.1.9163/9.0.100",
10-
"ANDROID_SDK_VERSION": "35.0.39/9.0.100",
11-
"MAUI_VERSION": "9.0.20/9.0.100",
12-
"WASMTOOLS_VERSION": "9.0.2/9.0.100"
6+
"DOTNET_SDK_VERSION": "9.0.101",
7+
"MACCATALYST_SDK_VERSION": "18.1.9163/9.0.100",
8+
"IOS_SDK_VERSION": "18.1.9163/9.0.100",
9+
"TVOS_SDK_VERSION": "18.1.9163/9.0.100",
10+
"ANDROID_SDK_VERSION": "35.0.24/9.0.100",
11+
"MAUI_VERSION": "9.0.0/9.0.100",
12+
"WASMTOOLS_VERSION": "9.0.0/9.0.100"
1313
},
1414
"variableMappers": [
1515
],
@@ -119,10 +119,10 @@
119119
"supportedPlatforms": [ "Windows", "OSX" ]
120120
},
121121
{
122-
"workloadId": "macos",
123-
"workloadManifestId": "microsoft.net.sdk.macos",
124-
"packageId": "Microsoft.NET.Sdk.macOS.Manifest-9.0.100",
125-
"version": "$(MACOS_SDK_VERSION)",
122+
"workloadId": "tvos",
123+
"workloadManifestId": "microsoft.net.sdk.tvos",
124+
"packageId": "Microsoft.NET.Sdk.tvos.Manifest-9.0.100",
125+
"version": "$(TVOS_SDK_VERSION)",
126126
"supportedPlatforms": [ "Windows", "OSX" ]
127127
},
128128
{

0 commit comments

Comments
 (0)