Merge branch 'master' into api12.MediaController.FixCrash.request_id

Samsung · Jan 2, 2024 · 3d75880 · 3d75880
2 parents c85959e + 31a0c37
commit 3d75880
Show file tree

Hide file tree

Showing 199 changed files with 5,769 additions and 833 deletions.
diff --git a/.github/workflows/deploy-documents-for-tizen-docs.yml b/.github/workflows/deploy-documents-for-tizen-docs.yml
@@ -15,7 +15,8 @@ jobs:
   build:
     runs-on: [self-hosted, linux, x64]
     container:
-      image: tizendotnet/tizenfx-build-worker:2.0
+      image: tizendotnet/tizenfx-build-worker:2.4
+      options: --ulimit nofile=10240:10240
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/deploy-documents.yml b/.github/workflows/deploy-documents.yml
@@ -10,7 +10,8 @@ jobs:
   build:
     runs-on: [self-hosted, linux, x64]
     container:
-      image: tizendotnet/tizenfx-build-worker:2.0
+      image: tizendotnet/tizenfx-build-worker:2.4
+      options: --ulimit nofile=10240:10240
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/deploy-packages.yml b/.github/workflows/deploy-packages.yml
@@ -71,16 +71,13 @@ jobs:
         git tag -fa "v$VERSION" -m "Release $VERSION"
         git push -f --tags origin refs/tags/"v$VERSION"
 
-    - name: Install Github Package Registry Tool
-      if: github.event.inputs.deploy_to_gpr == 'true'
-      run: dotnet tool install --global --no-cache gpr
-
     - name: Deploy NuGet packages to Github Packages Registry
       if: github.event.inputs.deploy_to_gpr == 'true'
+      env:
+        PACKAGES_SOURCE: https://nuget.pkg.github.com/Samsung/index.json
+        APIKEY: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gpr push --api-key ${{ secrets.GITHUB_TOKEN }} \
-                 --repository ${{ github.repository }} \
-                 --retries 3 Artifacts/*.nupkg
+        dotnet nuget push Artifacts/*.nupkg -k $APIKEY -s $PACKAGES_SOURCE -t 3000
 
     - name: Deploy NuGet packages to MyGet
       if: github.event.inputs.deploy_to_myget == 'true'

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ TizenFX API, which allows you to access platform-specific features not covered b
 | Branch | API Level | Target Framework | API Reference | Platform          | myget.org | nuget.org  |
 |--------|:---------:|------------------|---------------|-------------------|-----------|------------|
 |master  | 12        | net6.0-tizen9.0 | [Link](https://samsung.github.io/TizenFX/master/) | Tizen vNext | [![api12_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API12.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) |  |
-|API11   | 11        | net6.0-tizen8.0 | [Link](https://samsung.github.io/TizenFX/API11/) | Tizen 8.0 | [![api11_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API11.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) |  |
+|API11   | 11        | net6.0-tizen8.0 | [Link](https://samsung.github.io/TizenFX/API11/) | Tizen 8.0 | [![api11_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API11.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | ![api11_nuget](https://img.shields.io/nuget/v/Tizen.NET.API11.svg)
 |API10   | 10        | tizen10.0 | [Link](https://samsung.github.io/TizenFX/API10/) | Tizen 7.0 | [![api10_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API10.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api10_nuget](https://img.shields.io/nuget/v/Tizen.NET.API10.svg)](https://www.nuget.org/packages/Tizen.NET/) |
 |API9    | 9         | tizen90   | [Link](https://samsung.github.io/TizenFX/API9/) | Tizen 6.5 | [![api9_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API9.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api9_nuget](https://img.shields.io/nuget/v/Tizen.NET.API9.svg)](https://www.nuget.org/packages/Tizen.NET/) |
 |API8    | 8         | tizen80   | [Link](https://samsung.github.io/TizenFX/API8/) | Tizen 6.0 | [![api8_myget](https://img.shields.io/tizen.myget/dotnet/vpre/Tizen.NET.API8.svg)](https://tizen.myget.org/feed/dotnet/package/nuget/Tizen.NET) | [![api8_nuget](https://img.shields.io/nuget/v/Tizen.NET.API8.svg)](https://www.nuget.org/packages/Tizen.NET/) |

diff --git a/packaging/500.tizenfx_upgrade.sh b/packaging/500.tizenfx_upgrade.sh
@@ -4,5 +4,5 @@
 PATH=/bin:/usr/bin
 
 vconftool set -f -t int db/dotnet/tizen_api_version 12
-vconftool set -f -t string db/dotnet/tizen_rid_version "4.0.0:5.0.0:5.5.0:6.0.0:6.5.0:7.0.0:8.0.0:9.0.0"
-vconftool set -f -t string db/dotnet/tizen_tfm_support "net6.0-tizen9.0:net6.0-tizen8.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40"
+vconftool set -f -t string db/dotnet/tizen_rid_version "9.0.0:8.0.0:7.0.0:6.5.0:6.0.0:5.5.0:5.0.0:4.0.0"
+vconftool set -f -t string db/dotnet/tizen_tfm_support "net6.0-tizen9.0:net6.0-tizen8.0:net6.0-tizen:net6.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40"
diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
@@ -1,19 +1,19 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 12
-%define TIZEN_NET_RPM_VERSION 12.0.0.999+nui22249
+%define TIZEN_NET_RPM_VERSION 12.0.0.999+nui22304
 %define TIZEN_NET_NUGET_VERSION 12.0.0.99999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
 %define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res
 %define DOTNET_TOOLS_PATH /usr/share/dotnet.tizen/tools
 %define DOTNET_PRELOAD_PATH /usr/share/dotnet.tizen/preload
+%define DOTNET_LIBRARY_PATH /usr/share/dotnet.tizen/lib
 %define DOTNET_NUGET_SOURCE /nuget
 
-%define TIZEN_NET_RUNTIME_IDENTIFIERS 4.0.0:5.0.0:5.5.0:6.0.0:6.5.0:7.0.0:8.0.0:9.0.0
-%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS net6.0-tizen9.0:net6.0-tizen8.0:tizen11.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40
-%define DOTNET_CORE_RUNTIME_VERSION 6.0
+%define TIZEN_NET_RUNTIME_IDENTIFIERS 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 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
 
@@ -218,9 +218,10 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_
 %post
 /usr/bin/vconftool set -t int db/dotnet/tizen_api_version %{TIZEN_NET_API_VERSION} -f
 /usr/bin/vconftool set -t string db/dotnet/tizen_api_path %{DOTNET_ASSEMBLY_PATH} -f
-/usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f
-/usr/bin/vconftool set -t string db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS} -f
-/usr/bin/vconftool set -t string db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION} -f
+mkdir -p %{DOTNET_LIBRARY_PATH}
+touch %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
+echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
+echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
 
 %files
 %license LICENSE

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
@@ -8,11 +8,11 @@
 %define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res
 %define DOTNET_TOOLS_PATH /usr/share/dotnet.tizen/tools
 %define DOTNET_PRELOAD_PATH /usr/share/dotnet.tizen/preload
+%define DOTNET_LIBRARY_PATH /usr/share/dotnet.tizen/lib
 %define DOTNET_NUGET_SOURCE /nuget
 
 %define TIZEN_NET_RUNTIME_IDENTIFIERS @rid_version@
 %define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS @tfm_support@
-%define DOTNET_CORE_RUNTIME_VERSION @dotnet_core_version@
 
 %define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts
 
@@ -217,9 +217,10 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_
 %post
 /usr/bin/vconftool set -t int db/dotnet/tizen_api_version %{TIZEN_NET_API_VERSION} -f
 /usr/bin/vconftool set -t string db/dotnet/tizen_api_path %{DOTNET_ASSEMBLY_PATH} -f
-/usr/bin/vconftool set -t string db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS} -f
-/usr/bin/vconftool set -t string db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS} -f
-/usr/bin/vconftool set -t string db/dotnet/runtime_version %{DOTNET_CORE_RUNTIME_VERSION} -f
+mkdir -p %{DOTNET_LIBRARY_PATH}
+touch %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
+echo "db/dotnet/tizen_rid_version %{TIZEN_NET_RUNTIME_IDENTIFIERS}" > %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
+echo "db/dotnet/tizen_tfm_support %{TIZEN_NET_TARGET_FRAMEWORK_MONIKERS}" >> %{DOTNET_LIBRARY_PATH}/dotnet_resolving.info
 
 %files
 %license LICENSE

diff --git a/packaging/makerid.py b/packaging/makerid.py
@@ -23,7 +23,7 @@
             rid_list.append(key)
 
     rid_list = list(set(rid_list))
-    rid_list.sort()
+    rid_list.sort(reverse=True)
 
     f = open(spec_dir,'r')
     origin_data = f.read()

diff --git a/packaging/makeruntimeversion.py b/packaging/makeruntimeversion.py
diff --git a/packaging/makespec.sh b/packaging/makespec.sh
@@ -30,6 +30,3 @@ python $SCRIPT_DIR/makerid.py
 
 # Update TFM
 python $SCRIPT_DIR/maketfm.py
-
-# Update Runtime Version
-python $SCRIPT_DIR/makeruntimeversion.py
diff --git a/packaging/maketfm.py b/packaging/maketfm.py
@@ -1,4 +1,4 @@
-import os
+import os, re
 import xml.etree.ElementTree as ET
 
 scrpit_dir = os.path.dirname(os.path.abspath(__file__))
@@ -7,8 +7,9 @@
 tree = ET.parse(nuspec_file)
 root = tree.getroot()
 
-tfm_list1 = []
-tfm_list2 = []
+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
 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:
@@ -20,12 +21,21 @@
                             tfm_list1.append(tfm.replace(".", "").strip())
                         else:
                             tfm_list2.append(tfm.strip())
+                    elif tfm.startswith("net"):
+                        if len(tfm) < 8:
+                            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_list = tfm_list2 + tfm_list1
+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
 
 f = open(spec_dir,'r')
 origin_data = f.read()

diff --git a/packaging/version.txt b/packaging/version.txt
@@ -6,4 +6,4 @@ RPM_VERSION=12.0.0.999
 NUGET_VERSION=12.0.0.99999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui22249
+RPM_VERSION_SUFFIX=nui22304
diff --git a/pkg/Tizen.NET/Tizen.NET.nuspec b/pkg/Tizen.NET/Tizen.NET.nuspec
@@ -40,19 +40,19 @@
         <dependency id="Tizen.NET.API10" version="10.0.0.17508" />
         <dependency id="Microsoft.NETCore.Platforms" version="3.1.0" />
       </group>
-      <group targetFramework="Tizen11.0">
-        <dependency id="Tizen.NET.API11" version="$fxversion$" />
-        <dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
-      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Tizen.NET.API10" version="10.0.0.17508" />
         <dependency id="Microsoft.NETCore.Platforms" version="3.1.0" />
       </group>
-      <group targetFramework=".NET6.0">
+      <group targetFramework="net6.0-tizen8.0">
         <dependency id="Tizen.NET.API11" version="11.0.0.18030" />
         <dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
       </group>
-      <group targetFramework=".NET6.0">
+      <group targetFramework="net6.0-tizen9.0">
+        <dependency id="Tizen.NET.API12" version="$fxversion$" />
+        <dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
+      </group>
+      <group targetFramework="net6.0">
         <dependency id="Tizen.NET.API12" version="$fxversion$" />
         <dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
       </group>