Skip to content

Commit

Permalink
Update API13 (#6479)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoonghyunCho authored Nov 27, 2024
1 parent d51bbe6 commit 1e1c08d
Show file tree
Hide file tree
Showing 295 changed files with 54 additions and 21 deletions.
8 changes: 7 additions & 1 deletion .github/branch-metadata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
master:
api-level: API13
labels: [ API13 ]
tizen-branch: tizen
version-prefix: 13.0.0

API12:
api-level: API12
labels: [ API12 ]
tizen-branch: tizen
tizen-branch: tizen_9.0
version-prefix: 12.0.0

API11:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
TARGET_BRANCHES: 'master API11 API10'
TARGET_BRANCHES: 'master API12 API11'

jobs:
nightly:
Expand Down
6 changes: 3 additions & 3 deletions packaging/500.tizenfx_upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

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 "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"
vconftool set -f -t int db/dotnet/tizen_api_version 13
vconftool set -f -t string db/dotnet/tizen_rid_version "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"
vconftool set -f -t string db/dotnet/tizen_tfm_support "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"
10 changes: 5 additions & 5 deletions packaging/csapi-tizenfx.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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+nui22351
%define TIZEN_NET_NUGET_VERSION 12.0.0.99999
%define TIZEN_NET_API_VERSION 13
%define TIZEN_NET_RPM_VERSION 13.0.0.999+nui22350
%define TIZEN_NET_NUGET_VERSION 13.0.0.99999

%define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
%define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
Expand All @@ -12,8 +12,8 @@
%define DOTNET_LIBRARY_PATH /usr/share/dotnet.tizen/lib
%define DOTNET_NUGET_SOURCE /nuget

%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 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 UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts

Expand Down
Binary file not shown.
6 changes: 3 additions & 3 deletions packaging/version.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Tizen .NET API Level
API_VERSION=12
API_VERSION=13

# Default Versions (will be replaced by CI)
RPM_VERSION=12.0.0.999
NUGET_VERSION=12.0.0.99999
RPM_VERSION=13.0.0.999
NUGET_VERSION=13.0.0.99999

# RPM Version Suffix
RPM_VERSION_SUFFIX=nui22351
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Tizen.NET.API12</id>
<id>Tizen.NET.API13</id>
<version>$fxversion$</version>
<authors>Samsung Electronics</authors>
<owners>Samsung Electronics</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://www.tizen.org/</projectUrl>
<iconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</iconUrl>
<description>Reference assemblies of Tizen .NET API Level 12.</description>
<description>Reference assemblies of Tizen .NET API Level 13.</description>
<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
</metadata>
<files>
<file src="pkg\Tizen.NET.API12\build\**" target="build" />
<file src="pkg\Tizen.NET.API12\design\*.dll" target="ref\net6.0\Design" />
<file src="pkg\Tizen.NET.API12\xamlbuild\**" target="buildTransitive" />
<file src="pkg\Tizen.NET.API13\build\**" target="build" />
<file src="pkg\Tizen.NET.API13\design\*.dll" target="ref\net6.0\Design" />
<file src="pkg\Tizen.NET.API13\xamlbuild\**" target="buildTransitive" />
<file src="Artifacts\bin\dummy\*.dll" target="ref\net6.0" />
<file src="Artifacts\bin\public\*.xml" target="ref\net6.0" />
</files>
Expand Down
8 changes: 6 additions & 2 deletions pkg/Tizen.NET/Tizen.NET.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,15 @@
<dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
</group>
<group targetFramework="net6.0-tizen9.0">
<dependency id="Tizen.NET.API12" version="$fxversion$" />
<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="$fxversion$" />
<dependency id="Tizen.NET.API12" version="12.0.0.18510" />
<dependency id="Microsoft.NETCore.Platforms" version="6.0.9" />
</group>
</dependencies>
Expand Down
File renamed without changes.
23 changes: 23 additions & 0 deletions pkg/Tizen.NET/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,29 @@
"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"
]
}
}
}
2 changes: 1 addition & 1 deletion test/NUITizenGallery/NUITizenGallery.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
</PropertyGroup>

<ImportGroup>
<Import Project="..\..\pkg\Tizen.NET.API12\xamlbuild\Tizen.NUI.XamlBuild.targets" />
<Import Project="..\..\pkg\Tizen.NET.API13\xamlbuild\Tizen.NUI.XamlBuild.targets" />
</ImportGroup>
</Project>

0 comments on commit 1e1c08d

Please sign in to comment.