Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NUI] Remove EXaml. #6565

Open
wants to merge 1 commit into
base: DevelNUI
Choose a base branch
from
Open

[NUI] Remove EXaml. #6565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified pkg/Tizen.NET.API13/xamlbuild/Tizen.NUI.XamlBuild.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Tizen.NUI.XamlBuild/Tizen.NUI.XamlBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
30 changes: 15 additions & 15 deletions src/Tizen.NUI.XamlBuild/src/public/XamlBuild/XamlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,20 @@ void GenerateCode(string outFilePath)

//Create and initialize fields

if(0 == XamlOptimization)
if(2 == XamlOptimization)
{
var loadExaml_invoke = new CodeMethodInvokeExpression(
new CodeTypeReferenceExpression(new CodeTypeReference($"global::Tizen.NUI.EXaml.EXamlExtensions")),
"LoadFromEXamlByRelativePath", new CodeThisReferenceExpression(),
new CodeMethodInvokeExpression()
{ Method = new CodeMethodReferenceExpression() { MethodName = "GetEXamlPath" } });

CodeAssignStatement assignEXamlObject = new CodeAssignStatement(
new CodeVariableReferenceExpression("eXamlData"), loadExaml_invoke);

initcomp.Statements.Add(assignEXamlObject);
}
else
{
initcomp.Statements.Add(new CodeMethodInvokeExpression(
new CodeTypeReferenceExpression(new CodeTypeReference($"global::{typeof(Extensions).FullName}")),
Expand All @@ -377,19 +390,6 @@ void GenerateCode(string outFilePath)
};
declType.Members.Add(exitXamlComp);
}
else
{
var loadExaml_invoke = new CodeMethodInvokeExpression(
new CodeTypeReferenceExpression(new CodeTypeReference($"global::Tizen.NUI.EXaml.EXamlExtensions")),
"LoadFromEXamlByRelativePath", new CodeThisReferenceExpression(),
new CodeMethodInvokeExpression()
{ Method = new CodeMethodReferenceExpression() { MethodName = "GetEXamlPath" } });

CodeAssignStatement assignEXamlObject = new CodeAssignStatement(
new CodeVariableReferenceExpression("eXamlData"), loadExaml_invoke);

initcomp.Statements.Add(assignEXamlObject);
}

foreach (var namedField in NamedFields) {
if(namedField.Type.BaseType.Contains("-"))
Expand All @@ -410,7 +410,7 @@ void GenerateCode(string outFilePath)
initcomp.Statements.Add(assign);
}

if(0 != XamlOptimization)
if(2 == XamlOptimization)
{
declType.Members.Add(new CodeMemberField
{
Expand Down
10 changes: 8 additions & 2 deletions src/Tizen.NUI/Tizen.NUI.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30204.135
# Visual Studio Version 17
VisualStudioVersion = 17.12.35527.113 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "Tizen.NUI.csproj", "{473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}"
EndProject
Expand All @@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.System.Information",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Applications.ThemeManager", "..\Tizen.Applications.ThemeManager\Tizen.Applications.ThemeManager.csproj", "{F57F6911-C581-49CA-80A5-9B5DDDAE3D40}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Tracer", "..\Tizen.Tracer\Tizen.Tracer.csproj", "{50FDDB2F-25D5-4D22-98F8-5443B5B81B4C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -57,6 +59,10 @@ Global
{F57F6911-C581-49CA-80A5-9B5DDDAE3D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F57F6911-C581-49CA-80A5-9B5DDDAE3D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F57F6911-C581-49CA-80A5-9B5DDDAE3D40}.Release|Any CPU.Build.0 = Release|Any CPU
{50FDDB2F-25D5-4D22-98F8-5443B5B81B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50FDDB2F-25D5-4D22-98F8-5443B5B81B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50FDDB2F-25D5-4D22-98F8-5443B5B81B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50FDDB2F-25D5-4D22-98F8-5443B5B81B4C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
43 changes: 0 additions & 43 deletions src/Tizen.NUI/src/internal/EXaml/Action/Action.cs
View file
Open in desktop

This file was deleted.

227 changes: 0 additions & 227 deletions src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs
View file
Open in desktop

This file was deleted.

Loading
Loading