diff --git a/src/Essentials/src/Essentials-net6.csproj b/src/Essentials/src/Essentials-net6.csproj index efb57b875bae..71555569f315 100644 --- a/src/Essentials/src/Essentials-net6.csproj +++ b/src/Essentials/src/Essentials-net6.csproj @@ -1,4 +1,4 @@ - + netstandard2.1;netstandard2.0;net6.0;$(MauiPlatforms) Microsoft.Maui.Essentials diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.json b/src/Templates/src/templates/maui-blazor/.template.config/template.json index 0098e4d3b065..b3d22bdcac83 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/template.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/template.json @@ -1,11 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Blazor" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen", "Blazor" ], "identity": "Microsoft.Maui.BlazorApp", "groupIdentity": "Microsoft.Maui.BlazorApp", "name": ".NET MAUI Blazor App", - "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, and WinUI using Blazor", + "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI, and Tizen using Blazor", "shortName": "maui-blazor", "tags": { "language": "C#", diff --git a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj index 4ae344af030b..3109427ea9f7 100644 --- a/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj +++ b/src/Templates/src/templates/maui-blazor/MauiApp.1.csproj @@ -1,7 +1,7 @@  - net6.0-ios;net6.0-android;net6.0-maccatalyst + net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-tizen Exe MauiApp._1 diff --git a/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/Main.cs b/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/Main.cs new file mode 100644 index 000000000000..731ac52155eb --- /dev/null +++ b/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/Main.cs @@ -0,0 +1,21 @@ +using System; +using Microsoft.Maui; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility; + +namespace MauiApp1 +{ + class Program : MauiApplication + { + protected override void OnCreate() + { + base.OnCreate(); + } + + static void Main(string[] args) + { + var app = new Program(); + app.Run(args); + } + } +} diff --git a/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/tizen-manifest.xml b/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/tizen-manifest.xml new file mode 100644 index 000000000000..5847c71b195d --- /dev/null +++ b/src/Templates/src/templates/maui-blazor/MauiApp1/Platforms/Tizen/tizen-manifest.xml @@ -0,0 +1,15 @@ + + + + + + appicon.xhigh.png + + + + + http://tizen.org/privilege/internet + + + + \ No newline at end of file diff --git a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/template.json b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/template.json index e2d2ca8ed84e..24c36c9ad5f1 100644 --- a/src/Templates/src/templates/maui-contentpage-csharp/.template.config/template.json +++ b/src/Templates/src/templates/maui-contentpage-csharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Xaml", "Code" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen", "Xaml", "Code" ], "identity": "Microsoft.Maui.CSharpContentPage", "name": ".NET MAUI ContentPage (C#)", "shortName": "maui-page-csharp", diff --git a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/template.json b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/template.json index eeda2f4c1b6c..76e1bf5ceb1a 100644 --- a/src/Templates/src/templates/maui-contentpage-xaml/.template.config/template.json +++ b/src/Templates/src/templates/maui-contentpage-xaml/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Xaml", "Code" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen", "Xaml", "Code" ], "identity": "Microsoft.Maui.XamlContentPage", "name": ".NET MAUI ContentPage", "shortName": "maui-page-xaml", diff --git a/src/Templates/src/templates/maui-contentview-csharp/.template.config/template.json b/src/Templates/src/templates/maui-contentview-csharp/.template.config/template.json index ad68738c9286..e1022456274d 100644 --- a/src/Templates/src/templates/maui-contentview-csharp/.template.config/template.json +++ b/src/Templates/src/templates/maui-contentview-csharp/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Xaml", "Code" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen", "Xaml", "Code" ], "identity": "Microsoft.Maui.CSharpContentView", "name": ".NET MAUI ContentView (C#)", "shortName": "maui-view-csharp", diff --git a/src/Templates/src/templates/maui-contentview-xaml/.template.config/template.json b/src/Templates/src/templates/maui-contentview-xaml/.template.config/template.json index 65866c4f282d..48713d6796a8 100644 --- a/src/Templates/src/templates/maui-contentview-xaml/.template.config/template.json +++ b/src/Templates/src/templates/maui-contentview-xaml/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Xaml", "Code" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen", "Xaml", "Code" ], "identity": "Microsoft.Maui.XamlContentView", "name": ".NET MAUI ContentView", "shortName": "maui-view-xaml", diff --git a/src/Templates/src/templates/maui-lib/.template.config/template.json b/src/Templates/src/templates/maui-lib/.template.config/template.json index 19815c0d14b5..535e5c372c93 100644 --- a/src/Templates/src/templates/maui-lib/.template.config/template.json +++ b/src/Templates/src/templates/maui-lib/.template.config/template.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen" ], "identity": "Microsoft.Maui.MauiLib", "groupIdentity": "Microsoft.Maui.Library", "name": ".NET MAUI Class Library", diff --git a/src/Templates/src/templates/maui-lib/MauiLib1.csproj b/src/Templates/src/templates/maui-lib/MauiLib1.csproj index 89ae89ede505..c7d56d2d6abd 100644 --- a/src/Templates/src/templates/maui-lib/MauiLib1.csproj +++ b/src/Templates/src/templates/maui-lib/MauiLib1.csproj @@ -1,7 +1,7 @@ - net6.0;net6.0-ios;net6.0-android;net6.0-maccatalyst + net6.0;net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-tizen 10.0.17763.0 MauiLib1 @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/src/Templates/src/templates/maui-lib/Platforms/Tizen/PlatformClass1.cs b/src/Templates/src/templates/maui-lib/Platforms/Tizen/PlatformClass1.cs new file mode 100644 index 000000000000..82cb63571ead --- /dev/null +++ b/src/Templates/src/templates/maui-lib/Platforms/Tizen/PlatformClass1.cs @@ -0,0 +1,9 @@ +using System; + +namespace MauiLib1 +{ + // All the code in this file is only included on Tizen. + public class PlatformClass1 + { + } +} \ No newline at end of file diff --git a/src/Templates/src/templates/maui-mobile/.template.config/template.json b/src/Templates/src/templates/maui-mobile/.template.config/template.json index 2e048df50e0b..7fb6ab48c311 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/template.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/template.json @@ -1,11 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "WinUI", "Tizen" ], "identity": "Microsoft.Maui.MauiApp", "groupIdentity": "Microsoft.Maui.App", "name": ".NET MAUI App", - "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, and WinUI", + "description": "A project for creating a .NET MAUI application for iOS, Android, Mac Catalyst, WinUI and Tizen", "shortName": "maui", "tags": { "language": "C#", diff --git a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj index cfec97e3405a..8d56ea099f7f 100644 --- a/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj +++ b/src/Templates/src/templates/maui-mobile/MauiApp.1.csproj @@ -1,7 +1,7 @@  - net6.0-ios;net6.0-android;net6.0-maccatalyst + net6.0-ios;net6.0-android;net6.0-maccatalyst;net6.0-tizen Exe MauiApp._1 diff --git a/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/Main.cs b/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/Main.cs new file mode 100644 index 000000000000..731ac52155eb --- /dev/null +++ b/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/Main.cs @@ -0,0 +1,21 @@ +using System; +using Microsoft.Maui; +using Microsoft.Maui.Controls; +using Microsoft.Maui.Controls.Compatibility; + +namespace MauiApp1 +{ + class Program : MauiApplication + { + protected override void OnCreate() + { + base.OnCreate(); + } + + static void Main(string[] args) + { + var app = new Program(); + app.Run(args); + } + } +} diff --git a/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/tizen-manifest.xml b/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/tizen-manifest.xml new file mode 100644 index 000000000000..5847c71b195d --- /dev/null +++ b/src/Templates/src/templates/maui-mobile/MauiApp1/Platforms/Tizen/tizen-manifest.xml @@ -0,0 +1,15 @@ + + + + + + appicon.xhigh.png + + + + + http://tizen.org/privilege/internet + + + + \ No newline at end of file diff --git a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/BundledVersions.in.targets b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/BundledVersions.in.targets index adcf04234aba..eac0478c9661 100644 --- a/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/BundledVersions.in.targets +++ b/src/Workload/Microsoft.Maui.Controls.Sdk/Sdk/BundledVersions.in.targets @@ -11,7 +11,7 @@ - <_MauiRuntimeIdentifiers Include="android;ios;maccatalyst;win" /> + <_MauiRuntimeIdentifiers Include="android;ios;maccatalyst;win;tizen" /> + + + + \ No newline at end of file diff --git a/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json b/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json index a57553671649..23b729df5e23 100644 --- a/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json +++ b/src/Workload/Microsoft.NET.Sdk.Maui/WorkloadManifest.in.json @@ -146,6 +146,21 @@ "Microsoft.Maui.Essentials.Runtime.win", "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" ] + }, + "maui-tizen": { + "description": ".NET MAUI SDK for Tizen", + "extends": [ + "maui-core", + "tizen" + ], + "packs": [ + "Microsoft.Maui.Core.Ref.tizen", + "Microsoft.Maui.Core.Runtime.tizen", + "Microsoft.Maui.Controls.Ref.tizen", + "Microsoft.Maui.Controls.Runtime.tizen", + "Microsoft.Maui.Essentials.Ref.tizen", + "Microsoft.Maui.Essentials.Runtime.tizen" + ] } }, "packs": { @@ -173,6 +188,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Core.Ref.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Core.Runtime.any": { "kind": "framework", "version": "@VERSION@" @@ -193,6 +212,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Core.Runtime.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Controls.Ref.any": { "kind": "framework", "version": "@VERSION@" @@ -213,6 +236,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Controls.Ref.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Controls.Runtime.any": { "kind": "framework", "version": "@VERSION@" @@ -233,6 +260,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Controls.Runtime.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Dependencies": { "kind": "library", "version": "@VERSION@" @@ -257,6 +288,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Essentials.Ref.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Essentials.Runtime.any": { "kind": "framework", "version": "@VERSION@" @@ -277,6 +312,10 @@ "kind": "framework", "version": "@VERSION@" }, + "Microsoft.Maui.Essentials.Runtime.tizen": { + "kind": "framework", + "version": "@VERSION@" + }, "Microsoft.Maui.Extensions": { "kind": "library", "version": "@VERSION@" diff --git a/src/Workload/README.md b/src/Workload/README.md index 1709cb636b78..ff4139e9fdcb 100644 --- a/src/Workload/README.md +++ b/src/Workload/README.md @@ -93,6 +93,7 @@ installed: * `maui-maccatalyst` * `maui-macos` * `maui-windows` +* `maui-tizen` Eventually, Android will have a `microsoft-android-sdk-minimal` workload id that excludes AOT compilers. We'll need to modify some of diff --git a/src/Workload/Shared/Frameworks.targets b/src/Workload/Shared/Frameworks.targets index ce1f9622b7d5..dff9d2f5f4be 100644 --- a/src/Workload/Shared/Frameworks.targets +++ b/src/Workload/Shared/Frameworks.targets @@ -43,12 +43,19 @@ Tfm="net6.0-windows10.0.18362" Profile="Windows" /> + <_TargetPlatform + Condition=" '$(MauiPlatformName)' == 'tizen' " + Include="net6.0-tizen6.5" + FullTfm="%(Identity)" + Tfm="net6.0-tizen" + Profile="Tizen" + /> - <_Platforms Include="any;android;maccatalyst;ios" /> + <_Platforms Include="any;android;maccatalyst;ios;tizen" /> <_Platforms Include="win" Condition=" '$(BuildForWinUI)' == 'true' or '$(Packing)' == 'true' " />