Skip to content

Commit

Permalink
Revert "[TFM] Update TizenFX TFM to net6.0 (#5360)" (#5436)
Browse files Browse the repository at this point in the history
This reverts commit 8f5b232.
  • Loading branch information
JoonghyunCho authored Aug 1, 2023
1 parent 0194e3e commit d517215
Show file tree
Hide file tree
Showing 446 changed files with 76,369 additions and 125,459 deletions.
3 changes: 0 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,8 @@ cmd_dummy_build() {
exit 1
fi
mkdir -p $OUTDIR/bin/dummy
CACHE=`pwd`
cd $OUTDIR/bin/dummy
dotnet $SCRIPT_DIR/tools/bin/APITool.dll \
dummy $OUTDIR/bin/public/ref $OUTDIR/bin/dummy
cd $CACHE
}

cmd_pack() {
Expand Down
2 changes: 1 addition & 1 deletion build/pack.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion internals/src/Tizen.Inspections/Tizen.Inspections.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion internals/src/Tizen.Peripheral/Tizen.Peripheral.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<!--
<SupportedProfiles>mobile,wearable</SupportedProfiles>
-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
</PropertyGroup>

Expand Down
6 changes: 2 additions & 4 deletions packaging/csapi-tizenfx.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
%define DOTNET_PRELOAD_PATH /usr/share/dotnet.tizen/preload
%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
%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS tizen11.0:tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40
%define DOTNET_CORE_RUNTIME_VERSION 6.0
%define TIZEN_NET_RUNTIME_IDENTIFIERS 4.0.0:5.0.0:5.5.0:6.0.0:6.5.0:7.0.0
%define TIZEN_NET_TARGET_FRAMEWORK_MONIKERS tizen10.0:tizen90:tizen80:tizen70:tizen60:tizen50:tizen40

%define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts

Expand Down Expand Up @@ -220,7 +219,6 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_
/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

%files
%license LICENSE
Expand Down
2 changes: 0 additions & 2 deletions packaging/csapi-tizenfx.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

%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

Expand Down Expand Up @@ -219,7 +218,6 @@ install -p -m 755 packaging/500.tizenfx_upgrade.sh %{buildroot}%{UPGRADE_SCRIPT_
/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

%files
%license LICENSE
Expand Down
Binary file removed packaging/depends/Tizen.NET.10.0.0.17744.nupkg
Binary file not shown.
Binary file removed packaging/depends/Tizen.NET.API10.10.0.0.17744.nupkg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed packaging/depends/tizen.net.api10.10.0.0.17508.nupkg
Binary file not shown.
32 changes: 0 additions & 32 deletions packaging/makeruntimeversion.py

This file was deleted.

3 changes: 0 additions & 3 deletions packaging/makespec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ python $SCRIPT_DIR/makerid.py

# Update TFM
python $SCRIPT_DIR/maketfm.py

# Update Runtime Version
python $SCRIPT_DIR/makeruntimeversion.py
Empty file modified packaging/maketfm.py
100755 → 100644
Empty file.
6 changes: 3 additions & 3 deletions pkg/Tizen.NET.API11/Tizen.NET.API11.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
</metadata>
<files>
<file src="pkg\Tizen.NET.API11\build\**" target="build" />
<file src="pkg\Tizen.NET.API11\design\*.dll" target="ref\net6.0\Design" />
<file src="pkg\Tizen.NET.API11\design\*.dll" target="ref\netstandard2.0\Design" />
<file src="pkg\Tizen.NET.API11\xamlbuild\**" target="buildTransitive" />
<file src="Artifacts\bin\dummy\*.dll" target="ref\net6.0" />
<file src="Artifacts\bin\public\*.xml" target="ref\net6.0" />
<file src="Artifacts\bin\dummy\*.dll" target="ref\netstandard2.0" />
<file src="Artifacts\bin\public\*.xml" target="ref\netstandard2.0" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<_TizenNETCoreAppPackageVersion>6.0.9</_TizenNETCoreAppPackageVersion>
<_TizenNETCoreAppPackageVersion>3.0.0</_TizenNETCoreAppPackageVersion>
</PropertyGroup>

<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
Expand Down
Loading

0 comments on commit d517215

Please sign in to comment.