Skip to content

Commit 3cbb053

Browse files
committed
[Tizen] Fix MauiContext
1 parent 1bdf64f commit 3cbb053

File tree

2 files changed

+8
-31
lines changed

2 files changed

+8
-31
lines changed

._Microsoft.Maui.sln

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.SourceGen", "src\C
108108
EndProject
109109
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample.Tizen", "src\Controls\samples\Controls.Sample.Tizen\Controls.Sample.Tizen.csproj", "{4D5FF3BF-5C21-4DE9-B752-2F92BCB2F7A6}"
110110
EndProject
111-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.Samples.Tizen", "src\Essentials\samples\Samples.Tizen\Essentials.Samples.Tizen.csproj", "{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}"
112-
EndProject
113111
Global
114112
GlobalSection(SharedMSBuildProjectFiles) = preSolution
115113
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
@@ -753,34 +751,6 @@ Global
753751
{4D5FF3BF-5C21-4DE9-B752-2F92BCB2F7A6}.Release|x64.Build.0 = Release|Any CPU
754752
{4D5FF3BF-5C21-4DE9-B752-2F92BCB2F7A6}.Release|x86.ActiveCfg = Release|Any CPU
755753
{4D5FF3BF-5C21-4DE9-B752-2F92BCB2F7A6}.Release|x86.Build.0 = Release|Any CPU
756-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
757-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
758-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|ARM.ActiveCfg = Debug|Any CPU
759-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|ARM.Build.0 = Debug|Any CPU
760-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
761-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|ARM64.Build.0 = Debug|Any CPU
762-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
763-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|iPhone.Build.0 = Debug|Any CPU
764-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
765-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
766-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|x64.ActiveCfg = Debug|Any CPU
767-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|x64.Build.0 = Debug|Any CPU
768-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|x86.ActiveCfg = Debug|Any CPU
769-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Debug|x86.Build.0 = Debug|Any CPU
770-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
771-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|Any CPU.Build.0 = Release|Any CPU
772-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|ARM.ActiveCfg = Release|Any CPU
773-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|ARM.Build.0 = Release|Any CPU
774-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|ARM64.ActiveCfg = Release|Any CPU
775-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|ARM64.Build.0 = Release|Any CPU
776-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|iPhone.ActiveCfg = Release|Any CPU
777-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|iPhone.Build.0 = Release|Any CPU
778-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
779-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
780-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|x64.ActiveCfg = Release|Any CPU
781-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|x64.Build.0 = Release|Any CPU
782-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|x86.ActiveCfg = Release|Any CPU
783-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B}.Release|x86.Build.0 = Release|Any CPU
784754
EndGlobalSection
785755
GlobalSection(SolutionProperties) = preSolution
786756
HideSolutionNode = FALSE
@@ -821,7 +791,6 @@ Global
821791
{9FAA9654-80E6-4664-9702-47998A04E8FE} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
822792
{061EC251-FB7A-43B2-A6AD-065D2CCEF1BD} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
823793
{4D5FF3BF-5C21-4DE9-B752-2F92BCB2F7A6} = {806499EB-C2CC-4E85-BC19-613F3DE5E0C3}
824-
{8B44D770-0239-43A4-8F1D-7C8BD2C8CE7B} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
825794
EndGlobalSection
826795
GlobalSection(ExtensibilityGlobals) = postSolution
827796
SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}

src/Core/src/Platform/MauiContext.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ public MauiContext(IServiceProvider services, UI.Xaml.Application application, I
3838
AddSpecific(application);
3939
}
4040
#elif TIZEN
41+
public MauiContext(IServiceProvider services, Tizen.Applications.CoreUIApplication application, CoreUIAppContext context, IMauiContext? parent = null)
42+
: this(services, parent)
43+
{
44+
AddSpecific(application);
45+
AddWeakSpecific(context);
46+
AddWeakSpecific(context.MainWindow);
47+
}
48+
4149
public MauiContext(IServiceProvider services, CoreUIAppContext context, IMauiContext? parent = null)
4250
: this(services, parent)
4351
{

0 commit comments

Comments
 (0)