From 830ddafc0a2482fc6f98708d06274eaa894a17ce Mon Sep 17 00:00:00 2001 From: Jay Cho Date: Mon, 2 Dec 2024 18:36:13 +0900 Subject: [PATCH] Update Platform to Tizen 10.0 --- workload/build/Versions.props | 4 +- .../FixupNuGetReference.cs | 79 ------------------- .../data/PackageOverrides.txt | 3 + .../data/PlatformManifest.txt | 10 ++- workload/src/Samsung.Tizen.Ref/runtime.json | 69 ++++++++++++++++ .../targets/Samsung.Tizen.Sdk.NuGet.targets | 51 ------------ .../Samsung.Tizen.Sdk.Versions.targets | 16 ++-- .../src/Samsung.Tizen.Templates/tizen/Main.cs | 4 +- .../tizen/TizenApp1.csproj | 2 +- .../tizen/tizen-manifest.xml | 2 +- 10 files changed, 96 insertions(+), 144 deletions(-) delete mode 100644 workload/src/Samsung.Tizen.Build.Tasks/FixupNuGetReference.cs delete mode 100644 workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.NuGet.targets diff --git a/workload/build/Versions.props b/workload/build/Versions.props index 2f3d9858..d975b126 100644 --- a/workload/build/Versions.props +++ b/workload/build/Versions.props @@ -15,7 +15,7 @@ example: -preview.3.100+sha12345 --> - 8.0.155 + 10.0.101 - 11.0.0.18033 + 13.0.0.18552 - - - - - - - - - net8.0-tizen8.0; - net8.0-tizen7.0; - net7.0-tizen8.0; - net7.0-tizen7.0; - net6.0-tizen8.0; - net6.0-tizen7.0; - net6.0-tizen6.5; - tizen10.0; - tizen90; - tizen80; - tizen70; - tizen60; - tizen50; - tizen40; - $(PackageTargetFallback); - - - - - - - - - - - - - - - diff --git a/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets b/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets index 28cdd4ab..f30f40d8 100644 --- a/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets +++ b/workload/src/Samsung.Tizen.Sdk/targets/Samsung.Tizen.Sdk.Versions.targets @@ -13,8 +13,8 @@ Copyright (c) Samsung All rights reserved. - <_DefaultTargetPlatformVersion>7.0 - <_DefaultTargetPlatformVersion Condition="$(TargetFramework.StartsWith('net8.0'))">8.0 + <_DefaultTargetPlatformVersion>10.0 + <_DefaultTargetPlatformVersion Condition="$(TargetFramework.StartsWith('net8.0'))">10.0 @@ -23,9 +23,12 @@ Copyright (c) Samsung All rights reserved. <_TargetFramework Condition="$(TargetFramework.EndsWith('tizen'))">$(TargetFramework)$(_DefaultTargetPlatformVersion) <_TargetFramework Condition="!$(TargetFramework.EndsWith('tizen'))">$(TargetFramework) - - <_TargetingPackVersion>7.0.123 - <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('8.0'))">**FromWorkload** + + <_TargetingPackVersion>**FromWorkload** + <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('7.0'))">7.0.123 + <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('8.0'))">8.0.154 + <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('9.0'))">9.0.101 + <_TargetingPackVersion Condition="$(_TargetFramework.EndsWith('10.0'))">**FromWorkload** @@ -42,13 +45,14 @@ Copyright (c) Samsung All rights reserved. + - + diff --git a/workload/src/Samsung.Tizen.Templates/tizen/Main.cs b/workload/src/Samsung.Tizen.Templates/tizen/Main.cs index a5e9ea5e..8a7e38a7 100644 --- a/workload/src/Samsung.Tizen.Templates/tizen/Main.cs +++ b/workload/src/Samsung.Tizen.Templates/tizen/Main.cs @@ -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, @@ -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); diff --git a/workload/src/Samsung.Tizen.Templates/tizen/TizenApp1.csproj b/workload/src/Samsung.Tizen.Templates/tizen/TizenApp1.csproj index c4327b59..0948225e 100644 --- a/workload/src/Samsung.Tizen.Templates/tizen/TizenApp1.csproj +++ b/workload/src/Samsung.Tizen.Templates/tizen/TizenApp1.csproj @@ -1,6 +1,6 @@ - net8.0-tizen8.0 + net8.0-tizen10.0 TizenApp1 Exe diff --git a/workload/src/Samsung.Tizen.Templates/tizen/tizen-manifest.xml b/workload/src/Samsung.Tizen.Templates/tizen/tizen-manifest.xml index b5037951..b2642b7a 100644 --- a/workload/src/Samsung.Tizen.Templates/tizen/tizen-manifest.xml +++ b/workload/src/Samsung.Tizen.Templates/tizen/tizen-manifest.xml @@ -1,5 +1,5 @@ - +