Merge remote-tracking branch 'origin/master' into tizen

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index b574217..4da230c 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -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+nui22251
-%define TIZEN_NET_NUGET_VERSION 12.0.0.99999
+%define TIZEN_NET_RPM_VERSION 12.0.0.18114+nui22251
+%define TIZEN_NET_NUGET_VERSION 12.0.0.18114
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref