Revert "[TFM] Update TizenFX TFM to net6.0 (#5360)"

This reverts commit 8f5b232.
Samsung · Aug 1, 2023 · 5dbd699 · 5dbd699
1 parent 0194e3e
commit 5dbd699
Show file tree

Hide file tree

Showing 446 changed files with 76,369 additions and 125,459 deletions.
diff --git a/build.sh b/build.sh
@@ -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() {

diff --git a/build/pack.csproj b/build/pack.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/internals/src/Tizen.Inspections/Tizen.Inspections.csproj b/internals/src/Tizen.Inspections/Tizen.Inspections.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/internals/src/Tizen.Peripheral/Tizen.Peripheral.csproj b/internals/src/Tizen.Peripheral/Tizen.Peripheral.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <!--
     <SupportedProfiles>mobile,wearable</SupportedProfiles>
     -->

diff --git a/internals/src/Tizen.Uix.VoiceControlWidget/Tizen.Uix.VoiceControlWidget.csproj b/internals/src/Tizen.Uix.VoiceControlWidget/Tizen.Uix.VoiceControlWidget.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
   </PropertyGroup>
 

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
@@ -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
 
@@ -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

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
@@ -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
 
@@ -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

diff --git a/packaging/depends/Tizen.NET.10.0.0.17744.nupkg b/packaging/depends/Tizen.NET.10.0.0.17744.nupkg
diff --git a/packaging/depends/Tizen.NET.API10.10.0.0.17744.nupkg b/packaging/depends/Tizen.NET.API10.10.0.0.17744.nupkg
diff --git a/packaging/depends/Tizen.NET.Internals.10.0.0.17744.nupkg b/packaging/depends/Tizen.NET.Internals.10.0.0.17744.nupkg
diff --git a/packaging/depends/microsoft.netcore.platforms.6.0.9.nupkg b/packaging/depends/microsoft.netcore.platforms.6.0.9.nupkg
diff --git a/packaging/depends/tizen.net.api10.10.0.0.17508.nupkg b/packaging/depends/tizen.net.api10.10.0.0.17508.nupkg
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
diff --git a/pkg/Tizen.NET.API11/Tizen.NET.API11.nuspec b/pkg/Tizen.NET.API11/Tizen.NET.API11.nuspec
@@ -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>
diff --git a/....API11/build/net6.0/Tizen.NET.API11.props → ...uild/netstandard2.0/Tizen.NET.API11.props b/....API11/build/net6.0/Tizen.NET.API11.props → ...uild/netstandard2.0/Tizen.NET.API11.props
diff --git a/...PI11/build/net6.0/Tizen.NET.API11.targets → ...ld/netstandard2.0/Tizen.NET.API11.targets b/...PI11/build/net6.0/Tizen.NET.API11.targets → ...ld/netstandard2.0/Tizen.NET.API11.targets
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_TizenNETCoreAppPackageVersion>6.0.9</_TizenNETCoreAppPackageVersion>
+    <_TizenNETCoreAppPackageVersion>3.0.0</_TizenNETCoreAppPackageVersion>
   </PropertyGroup>
 
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">