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.

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] Support ColorVisual CutoutPolicy.Outside #6594

Open
wants to merge 49 commits into
base: DevelNUI
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
27baefc
[NUI] Support RemoveIdle API for NUIApplication + Use unified idler c…
Dec 18, 2024
ebe0dfa
[NUI] Create ImageVisual synchronously if AlphaMaskURL use generated …
Dec 17, 2024
1f8ff3f
[NUI] Add NUI FLUX friend assembly
dongsug-song Dec 31, 2024
76a9232
[Tizen.Applications] Fix wrong description
upple Dec 19, 2024
bca7e7e
[NUI] BindableObject creates property dictionary on demand
rabbitfor Dec 10, 2024
6db25cd
[NUI] Optimize static field of Color class
rabbitfor Dec 30, 2024
3fb564c
[NUI] Refactoring ControlState to use bitmask
everLEEst Dec 27, 2024
19d0c1b
[NUI.AIAvatar] Refactoring AI Avatar. (#6526)
AnglerLee Jan 6, 2025
936628d
[NUI] Do not re-create visual if we change only transform
Jan 6, 2025
41e193f
[NUI.Devel.Tests] Fix mis-implements for NativeImageSource TCT
Jan 7, 2025
76f9f6f
[NUI] version update (#6552)
lwc0917 Jan 7, 2025
795bb0c
[Tizen.Applications.RPCPort] Add new methods to support new types in …
pjh9216 Jan 1, 2025
168de42
[Build] Modified the RIDs sorted in descending order (#6539)
JongHeonChoi Jan 6, 2025
26739b8
[NUI] Add value type: color, vector2, shadow
rabbitfor Jan 6, 2025
8e706d5
[NUI] Fix exceptional All state case
everLEEst Jan 8, 2025
e414820
[NUI] Remove unnecessary PInvoke calls
Jan 6, 2025
9c6527f
[NUI] fix controlstate contains check null exceptions
everLEEst Jan 9, 2025
11ba430
[NUI] NUI Language version upgrade
everLEEst Jan 9, 2025
a25391b
[NUI] Reduce managed PropertyValue creation for VisualObject
Jan 6, 2025
6477ad3
[NUI] Remove unnecessary PInvoke calls
Jan 8, 2025
f0b7188
[NUI] remove unnecessary PInvoke calls related with axis
Jan 8, 2025
eed52d2
[NUI] Remove unnecessary PInvoke calls related with SlideTransitionDi…
Jan 8, 2025
56a8e6e
[NUI] Remove unused C# bindings anymore
Jan 9, 2025
756a062
[NUI] Fix wrong params order for ParentOrigin position
Jan 9, 2025
d00a0aa
[NUI] Check exception from native when get background color
rabbitfor Jan 9, 2025
f3d8f16
[NUI] add asynchronous tasked animation play
everLEEst Jan 8, 2025
636ca6a
[NUI] Update dp and sp extension methods and sp converting.
everLEEst Jan 6, 2025
3cdf4ea
[NUI] Add markup for some view properties using value type
rabbitfor Jan 8, 2025
f9daacc
[NUI] Preload static values
Jan 13, 2025
9b05a72
[NUI] Add value type: control state
rabbitfor Jan 6, 2025
714441a
[NUI] Rename State to ViewState
rabbitfor Jan 13, 2025
a3cc621
[NUI] Adds version tag or Hides deprecated APIs
bshsqa Jan 2, 2025
5a806be
[NUI] Handles null argument ControlState.Equals
rabbitfor Jan 14, 2025
2905747
[NUI] Version Update (22401)
Jan 14, 2025
60e31bc
[Build] modified the TFM sorted in descending order (#6549)
JongHeonChoi Jan 13, 2025
0b28dce
[NUI.WindowSystem] TizenShell: Enhance API description
juns-kim Oct 11, 2024
632c9f6
[NUI] Add IsAutoRotationEnabled, IsLetterBoxEnabled
JoogabYun Jan 9, 2025
e454853
[NUI] Notify property changed for the property methods using struct
rabbitfor Jan 15, 2025
c0d48f2
[NUI] Move markup methods to Tizen.NUI.Extension
rabbitfor Jan 16, 2025
38b534b
[NUI] Rename struct types
rabbitfor Jan 17, 2025
9258291
[NUI] Fix svace issue : infinite recursion
rabbitfor Jan 20, 2025
d513c79
[NUI] Version 22402
bshsqa Jan 21, 2025
2113cf9
Update document template for tizen.org (#6583)
shyunMin Jan 15, 2025
eeeedae
[Actions] Update Artifact actions v4 (#6576)
sung-su Jan 15, 2025
455b9e0
Update CODEOWNERS (#6563)
rookiejava Jan 16, 2025
b4ef959
[NUI] Make FrameUpdateCallback could use UIVector2 and UIColor
Jan 20, 2025
b946acc
[NUI] Fix GridLocations to preserve empty space for Stretch Expand
Jaehyun-Cho Jan 21, 2025
a5e9501
[NUI] Extract View variables for Layout to remove wasted memory
rabbitfor Dec 9, 2024
4e952ad
[NUI] Support ColorVisual CutoutPolicy.Outside
Jan 21, 2025
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
185 changes: 167 additions & 18 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,23 +1,172 @@
# TizenFX Code Owners.
# Add members who own directories and files for automatic Pull Request Reviewers.

# NUI Code Owners List
/src/Tizen.NUI/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI.Components/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/public/BaseComponents/Text*.cs @wonrst @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/public/Xaml/ @AdunFang @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/public/XamlBinding/ @AdunFang @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/internal/Xaml/ @AdunFang @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/internal/XamlBinding/ @AdunFang @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/src/Tizen.NUI/src/internal/EXaml/ @AdunFang @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/NUITestSample/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/NUITizenGallery/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.ComponentApplication/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.Samples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.SeamlessSamples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.StyleGuide/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.Tests/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.WebViewTest/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
/test/Tizen.NUI.WindowSystem.Samples/ @hyunjushin @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor @hinohie
# TIZEN COMMON
/src/Tizen/ @rookiejava @myroot @JoonghyunCho
/src/Tizen.Log/ @chanwoochoi
/src/Tizen.Tracer/ @najubae #@sfoon.kim

# ACCOUNT
/src/Tizen.Account.AccountManager/ @randeepsingh01 @d1-agarwal
/src/Tizen.Account.FidoClient/ @randeepsingh01 #@s01-verma
/src/Tizen.Account.OAuth2/ @randeepsingh01 #@s01-verma
/src/Tizen.Account.SyncManager/ @randeepsingh01 @d1-agarwal

# APPLICATION FW
# /src/Tizen.Applications.Alarm/ @kilig
# /src/Tizen.Applications.AttachPanel/ @engfaruque
/src/Tizen.Applications.Badge/ @sukhyungkang
/src/Tizen.Applications.Cion/ @jusung-son
/src/Tizen.Applications.Common/ @upple
/src/Tizen.Applications.ComponentBased.ComponentManager/ @upple
/src/Tizen.Applications.ComponentBased.Default/ @upple
/src/Tizen.Applications.ComponentBased.Port/ @upple
/src/Tizen.Applications.ComponentBased/ @upple
/src/Tizen.Applications.DataControl/ @jusung-son
/src/Tizen.Applications.EventManager/ @jusung-son
/src/Tizen.Applications.MessagePort/ @jusung-son
/src/Tizen.Applications.Notification/ @sukhyungkang
/src/Tizen.Applications.NotificationEventListener/ @sukhyungkang
/src/Tizen.Applications.PackageManager/ @jeremy-jang
/src/Tizen.Applications.Preference/ @sukhyungkang
/src/Tizen.Applications.RemoteView/ @sukhyungkang
/src/Tizen.Applications.Service/ @upple
/src/Tizen.Applications.Shortcut/ @sukhyungkang
/src/Tizen.Applications.ThemeManager/ @jeremy-jang
/src/Tizen.Applications.ToastMessage/ @sukhyungkang
/src/Tizen.Applications.UI/ @upple
/src/Tizen.Applications.WatchApplication/ @sukhyungkang
/src/Tizen.Applications.WatchfaceComplication/ @sukhyungkang
/src/Tizen.Applications.WidgetApplication/ @sukhyungkang
/src/Tizen.Applications.WidgetControl/ @sukhyungkang

# CONTENT
/src/Tizen.Content.Download/ @chleun-moon @SeonahMoon
/src/Tizen.Content.MediaContent/ @hsgwon @eunhaechoi
/src/Tizen.Content.MimeType/ @sukhyungkang

# CONTEXT
/src/Tizen.Context/ @dh79pyun

# DATA
# /src/Tizen.Data.Tdbc.Driver.Sqlite/
# /src/Tizen.Data.Tdbc/

# LOCATIONS & MAPS
/src/Tizen.Location.Geofence/ @randeepsingh01 #@abhimanyu1dots
/src/Tizen.Location/ @randeepsingh01 #@abhimanyu1dots
/src/Tizen.Maps/ @randeepsingh01 #@abhimanyu1dots

# MACHINE LEARNING
/src/Tizen.MachineLearning.Inference/ @again4you
/src/Tizen.MachineLearning.Train/ @again4you

# MESSAGING
/src/Tizen.Messaging.Push/ @randeepsingh01
/src/Tizen.Messaging/ @randeepsingh01

# MULTIMEDIA FW
/src/Tizen.Multimedia/ @hsgwon @sangchul1011 @eunhaechoi
/src/Tizen.Multimedia.AudioIO/ @hsgwon @sangchul1011 @eunhaechoi
/src/Tizen.Multimedia.Camera/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.MediaCodec/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.MediaPlayer/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Metadata/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Radio/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Recorder/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Remoting/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Util/ @hsgwon @eunhaechoi
/src/Tizen.Multimedia.Vision/ @hsgwon @tyoungroy

# UI FW (NUI)
/src/Tizen.NUI.Components.Design/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Components/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Design/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Extension/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Gadget/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Physics2D/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Scene3D/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.Wearable/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.WindowSystem/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI.XamlBuild/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/src/Tizen.NUI/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/NUITestSample/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/NUITizenGallery/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.ComponentApplication/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.Samples/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.SeamlessSamples/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.StyleGuide/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.Tests/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.WebViewTest/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor
/test/Tizen.NUI.WindowSystem.Samples/ @dongsug-song @Seoyeon2Kim @taehyub @jaehyun0cho @everLEEst @rabbitfor

# NETWORK
/src/Tizen.Network.Bluetooth/ @dh79pyun @wootak-jung
/src/Tizen.Network.Connection/ @chleun-moon
/src/Tizen.Network.IoTConnectivity/ @dh79pyun
/src/Tizen.Network.Nfc/ @dh79pyun #@jh8801jung
/src/Tizen.Network.Nsd/ @chleun-moon
/src/Tizen.Network.Smartcard/ @dh79pyun #@jh8801jung
/src/Tizen.Network.Stc/ @jeik01 #@hyunuk-tak
/src/Tizen.Network.WiFi/ @chleun-moon
# /src/Tizen.Network.WiFiDirect/ @jiung-yu

# NLP
/src/Tizen.Nlp/ @imfine98 @Inhong

# PIMS
/src/Tizen.PhonenumberUtils/ @randeepsingh01
/src/Tizen.Pims.Calendar/ @randeepsingh01
/src/Tizen.Pims.Contacts/ @randeepsingh01

# SECURITY
/src/Tizen.Security/ @terry2000s #@t-swierczek
/src/Tizen.Security.PrivacyPrivilegeManager/ @terry2000s #@t-swierczek @z-abramowska @e-borowski
/src/Tizen.Security.SecureRepository/ @terry2000s @dmichaluk
# /src/Tizen.Security.WebAuthn/ @ds73.lee @kjackiewicz

# SECURITY (Deprecated)
/src/Tizen.Security.DevicePolicyManager/ @y01k
/src/Tizen.Security.TEEC/ @terry2000s #@kjackiewicz

# SENSOR
/src/Tizen.Sensor/ @chanwoochoi @SangyounKwak

# SYSTEM
/src/Tizen.System/ @chanwoochoi @germonado
/src/Tizen.System.Feedback/ @chanwoochoi @germonado
/src/Tizen.System.Information/ @chanwoochoi @ppdl
/src/Tizen.System.MediaKey/ @sukhyungkang
/src/Tizen.System.PlatformConfig/ @chanwoochoi @ppdl
/src/Tizen.System.PowerUsage/ @chanwoochoi
/src/Tizen.System.Resource/ @chanwoochoi @ul24 @SangyounKwak
/src/Tizen.System.Session/ @chanwoochoi
/src/Tizen.System.Storage/ @chanwoochoi @ul24
/src/Tizen.System.SystemSettings/ @jinwangan
/src/Tizen.System.Usb/ @chanwoochoi @ppdl

# TELEPHONY
/src/Tizen.Telephony/ @dh79pyun @wootak-jung

# UIX
/src/Tizen.Uix.InputMethod/ @imfine98 @Inhong
/src/Tizen.Uix.InputMethodManager/ @imfine98 @Inhong
/src/Tizen.Uix.Sticker/ @imfine98 @Inhong
/src/Tizen.Uix.Stt/ @urmain @syeonholic
/src/Tizen.Uix.SttEngine/ @urmain @syeonholic
/src/Tizen.Uix.Tts/ @urmain @syeonholic
/src/Tizen.Uix.TtsEngine/ @urmain @syeonholic
/src/Tizen.Uix.VoiceControl/ @urmain @syeonholic
/src/Tizen.Uix.VoiceControlManager/ @urmain @syeonholic

# ELMSHARP (Deprecated)
/src/ElmSharp.Wearable/ @rookiejava @myroot @JoonghyunCho
/src/ElmSharp/ @rookiejava @myroot @JoonghyunCho

# Internals
# /src/Tizen.AIAvatar
# /src/Tizen.Data.Tdbc.Driver.Sqlite
# /src/Tizen.Data.Tdbc
# /src/Tizen.NUI.AIAvatar

# Please Add more Code Owners below.
9 changes: 6 additions & 3 deletions .github/workflows/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@ jobs:
-- print --format=json --include-hidden \
-o Artifacts/api.json Artifacts/bin/public/

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: reports
if-no-files-found: ignore
path: Artifacts/*.json
overwrite : true

check-api:
needs: [build]
Expand All @@ -73,10 +74,11 @@ jobs:
dotnet-version: 3.1.x

- name: Download Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: reports
path: Artifacts
overwrite: true

- name: Checkout to base spec
uses: actions/checkout@v3
Expand Down Expand Up @@ -109,7 +111,8 @@ jobs:
base-file: Artifacts/base-api.json
output: Artifacts/api-comp.json

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: reports
path: Artifacts/api-comp.json
overwrite: true
8 changes: 6 additions & 2 deletions .github/workflows/deploy-documents-for-tizen-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
key: ${{ env.CACHE_NAME }}-${{ hashFiles('repos/commits') }}

- name: Build Documents
env:
DOCFX_FILE: "docfx_tizen_docs.json"
if: steps.cache-site.outputs.cache-hit != 'true'
run: |
./build.sh restore
Expand All @@ -44,19 +46,21 @@ jobs:
cp .gitattributes _site/
tar cfz site.tar.gz _site/

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: documents
path: site.tar.gz
overwrite: true

deploy:
needs: [build]
runs-on: ubuntu-20.04

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: documents
overwrite: true

- name: Extract Artifacts
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/deploy-documents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,21 @@ jobs:
- name: Archive Artifacts
run: |
tar cfz site.tar.gz _site/
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: documents
path: site.tar.gz
overwrite: true

deploy:
needs: [build]
runs-on: ubuntu-20.04

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: documents
overwrite: true

- name: Extract Artifacts
run: |
Expand Down
4 changes: 2 additions & 2 deletions packaging/csapi-tizenfx.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Auto-generated from csapi-tizenfx.spec.in by makespec.sh

%define TIZEN_NET_API_VERSION 13
%define TIZEN_NET_RPM_VERSION 13.0.0.999+nui22354
%define TIZEN_NET_RPM_VERSION 13.0.0.999+nui22402
%define TIZEN_NET_NUGET_VERSION 13.0.0.99999

%define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
Expand All @@ -13,7 +13,7 @@
%define DOTNET_NUGET_SOURCE /nuget

%define TIZEN_NET_RUNTIME_IDENTIFIERS 10.0.0:9.0.0:8.0.0:7.0.0:6.5.0:6.0.0:5.5.0:5.0.0:4.0.0
%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS net8.0-tizen10.0:net6.0-tizen9.0:net6.0-tizen8.0:net6.0-tizen:net6.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40
%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS net8.0-tizen10.0:net8.0-tizen:net8.0:net6.0-tizen9.0:net6.0-tizen8.0:net6.0-tizen:net6.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40

%define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts

Expand Down
5 changes: 4 additions & 1 deletion packaging/makerid.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
runtime_dir = os.path.join(scrpit_dir, "../pkg/Tizen.NET/runtime.json")
spec_dir = os.path.join(scrpit_dir, "csapi-tizenfx.spec")

def parse_rid_as_int(rid):
return [int(part) for part in rid.split(".")]

with open(runtime_dir) as json_file:
json_data = json.load(json_file)
json_string = json_data["runtimes"]
Expand All @@ -23,7 +26,7 @@
rid_list.append(key)

rid_list = list(set(rid_list))
rid_list.sort(reverse=True)
rid_list = sorted(rid_list, key=parse_rid_as_int, reverse=True)

f = open(spec_dir,'r')
origin_data = f.read()
Expand Down
18 changes: 7 additions & 11 deletions packaging/maketfm.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@

tfm_list1 = [] #tizen90, tizen80, tizen70, tizen60, tizen50, tizen40
tfm_list2 = [] #tizen10.0
tfm_list3 = [] #net6.0-tizen9.0, net6.0-tizen8.0, net6.0-tizen, net6.0
tfm_list3 = [] #net8.0-tizen10.0, net8.0-tizen, net8.0, net6.0-tizen9.0, net6.0-tizen8.0, net6.0-tizen, net6.0

def sort_tfm(tfm):
tfm = list(set(tfm))
return sorted(tfm, reverse=True)

for meta_child in root.iter():
if meta_child.tag == "{http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd}metadata":
for depen_child in meta_child:
Expand All @@ -26,16 +31,7 @@
tfm_list3.append(tfm.strip() + "-tizen")
tfm_list3.append(tfm.strip())


tfm_list1 = list(set(tfm_list1))
tfm_list1.sort(reverse=True)
tfm_list2 = list(set(tfm_list2))
tfm_list2.sort(reverse=True)
tfm_list3 = list(set(tfm_list3))
tfm_list3.sort(key=len)
tfm_list3.sort(key=lambda s: float(re.search(r'(\d+)\.', s).group()[0]))
tfm_list3.reverse()
tfm_list = tfm_list3 + tfm_list2 + tfm_list1
tfm_list = sort_tfm(tfm_list3) + sort_tfm(tfm_list2) + sort_tfm(tfm_list1)

f = open(spec_dir,'r')
origin_data = f.read()
Expand Down
2 changes: 1 addition & 1 deletion packaging/version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ RPM_VERSION=13.0.0.999
NUGET_VERSION=13.0.0.99999

# RPM Version Suffix
RPM_VERSION_SUFFIX=nui22354
RPM_VERSION_SUFFIX=nui22402
12 changes: 8 additions & 4 deletions pkg/Tizen.NET/Tizen.NET.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,18 @@
<dependency id="Tizen.NET.API12" version="12.0.0.18510" />
<dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
</group>
<group targetFramework="net8.0-tizen10.0">
<dependency id="Tizen.NET.API13" version="$fxversion$" />
<dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
</group>
<group targetFramework="net6.0">
<dependency id="Tizen.NET.API12" version="12.0.0.18510" />
<dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
</group>
<group targetFramework="net8.0-tizen10.0">
<dependency id="Tizen.NET.API13" version="$fxversion$" />
<dependency id="Microsoft.NETCore.Platforms" version="8.0.11" />
</group>
<group targetFramework="net8.0">
<dependency id="Tizen.NET.API13" version="$fxversion$" />
<dependency id="Microsoft.NETCore.Platforms" version="8.0.11" />
</group>
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 0 additions & 2 deletions src/Tizen.AIAvatar/Tizen.AIAvatar.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<ProjectReference Include="..\Tizen\Tizen.csproj" />
<ProjectReference Include="..\Tizen.Log\Tizen.Log.csproj" />
<ProjectReference Include="..\Tizen.Uix.Tts\Tizen.Uix.Tts.csproj" />
Expand All @@ -16,7 +15,6 @@
<ProjectReference Include="..\Tizen.MachineLearning.Inference\Tizen.MachineLearning.Inference.csproj" />
<ProjectReference Include="..\Tizen.Multimedia.AudioIO\Tizen.Multimedia.AudioIO.csproj" />
<ProjectReference Include="..\Tizen.Security\Tizen.Security.csproj" />
<ProjectReference Include="..\Tizen.Security.PrivacyPrivilegeManager\Tizen.Security.PrivacyPrivilegeManager.csproj" />
</ItemGroup>


Expand Down
Loading
Loading