Release 4.0.0-preview1-00218

Change-Id: I77056afc4e9df8d6506af5d7fced7230eec2bc24

diff --git a/.gitwork/publish.sh b/.gitwork/publish.sh
deleted file mode 100755 (executable)
index ee98d58..0000000
--- a/.gitwork/publish.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-SCRIPT_FILE=$(readlink -f $0)
-SCRIPT_DIR=$(dirname $SCRIPT_FILE)
-ROOT_DIR=$(readlink -f $SCRIPT_DIR/..)
-BIN_DIR=$ROOT_DIR/Artifacts
-VERSION_FILE=$BIN_DIR/Version.txt
-
-# Prepare
-git rm -fr $BIN_DIR
-rm -fr $BIN_DIR
-mv $ROOT_DIR/temp $BIN_DIR
-git add $BIN_DIR
-
-# Check changes
-CHK=$(git diff --cached -- $VERSION_FILE | wc -l)
-if [ $CHK -eq 0 ]; then
-  echo "No Changes, Skip!!"
-       exit 0
-fi
-
-PACKAGE_FILE=$ROOT_DIR/packaging/csapi-tizenfx.spec
-PACKAGE_IN_FILE=$PACKAGE_FILE.in
-
-GetValue() {
-       cat $VERSION_FILE | grep $1 | cut -d: -f2 | sed 's/\r$//'
-}
-
-VERSION_PREFIX=$(GetValue Prefix)
-VERSION_SUFFIX=$(GetValue Suffix)
-VERSION_BUILD_NUMBER=$(GetValue Number)
-VERSION_VCS=$(GetValue VCS)
-VERSION_STRING="$VERSION_PREFIX-$VERSION_SUFFIX"
-
-# Make .spec file with rpm_version
-RPM_VERSION="$VERSION_PREFIX.$VERSION_BUILD_NUMBER"
-sed -e "s/%rpm_version%/$RPM_VERSION/g" $PACKAGE_IN_FILE > $PACKAGE_FILE
-
-# Git Works
-git config user.email "dotnetbuild.tizen@gmail.com"
-git config user.name "DotnetBuild"
-
-git add $ROOT_DIR/packaging
-
-git fetch origin master
-git rm -fr src
-git rm -fr pkg
-git rm -fr build
-git rm -fr tools
-git checkout $VERSION_VCS -- src 
-git checkout $VERSION_VCS -- pkg
-git checkout $VERSION_VCS -- build
-git checkout $VERSION_VCS -- tools
-git checkout $VERSION_VCS -- build.sh
-
-git commit -m "Release $VERSION_STRING"
-
-git push origin tizen
-

diff --git a/build.sh b/build.sh
index 359af21..66ecec2 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ usage() {
   echo "        -b, --build [module]  Build a module"
   echo "        -f, --full            Build all modules in src/ directory"
   echo "        -d, --dummy           Build dummy modules"
-  echo "        -p, --pack            Make nuget packages"
+  echo "        -p, --pack  [version] Make nuget packages"
   echo "        -c, --clean           Clean all artifacts"
 }
 
@@ -51,12 +51,10 @@ cmd_full_build() {
 }
 
 cmd_pack() {
-  VERSION_FILE=$OUTDIR/Version.txt
-  if [ -f $VERSION_FILE ]; then
-    NUGET_VERSION_PREFIX=$(cat $VERSION_FILE | grep Prefix | cut -d: -f2 | sed 's/\r$//')
-    NUGET_VERSION_SUFFIX=$(cat $VERSION_FILE | grep Suffix | cut -d: -f2 | sed 's/\r$//')
-         NUGET_VERSION_OPT="-Version $NUGET_VERSION_PREFIX-$NUGET_VERSION_SUFFIX"
+  if [ -n "$1" ]; then
+    NUGET_VERSION_OPT="-Version $1"
   fi
+
   $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.Private.nuspec -Symbols -NoPackageAnalysis $NUGET_VERSION_OPT -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR
   $NUGET_CMD pack $SCRIPT_DIR/pkg/Tizen.NET.nuspec -Symbols -NoPackageAnalysis $NUGET_VERSION_OPT -BasePath $SCRIPT_DIR -OutputDirectory $OUTDIR
 }

diff --git a/build/build.dummy.csproj b/build/build.dummy.csproj
index 47e3934..c0b89c6 100644 (file)
--- a/build/build.dummy.csproj
+++ b/build/build.dummy.csproj
@@ -77,7 +77,7 @@
 
     <Message Text="[GenAPI] %(TizenAssemblies.Filename) -> $(GeneratedReferenceAssemblySource)" Importance="High" />
 
-    <Exec Command='$(GenAPICommand) -assembly:&quot;%(TizenAssemblies.Identity)&quot; -libPath:&quot;$(IntermediateLibDir)&quot; -out:&quot;$(GeneratedReferenceAssemblySource)&quot; -throw:&quot;Not Supported Feature&quot; -global' />
+    <Exec Command='$(GenAPICommand) -assembly:&quot;%(TizenAssemblies.Identity)&quot; -libPath:$(IntermediateLibDir) -out:$(GeneratedReferenceAssemblySource) -throw:&quot;Not Supported Feature&quot; -global' />
   </Target>
 
 

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 249eb7e..07b4b23 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -3,14 +3,11 @@
 %define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res
 %define DOTNET_NUGET_SOURCE /nuget
 
-# If tizenfx_use_prebuilt is 1, use prebuilt binaries instead of building source at gbs build.
-# Default value is 1, if want to build source at gbs build, set tizenfx_use_prebuilt to 0.
-%define _tizenfx_use_prebuilt %{?tizenfx_use_prebuilt:%{tizenfx_use_prebuilt}}%{!?tizenfx_use_prebuilt:1}
 %define _tizenfx_bin_path Artifacts
 
 Name:       csapi-tizenfx
 Summary:    Assemblies of Tizen .NET
-Version:    4.0.0.213
+Version:    4.0.0.218
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -131,14 +128,11 @@ GetFileList tv > tv.filelist
 GetFileList ivi > ivi.filelist
 GetFileList wearable > wearable.filelist
 
-%if ! %{_tizenfx_use_prebuilt}
-  rm -fr %{_tizenfx_bin_path}/bin
-  rm -f %{_tizenfx_bin_path}/*.nupkg
-  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-  ./build.sh --full
-  ./build.sh --dummy
-  ./build.sh --pack
-%endif
+rm -fr %{_tizenfx_bin_path}
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+./build.sh --full
+./build.sh --dummy
+./build.sh --pack 4.0.0-preview1-00218
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}

diff --git a/packaging/csapi-tizenfx.spec.in b/packaging/csapi-tizenfx.spec.in
index 22ded56..57537cc 100644 (file)
--- a/packaging/csapi-tizenfx.spec.in
+++ b/packaging/csapi-tizenfx.spec.in
@@ -3,14 +3,11 @@
 %define DOTNET_ASSEMBLY_RES_PATH %{DOTNET_ASSEMBLY_PATH}/res
 %define DOTNET_NUGET_SOURCE /nuget
 
-# If tizenfx_use_prebuilt is 1, use prebuilt binaries instead of building source at gbs build.
-# Default value is 1, if want to build source at gbs build, set tizenfx_use_prebuilt to 0.
-%define _tizenfx_use_prebuilt %{?tizenfx_use_prebuilt:%{tizenfx_use_prebuilt}}%{!?tizenfx_use_prebuilt:1}
 %define _tizenfx_bin_path Artifacts
 
 Name:       csapi-tizenfx
 Summary:    Assemblies of Tizen .NET
-Version:    %rpm_version%
+Version:    @rpm_version@
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -131,14 +128,11 @@ GetFileList tv > tv.filelist
 GetFileList ivi > ivi.filelist
 GetFileList wearable > wearable.filelist
 
-%if ! %{_tizenfx_use_prebuilt}
-  rm -fr %{_tizenfx_bin_path}/bin
-  rm -f %{_tizenfx_bin_path}/*.nupkg
-  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-  ./build.sh --full
-  ./build.sh --dummy
-  ./build.sh --pack
-%endif
+rm -fr %{_tizenfx_bin_path}
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+./build.sh --full
+./build.sh --dummy
+./build.sh --pack @nuget_version@
 
 %install
 mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH}

diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt
index 0b4ab6c..a77b7cb 100644 (file)
--- a/pkg/PlatformFileList.txt
+++ b/pkg/PlatformFileList.txt
@@ -20,6 +20,7 @@ Tizen.Applications.PackageManager.dll              #common #mobile #mobile-emul
 Tizen.Applications.Preference.dll                  #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Applications.RemoteView.dll                  #mobile #mobile-emul #tv #wearable
 Tizen.Applications.Service.dll                     #common #mobile #mobile-emul #tv #ivi #wearable
+Tizen.Applications.Shortcut.dll                    #mobile #mobile-emul
 Tizen.Applications.ToastMessage.dll                #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Applications.UI.dll                          #common #mobile #mobile-emul #tv #ivi #wearable
 Tizen.Applications.WatchApplication.dll            #wearable

diff --git a/pkg/PublicModuleList.txt b/pkg/PublicModuleList.txt
index f1fd126..f128d43 100644 (file)
--- a/pkg/PublicModuleList.txt
+++ b/pkg/PublicModuleList.txt
@@ -17,6 +17,7 @@ Tizen.Applications.PackageManager
 Tizen.Applications.Preference
 Tizen.Applications.RemoteView
 Tizen.Applications.Service
+Tizen.Applications.Shortcut
 Tizen.Applications.ToastMessage
 Tizen.Applications.UI
 Tizen.Applications.WatchApplication

diff --git a/src/ElmSharp/ElmSharp/Button.cs b/src/ElmSharp/ElmSharp/Button.cs
index 51a1fa7..627c89d 100755 (executable)
--- a/src/ElmSharp/ElmSharp/Button.cs
+++ b/src/ElmSharp/ElmSharp/Button.cs
@@ -165,13 +165,7 @@ namespace ElmSharp
 
         protected override IntPtr CreateHandle(EvasObject parent)
         {
-            IntPtr handle = Interop.Elementary.elm_layout_add(parent.Handle);
-            Interop.Elementary.elm_layout_theme_set(handle, "layout", "elm_widget", "default");
-
-            RealHandle = Interop.Elementary.elm_button_add(handle);
-            Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", RealHandle);
-
-            return handle;
+            return Interop.Elementary.elm_button_add(parent.Handle);
         }
     }
-}
\ No newline at end of file
+}