Skip to content

Commit

Permalink
Update Platform to Tizen 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JoonghyunCho committed Dec 2, 2024
1 parent f5f8d32 commit 830ddaf
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 144 deletions.
4 changes: 2 additions & 2 deletions workload/build/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
example: -preview.3.100+sha12345
-->
<PropertyGroup>
<TizenWorkloadVersion>8.0.155</TizenWorkloadVersion>
<TizenWorkloadVersion>10.0.101</TizenWorkloadVersion>
</PropertyGroup>

<!--
Expand All @@ -26,7 +26,7 @@
This version is used to generate Samsung.Tizen.Ref package.
-->
<PropertyGroup>
<TizenFXVersion>11.0.0.18033</TizenFXVersion>
<TizenFXVersion>13.0.0.18552</TizenFXVersion>
</PropertyGroup>

<!--
Expand Down
79 changes: 0 additions & 79 deletions workload/src/Samsung.Tizen.Build.Tasks/FixupNuGetReference.cs

This file was deleted.

3 changes: 3 additions & 0 deletions workload/src/Samsung.Tizen.Ref/data/PackageOverrides.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Tizen.NET|4.0.0
Tizen.NET.API13|13.0.0.18552
Tizen.NET.API12|12.0.0.18510
Tizen.NET.API11|11.0.0.18033
Tizen.NET.API10|10.0.0.17508
Tizen.NET.API9|9.0.0.16760
Tizen.NET.API8|8.0.0.15631
Expand Down
10 changes: 8 additions & 2 deletions workload/src/Samsung.Tizen.Ref/data/PlatformManifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Tizen.Account.AccountManager.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Account.FidoClient.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Account.OAuth2.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Account.SyncManager.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.AIAvatar.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Applications.Alarm.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Applications.AttachPanel.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Applications.Badge.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand Down Expand Up @@ -34,6 +35,9 @@ Tizen.Content.Download.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Content.MediaContent.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Content.MimeType.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Context.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Core.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Data.Tdbc.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Data.Tdbc.Driver.Sqlite.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Location.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Location.Geofence.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand All @@ -52,7 +56,6 @@ Tizen.Multimedia.Metadata.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.Radio.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.Recorder.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.Remoting.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.StreamRecorder.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.Util.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Multimedia.Vision.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Network.Bluetooth.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand All @@ -68,6 +71,8 @@ Tizen.Nlp.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Components.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Extension.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Gadget.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Physics2D.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Scene3D.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.Wearable.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.NUI.WindowSystem.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand All @@ -79,6 +84,7 @@ Tizen.Security.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Security.PrivacyPrivilegeManager.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Security.SecureRepository.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Security.TEEC.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Security.WebAuthn.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Sensor.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.Feedback.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand All @@ -87,6 +93,7 @@ Tizen.System.MediaKey.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.PlatformConfig.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.PowerUsage.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.Resource.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.Session.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.Storage.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.SystemSettings.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.System.Usb.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Expand All @@ -101,4 +108,3 @@ Tizen.Uix.Tts.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Uix.TtsEngine.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Uix.VoiceControl.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.Uix.VoiceControlManager.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
Tizen.WebView.dll|Samsung.Tizen.Ref|4.0.0.0|4.0.0.0
69 changes: 69 additions & 0 deletions workload/src/Samsung.Tizen.Ref/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,75 @@
"tizen.7.0.0",
"tizen.6.5.0-arm64"
]
},
"tizen.8.0.0": {
"#import": [
"tizen.7.0.0"
]
},
"tizen.8.0.0-armel": {
"#import": [
"tizen.8.0.0",
"tizen.7.0.0-armel"
]
},
"tizen.8.0.0-x86": {
"#import": [
"tizen.8.0.0",
"tizen.7.0.0-x86"
]
},
"tizen.8.0.0-arm64": {
"#import": [
"tizen.8.0.0",
"tizen.7.0.0-arm64"
]
},
"tizen.9.0.0": {
"#import": [
"tizen.8.0.0"
]
},
"tizen.9.0.0-armel": {
"#import": [
"tizen.9.0.0",
"tizen.8.0.0-armel"
]
},
"tizen.9.0.0-x86": {
"#import": [
"tizen.9.0.0",
"tizen.8.0.0-x86"
]
},
"tizen.9.0.0-arm64": {
"#import": [
"tizen.9.0.0",
"tizen.8.0.0-arm64"
]
},
"tizen.10.0.0": {
"#import": [
"tizen.9.0.0"
]
},
"tizen.10.0.0-armel": {
"#import": [
"tizen.10.0.0",
"tizen.9.0.0-armel"
]
},
"tizen.10.0.0-x86": {
"#import": [
"tizen.10.0.0",
"tizen.9.0.0-x86"
]
},
"tizen.10.0.0-arm64": {
"#import": [
"tizen.10.0.0",
"tizen.9.0.0-arm64"
]
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Copyright (c) Samsung All rights reserved.
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<_DefaultTargetPlatformVersion>7.0</_DefaultTargetPlatformVersion>
<_DefaultTargetPlatformVersion Condition="$(TargetFramework.StartsWith('net8.0'))">8.0</_DefaultTargetPlatformVersion>
<_DefaultTargetPlatformVersion>10.0</_DefaultTargetPlatformVersion>
<_DefaultTargetPlatformVersion Condition="$(TargetFramework.StartsWith('net8.0'))">10.0</_DefaultTargetPlatformVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -23,9 +23,12 @@ Copyright (c) Samsung All rights reserved.
<_TargetFramework Condition="$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)$(_DefaultTargetPlatformVersion)</_TargetFramework>
<_TargetFramework Condition="!$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)</_TargetFramework>

<!-- Tizen7.0 refers TizenFX 10.0.0.17508. Tizen8.0 refers TizenFX 11.0.0.XXXXX. -->
<_TargetingPackVersion>7.0.123</_TargetingPackVersion>
<_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('8.0'))">**FromWorkload**</_TargetingPackVersion>
<!-- Tizen7.0 refers TizenFX 10.0.0.17508. Tizen8.0 refers TizenFX 11.0.0.18033. Tizen9.0 refers TizenFX 12.0.0.18510. Tizen10.0 refers TizenFX **FromWorkload**-->
<_TargetingPackVersion>**FromWorkload**</_TargetingPackVersion>
<_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('7.0'))">7.0.123</_TargetingPackVersion>
<_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('8.0'))">8.0.154</_TargetingPackVersion>
<_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('9.0'))">9.0.101</_TargetingPackVersion>
<_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('10.0'))">**FromWorkload**</_TargetingPackVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -42,13 +45,14 @@ Copyright (c) Samsung All rights reserved.
<SupportedAPILevel Include="v10.0" MappedAPIVersion="7.0"/>
<SupportedAPILevel Include="v11.0" MappedAPIVersion="8.0"/>
<SupportedAPILevel Include="v12.0" MappedAPIVersion="9.0"/>
<SupportedAPILevel Include="v13.0" MappedAPIVersion="10.0"/>
</ItemGroup>

<ItemGroup>
<TizenSdkSupportedTargetPlatformVersion Include="6.5" />
<TizenSdkSupportedTargetPlatformVersion Include="7.0" />
<TizenSdkSupportedTargetPlatformVersion Include="8.0" />
<TizenSdkSupportedTargetPlatformVersion Include="9.0" />
<TizenSdkSupportedTargetPlatformVersion Include="10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions workload/src/Samsung.Tizen.Templates/tizen/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected override void OnCreate()

void Initialize()
{
Window.Instance.KeyEvent += OnKeyEvent;
Window.Default.KeyEvent += OnKeyEvent;

TextLabel text = new TextLabel("Hello Tizen") {
HorizontalAlignment = HorizontalAlignment.Center,
Expand All @@ -25,7 +25,7 @@ void Initialize()
HeightResizePolicy = ResizePolicyType.FillToParent,
WidthResizePolicy = ResizePolicyType.FillToParent
};
Window.Instance.GetDefaultLayer().Add(text);
Window.Default.GetDefaultLayer().Add(text);

Animation animation = new Animation(2000);
animation.AnimateTo(text, "Orientation", new Rotation(new Radian(new Degree(180.0f)), PositionAxis.X), 0, 500);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-tizen8.0</TargetFramework>
<TargetFramework>net8.0-tizen10.0</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">TizenApp1</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="com.companyname.TizenApp1" version="1.0.0">
<manifest xmlns="http://tizen.org/ns/packages" api-version="10" package="com.companyname.TizenApp1" version="1.0.0">
<profile name="common" />
<ui-application appid="com.companyname.TizenApp1"
exec="TizenApp1.dll"
Expand Down

0 comments on commit 830ddaf

Please sign in to comment.