diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj index cd0f5e0d9073..006251b31bfa 100644 --- a/src/Essentials/src/Essentials.csproj +++ b/src/Essentials/src/Essentials.csproj @@ -1,4 +1,4 @@ - + netstandard2.1;netstandard2.0;$(_MauiDotNetTfm);$(MauiPlatforms) Microsoft.Maui.Essentials diff --git a/src/Templates/src/templates/maui-blazor/.template.config/template.in.json b/src/Templates/src/templates/maui-blazor/.template.config/template.in.json index 4284b7a4cce3..578bb62591df 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/template.in.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/template.in.json @@ -1,11 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "Windows", "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 48496b40738d..826ba248a631 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 @@  - DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst + DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst;DOTNET_TFM-tizen $(TargetFrameworks);DOTNET_TFM-windows10.0.19041 Exe MauiApp._1 @@ -26,6 +26,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 34147264cf92..0485fe029487 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 24dec31fb12b..1948845df214 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 (XAML) (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 cdc31e23d922..e5182f7059fa 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 eddd0216d039..54cbeff5ec18 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 (XAML) (Preview)", "shortName": "maui-view-xaml", diff --git a/src/Templates/src/templates/maui-lib/.template.config/template.in.json b/src/Templates/src/templates/maui-lib/.template.config/template.in.json index 927891f2abe0..3490542ff6a0 100644 --- a/src/Templates/src/templates/maui-lib/.template.config/template.in.json +++ b/src/Templates/src/templates/maui-lib/.template.config/template.in.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "Windows" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "Windows", "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 c46b69ea9b8e..b70b41114a9c 100644 --- a/src/Templates/src/templates/maui-lib/MauiLib1.csproj +++ b/src/Templates/src/templates/maui-lib/MauiLib1.csproj @@ -1,7 +1,7 @@ - DOTNET_TFM;DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst + DOTNET_TFM;DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst;DOTNET_TFM-tizen $(TargetFrameworks);DOTNET_TFM-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.in.json b/src/Templates/src/templates/maui-mobile/.template.config/template.in.json index 62084950aa70..ac3fce8e0185 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/template.in.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/template.in.json @@ -1,11 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Microsoft", - "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "Windows" ], + "classifications": [ "MAUI", "Android", "iOS", "macOS", "Mac Catalyst", "Windows", "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 21defd43ff0c..d2bd054d6251 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 @@  - DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst + DOTNET_TFM-android;DOTNET_TFM-ios;DOTNET_TFM-maccatalyst;DOTNET_TFM-tizen $(TargetFrameworks);DOTNET_TFM-windows10.0.19041 Exe MauiApp._1 @@ -25,6 +25,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 2f88e55e47c4..0ea1c5fbdbb1 100644 --- a/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj +++ b/src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj @@ -33,5 +33,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 492b227b2329..d26a80d5b3a5 100644 --- a/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets +++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets @@ -14,7 +14,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'" />