diff --git a/src/Essentials/src/Essentials-net6.csproj b/src/Essentials/src/Essentials-net6.csproj index 6f716fd04cc1..ce2dbfc236c6 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 825afc06f469..92ef6afee1f6 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 (Preview)", - "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 1f5a375dfbd3..94443bd6b911 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-android;net6.0-ios;net6.0-maccatalyst + net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-tizen $(TargetFrameworks);net6.0-windows10.0.19041 Exe MauiApp._1 @@ -28,6 +28,7 @@ 21.0 10.0.17763.0 10.0.17763.0 + 6.5 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 51baa976d56e..922ffb35be7e 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#) (Preview)", "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 da517f02ffcf..30a3a028eaed 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 (Preview)", "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 a01086c415f6..16be01a212b1 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#) (Preview)", "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 9d359c11659a..b6d734560d49 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 (Preview)", "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 0413fdc64a34..b959b2e884a8 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 (Preview)", diff --git a/src/Templates/src/templates/maui-lib/MauiLib1.csproj b/src/Templates/src/templates/maui-lib/MauiLib1.csproj index fa8a5acd9367..5b219a54564d 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-android;net6.0-ios;net6.0-maccatalyst + net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-tizen $(TargetFrameworks);net6.0-windows10.0.19041 MauiLib1 true @@ -13,6 +13,7 @@ 21.0 10.0.17763.0 10.0.17763.0 + 6.5 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 4893f719a63f..e310c206c1eb 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 (Preview)", - "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 a674f50d9b38..66b014e15c14 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-android;net6.0-ios;net6.0-maccatalyst + net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-tizen $(TargetFrameworks);net6.0-windows10.0.19041 Exe MauiApp._1 @@ -27,6 +27,7 @@ 21.0 10.0.17763.0 10.0.17763.0 + 6.5 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.Dependencies/Microsoft.Maui.Dependencies.csproj b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj index 3295c5f35209..9199feb7860c 100644 --- a/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj +++ b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj @@ -31,5 +31,9 @@ + + + + \ No newline at end of file diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets index b9b0f4049244..9e8d4c16634c 100644 --- a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets +++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets @@ -13,7 +13,7 @@ - <_MauiRuntimeIdentifiers Include="android;ios;maccatalyst;win" /> + <_MauiRuntimeIdentifiers Include="android;ios;maccatalyst;win;tizen" /> + <_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="'$(IncludeWindowsTargetFrameworks)' == 'true'" />