From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Mon, 21 May 2018 02:21:51 +0000 (+0900)
Subject: [Applications.Manual][Non-ACR][Change Test Applications]
X-Git-Tag: public_m1_final~14^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F179654%2F4;p=test%2Ftct%2Fcsharp%2Fapi.git

[Applications.Manual][Non-ACR][Change Test Applications]

Some device doesn't print debug level dlog.

Change-Id: I7b626467310a536b4767a9362ff3810832896ce6
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---

diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/EventListener.Tizen.tpk b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/EventListener.Tizen.tpk
deleted file mode 100755
index a6c1ca8..0000000
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/EventListener.Tizen.tpk and /dev/null differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/ServiceApplicationManual.Tizen.tpk b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/ServiceApplicationManual.Tizen.tpk
deleted file mode 100755
index 50de405..0000000
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/ServiceApplicationManual.Tizen.tpk and /dev/null differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual.sln b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual.sln
new file mode 100644
index 0000000..f5eac2e
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2002
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationManual", "ApplicationManual\ApplicationManual\ApplicationManual.csproj", "{F7A40B63-0126-40B3-9AB9-963729A44851}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationManual.Tizen", "ApplicationManual\ApplicationManual.Tizen\ApplicationManual.Tizen.csproj", "{58D53A35-1520-41F2-AE74-FE73EAB09A7C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7A40B63-0126-40B3-9AB9-963729A44851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7A40B63-0126-40B3-9AB9-963729A44851}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7A40B63-0126-40B3-9AB9-963729A44851}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7A40B63-0126-40B3-9AB9-963729A44851}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58D53A35-1520-41F2-AE74-FE73EAB09A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58D53A35-1520-41F2-AE74-FE73EAB09A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58D53A35-1520-41F2-AE74-FE73EAB09A7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58D53A35-1520-41F2-AE74-FE73EAB09A7C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D9D488D7-77BF-416A-BEC6-A9F3E2B8C09A}
+	EndGlobalSection
+EndGlobal
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.cs
new file mode 100644
index 0000000..e19dc8f
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.cs
@@ -0,0 +1,336 @@
+using System;
+using Tizen;
+using Tizen.Applications;
+
+namespace ApplicationManual.Tizen
+{
+    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication, App.IAppEvent
+    {
+        private App app_;
+
+        public void OnButtonPressed()
+        {
+            Log.Info("TCT", "Call Exit()");
+            Exit();
+        }
+        protected override void OnPreCreate()
+        {
+            Log.Info("TCT", "[TestCase][OnPreCreate][Application] Pass");
+            base.OnPreCreate();
+            app_ = new App()
+            {
+                AppEvent = this
+            };
+        }
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+
+            Log.Info("TCT", "[TestCase][OnCreate][Application] Pass");
+
+            LoadApplication(app_);
+        }
+
+        protected override void OnResume()
+        {
+            Log.Info("TCT", "[TestCase][OnResume][Application] Pass");
+            base.OnResume();
+        }
+
+        protected override void OnPause()
+        {
+            Log.Info("TCT", "[TestCase][OnPause][Application] Pass");
+            base.OnPause();
+        }
+
+        protected override void OnTerminate()
+        {
+            Log.Info("TCT", "Application::OnTerminate()");
+            Log.Info("TCT", "[TestCase][OnTerminate][Application] Pass");
+            base.OnTerminate();
+        }
+
+        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnAppControlReceived()");
+            if (e.ReceivedAppControl != null)
+            {
+                Log.Info("TCT", "[TestCase][Test_Properties] ReceivedAppControl properties is not null");
+                Log.Info("TCT", "[TestCase][Test_Properties] ReceivedAppControl Type: " + e.ReceivedAppControl.GetType());
+            }
+            //logBuilder.AppendLine("TCT [TestCase][OnAppControlReceived] Pass");
+            Log.Info("TCT", "[TestCase][OnAppControlReceived][Application] Pass");
+
+            base.OnAppControlReceived(e);
+            ShowPropertiesInfo();
+        }
+
+        protected override void OnLocaleChanged(LocaleChangedEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnLocaleChanged()");
+            if (e.Locale != null)
+            {
+                Log.Info("TCT", "[Test_Properties] Locale properties is not null");
+                Log.Info("TCT", "[Test_Properties] Current value of Locale : " + e.Locale);
+                Log.Info("TCT", "[Test_Properties] Locale type: " + e.Locale.GetType());
+            }
+
+            Log.Info("TCT", "[TestCase][OnLocaleChanged][Application] Pass");
+            base.OnLocaleChanged(e);
+        }
+
+        protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnRegionFormatChanged()");
+            if (e != null)
+            {
+                Log.Info("TCT", "[Test_Properties] Region properties is not null");
+                Log.Info("TCT", "[Test_Properties] Current value of Region : " + e.Region);
+                Log.Info("TCT", "[Test_Properties] Region type: " + e.Region.GetType());
+            }
+
+            Log.Info("TCT", "[TestCase][OnRegionFormatChanged][Application] Pass");
+            base.OnRegionFormatChanged(e);
+        }
+
+        protected override void OnDeviceOrientationChanged(DeviceOrientationEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnDeviceOrientationChanged()");
+            if (e != null)
+            {
+                Log.Info("TCT", "[Test_Properties] DeviceOrientation properties is not null");
+                Log.Info("TCT", "[Test_Properties] Current value of DeviceOrientation : " + e.DeviceOrientation);
+                Log.Info("TCT", "[Test_Properties] DeviceOrientation type: " + e.DeviceOrientation.GetType());
+            }
+
+            Log.Info("TCT", "[TestCase][OnDeviceOrientationChanged][Application] Pass");
+            base.OnDeviceOrientationChanged(e);
+        }
+
+        protected override void OnLowMemory(LowMemoryEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnLowMemory()");
+            if (e.LowMemoryStatus != LowMemoryStatus.None)
+            {
+                Log.Info("TCT", "[Test_Properties] LowMemoryStatus properties is not null");
+                Log.Info("TCT", "[Test_Properties] Current value of LowMemoryStatus : " + e.LowMemoryStatus.ToString());
+                Log.Info("TCT", "[Test_Properties] LowMemoryStatus type: " + e.LowMemoryStatus.GetType());
+            }
+            //logBuilder.AppendLine("TCT [TestCase][OnLowMemory] Pass");
+            Log.Info("TCT", "[TestCase][OnLowMemory][Application] Pass");
+
+            base.OnLowMemory(e);
+        }
+
+        protected override void OnLowBattery(LowBatteryEventArgs e)
+        {
+            Log.Info("TCT", "Application::OnLowBattery()");
+            if (e.LowBatteryStatus != LowBatteryStatus.None)
+            {
+                Log.Info("TCT", "[Test_Properties] LowBatteryStatus properties is not null");
+                Log.Info("TCT", "[Test_Properties] Current value of LowBatteryStatus : " + e.LowBatteryStatus.ToString());
+                Log.Info("TCT", "[Test_Properties] LowBatteryStatus type: " + e.LowBatteryStatus.GetType());
+            }
+
+            Log.Info("TCT", "[TestCase][OnLowBattery][Application] Pass");
+
+            base.OnLowBattery(e);
+        }
+
+        public override void Run(string[] args)
+        {
+            Created += Created_Event_Test;
+            AppControlReceived += AppControlReceived_Event_Test;
+            LocaleChanged += LocaleChanged_Event_Test;
+            LowMemory += LowMemory_Event_Test;
+            LowBattery += LowBattery_Event_Test;
+            Terminated += Terminated_Event_Test;
+            Paused += EventHandlerPaused;
+            Resumed += EventHandlerResumed;
+            DeviceOrientationChanged += DeviceOrientationCHanged_Event_Test;
+            RegionFormatChanged += RegionFormatChanged_Event_Test;
+
+            Log.Info("TCT", "[TestCase][Run][Application] Pass");
+
+            base.Run(args);
+        }
+
+        private void Terminated_Event_Test(object sender, EventArgs e)
+        {
+            /* 
+             * SCENARIO:
+             * Launch app
+             * -> If log show "Application::Terminated_Event_Test()" -> PASS
+             */
+            Log.Info("TCT", "Application::Terminated_Event_Test");
+            //logBuilder.AppendLine("TCT [TestCase][Terminated_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][Terminated_Event_Test][Application] Pass");
+        }
+
+        private void LocaleChanged_Event_Test(object sender, LocaleChangedEventArgs e)
+        {
+            /* 
+             * SCENARIO:
+             * Launch app
+             * -> If log show "Application::LocaleChanged_Event_Test()" -> PASS
+             */
+            Log.Info("TCT", "Application::LocaleChanged_Event_Test");
+            Log.Info("TCT", "Application::LocaleChanged_Event_Test: new located - " + e.Locale);
+            //logBuilder.AppendLine("TCT [TestCase][LocaleChanged_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][LocaleChanged_Event_Test][Application] Pass");
+        }
+
+        private void RegionFormatChanged_Event_Test(object sender, RegionFormatChangedEventArgs e)
+        {
+            Log.Info("TCT", "Application::RegionFormatChanged_Event_Test");
+            Log.Info("TCT", "Application::RegionFormatChanged_Event_Test: new region - " + e.Region);
+            //logBuilder.AppendLine("TCT [TestCase][LocaleChanged_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][RegionFormatChanged_Event_Test][Application] Pass");
+        }
+
+        private void DeviceOrientationCHanged_Event_Test(object sender, DeviceOrientationEventArgs e)
+        {
+            Log.Info("TCT", "Application::DeviceOrientationCHanged_Event_Test");
+            Log.Info("TCT", "Application::DeviceOrientationCHanged_Event_Test: new located - " + e.DeviceOrientation);
+            Log.Info("TCT", "[TestCase][DeviceOrientationCHanged_Event_Test][Application] Pass");
+        }
+
+        private void LowMemory_Event_Test(object sender, LowMemoryEventArgs e)
+        {
+            /*
+             * SCENARIO:
+             * Launch app
+             * -> If log show "Application::LowMemory_Event_Test()" -> PASS
+             */
+            Log.Info("TCT", "Application::LowMemory_Event_Test");
+            if (e.LowMemoryStatus == LowMemoryStatus.None)
+            {
+                Log.Info("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.None");
+            }
+            else if (e.LowMemoryStatus == LowMemoryStatus.Normal)
+            {
+                Log.Info("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.Normal");
+            }
+            else if (e.LowMemoryStatus == LowMemoryStatus.SoftWarning)
+            {
+                Log.Info("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.SoftWarning");
+            }
+            else if (e.LowMemoryStatus == LowMemoryStatus.HardWarning)
+            {
+                Log.Info("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.HardWarning");
+            }
+            //logBuilder.AppendLine("TCT [TestCase][LowMemory_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][LowMemory_Event_Test][Application] Pass");
+        }
+
+        private void LowBattery_Event_Test(object sender, LowBatteryEventArgs e)
+        {
+            Log.Info("TCT", "Application::LowBattery_Event_Test");
+
+            if (e.LowBatteryStatus == LowBatteryStatus.CriticalLow)
+            {
+                Log.Info("TCT", "Application::LowBattery_Event_Test: LowMemoryStatus.CriticalLow");
+            }
+            Log.Info("TCT", "[TestCase][LowBattery_Event_Test][Application] Pass");
+        }
+
+        private void AppControlReceived_Event_Test(object sender, AppControlReceivedEventArgs e)
+        {
+            /*
+             * SCENARIO:
+             * Launch app
+             * -> If log show "Application::AppControlReceived_Event_Test()" -> PASS
+             */
+            Log.Info("TCT", "Application::AppControlReceived_Event_Test");
+            //logBuilder.AppendLine("TCT [TestCase][AppControlReceived_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][AppControlReceived_Event_Test][Application] Pass");
+        }
+
+        private void Created_Event_Test(object sender, EventArgs e)
+        {
+            /*
+             * SCENARIO:
+             * Launch app
+             * -> If log show "Application::Created_Event_Test()" -> PASS
+             */
+            Log.Info("TCT", "Application::Created_Event_Test");
+            //logBuilder.AppendLine("TCT [TestCase][Created_Event_Test] Pass");
+            Log.Info("TCT", "[TestCase][Created_Event_Test][Application] Pass");
+        }
+        public void EventHandlerPaused(object sender, EventArgs e)
+        {
+            /*
+             * PRECONDITION
+             * 1. Open Application app.
+             * 2. Open other app.
+             */
+            Log.Info("TCT", "[TestCase][EventHandlerPaused][Application] Pass");
+        }
+        public void EventHandlerResumed(object sender, EventArgs e)
+        {
+            /*
+             * PRECONDITION
+             * 1. Open Application app.
+             * 2. Open other app.
+             * 3. Long press HOME button and tap to Applicaton shortcut.
+             */
+            Log.Info("TCT", "Application Resumed event occur!");
+            Log.Info("TCT", "[TestCase][EventHandlerResumed][Application] Pass");
+        }
+
+        public override void Exit()
+        {
+            Log.Info("TCT", "[TestCase][Exit][Application] Pass");
+            base.Exit();
+        }
+        void ShowPropertiesInfo()
+        {
+            if (base.ApplicationInfo != null)
+            {
+                Log.Info("TCT", "[Info] ApplicationInfo is not null");
+                Log.Info("TCT", "[Info] ApplicationInfo.ApplicationId = " + base.ApplicationInfo.ApplicationId);
+                Log.Info("TCT", "[Info] ApplicationInfo.ApplicationType = " + base.ApplicationInfo.ApplicationType);
+                Log.Info("TCT", "[Info] ApplicationInfo.ExecutablePath = " + base.ApplicationInfo.ExecutablePath);
+                Log.Info("TCT", "[Info] ApplicationInfo.ExternalSharedDataPath = " + base.ApplicationInfo.ExternalSharedDataPath);
+                Log.Info("TCT", "[Info] ApplicationInfo.IconPath = " + base.ApplicationInfo.IconPath);
+                Log.Info("TCT", "[Info] ApplicationInfo.IsNoDisplay = " + base.ApplicationInfo.IsNoDisplay);
+                Log.Info("TCT", "[Info] ApplicationInfo.IsOnBoot = " + base.ApplicationInfo.IsOnBoot);
+                Log.Info("TCT", "[Info] ApplicationInfo.IsPreload = " + base.ApplicationInfo.IsPreload);
+                Log.Info("TCT", "[Info] ApplicationInfo.Label = " + base.ApplicationInfo.Label);
+                Log.Info("TCT", "[Info] ApplicationInfo.Metadata Count = " + base.ApplicationInfo.Metadata.Count);
+                foreach (var item in base.ApplicationInfo.Metadata)
+                {
+                    Log.Info("TCT", "[Info] ApplicationInfo.Metadata, Key: " + item.Key + " Value: " + item.Value);
+                }
+                Log.Info("TCT", "[Info] ApplicationInfo.PackageId = " + base.ApplicationInfo.PackageId);
+                Log.Info("TCT", "[Info] ApplicationInfo.SharedDataPath = " + base.ApplicationInfo.SharedDataPath);
+                Log.Info("TCT", "[Info] ApplicationInfo.SharedResourcePath = " + base.ApplicationInfo.SharedResourcePath);
+                Log.Info("TCT", "[Info] ApplicationInfo.SharedTrustedPath = " + base.ApplicationInfo.SharedTrustedPath);
+            }
+            if (base.DirectoryInfo != null)
+            {
+                Log.Info("TCT", "[Info] DirectoryInfo is not null");
+                Log.Info("TCT", "[Info] DirectoryInfo.Cache = " + base.DirectoryInfo.Cache);
+                Log.Info("TCT", "[Info] DirectoryInfo.Data = " + base.DirectoryInfo.Data);
+                Log.Info("TCT", "[Info] DirectoryInfo.ExpansionPackageResource = " + base.DirectoryInfo.ExpansionPackageResource);
+                Log.Info("TCT", "[Info] DirectoryInfo.ExternalCache = " + base.DirectoryInfo.ExternalCache);
+                Log.Info("TCT", "[Info] DirectoryInfo.ExternalData = " + base.DirectoryInfo.ExternalData);
+                Log.Info("TCT", "[Info] DirectoryInfo.ExternalSharedData = " + base.DirectoryInfo.ExternalSharedData);
+                Log.Info("TCT", "[Info] DirectoryInfo.Resource = " + base.DirectoryInfo.Resource);
+                Log.Info("TCT", "[Info] DirectoryInfo.SharedData = " + base.DirectoryInfo.SharedData);
+                Log.Info("TCT", "[Info] DirectoryInfo.SharedResource = " + base.DirectoryInfo.SharedResource);
+                Log.Info("TCT", "[Info] DirectoryInfo.SharedTrusted = " + base.DirectoryInfo.SharedTrusted);
+            }
+
+            Log.Info("TCT", "[Info] Current == this : " + (Current == this));
+            Log.Info("TCT", "[Info] Current.ApplicationInfo.ApplicationId = " + Current.ApplicationInfo.ApplicationId);
+        }
+
+        static void Main(string[] args)
+        {
+            var app = new Program();
+            global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
+            app.Run(args);
+        }
+    }
+}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.csproj
new file mode 100644
index 0000000..1c1776d
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/ApplicationManual.Tizen.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!-- Property Group for Tizen40 Project -->
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>tizen40</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="lib\" />
+    <Folder Include="res\" />
+  </ItemGroup>
+
+  
+  <!-- If solution already has PCL project, will reference -->
+  <ItemGroup>
+    <ProjectReference Include="..\ApplicationManual\ApplicationManual.csproj" />
+  </ItemGroup>
+  
+
+  <!-- Include Nuget Package for Tizen Project building -->
+  <ItemGroup>
+    <PackageReference Include="Tizen.NET" Version="4.0.0" >
+      <ExcludeAssets>Runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1-pre1" />
+    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
+  </ItemGroup>
+</Project>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/shared/res/ApplicationManual.Tizen.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/shared/res/ApplicationManual.Tizen.png
new file mode 100644
index 0000000..9f3cb98
Binary files /dev/null and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/shared/res/ApplicationManual.Tizen.png differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/tizen-manifest.xml
new file mode 100644
index 0000000..46edded
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual.Tizen/tizen-manifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="org.tizen.ApplicationManual.Tizen" version="1.0.0" api-version="4" xmlns="http://tizen.org/ns/packages">
+    <profile name="common" />
+    <ui-application appid="org.tizen.ApplicationManual.Tizen" exec="ApplicationManual.Tizen.dll" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+        <label>ApplicationManual.Tizen</label>
+        <icon>ApplicationManual.Tizen.png</icon>
+        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+    </ui-application>
+    <provides-appdefined-privileges />
+    <privileges>
+      <privilege>http://tizen.org/privilege/appdir.shareddata</privilege>
+    </privileges>
+</manifest>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.cs
old mode 100755
new mode 100644
similarity index 73%
rename from tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.cs
rename to tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.cs
index 5fb5e6b..10ecc0c
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.cs
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.cs
@@ -5,26 +5,33 @@ using System.Text;
 
 using Xamarin.Forms;
 
-namespace org.tizen.ApplicationManual
+namespace ApplicationManual
 {
     public class App : Application
     {
+        public interface IAppEvent
+        {
+            void OnButtonPressed();
+        }
+        public IAppEvent AppEvent { get; set; }
+
+
         public App()
         {
             Button eButton = new Button
-            {
-                HorizontalOptions = LayoutOptions.Center,
-                Text = "EXIT",
-                FontSize = 15,
-                WidthRequest = 330,
+            {
+                HorizontalOptions = LayoutOptions.Center,
+                Text = "EXIT",
+                FontSize = 15,
+                WidthRequest = 330,
                 HeightRequest = 80
             };
 
-            eButton.Clicked += (sender, e) =>
+            eButton.Clicked += (sender, e) =>
             {
-                global::Tizen.Applications.Application.Current.Exit();
+                AppEvent?.OnButtonPressed();
             };
-            
+
             // The root page of your application
             MainPage = new ContentPage
             {
@@ -32,14 +39,14 @@ namespace org.tizen.ApplicationManual
                 {
                     VerticalOptions = LayoutOptions.Center,
                     Children = {
-                        /*new Label {
+                        new Label {
                             HorizontalTextAlignment = TextAlignment.Center,
-                            Text = "Welcome to Xamarin Forms!"
-                        }*/
+                            Text = "org.tizen.ApplicationManual.Tizen"
+                        },
                         eButton
                     }
-                }                
-            };            
+                }
+            };
         }
 
         protected override void OnStart()
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.csproj
new file mode 100644
index 0000000..864e4bf
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ApplicationManual/ApplicationManual/ApplicationManual/ApplicationManual.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Include Nuget Package for Xamarin building -->
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+  </ItemGroup>
+
+</Project>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.cs
deleted file mode 100755
index b8ae234..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using Tizen;
-using Tizen.Applications;
-
-namespace EventListener.Tizen
-{
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
-    {
-        private const string LogTag = "[EventListener]";
-
-        private static void EventEnabled(object sender, ApplicationEnabledEventArgs args)
-        {
-            Log.Debug(LogTag, "====================================================");
-            Log.Debug(LogTag, "[EventEnabled] ApplicationEnabled");
-            Log.Debug(LogTag, "[EventEnabled] ApplicationId: " + args.ApplicationId);
-            Log.Debug(LogTag, "[EventEnabled] EventState: " + args.EventState.ToString());
-            Log.Debug(LogTag, "====================================================");
-        }
-
-        private static void EventDisabled(object sender, ApplicationDisabledEventArgs args)
-        {
-            Log.Debug(LogTag, "====================================================");
-            Log.Debug(LogTag, "[EventDisabled] ApplicationDisabled");
-            Log.Debug(LogTag, "[EventDisabled] ApplicationId: " + args.ApplicationId);
-            Log.Debug(LogTag, "[EventDisabled] EventState: " + args.EventState.ToString());
-            Log.Debug(LogTag, "====================================================");
-        }
-
-        protected override void OnPreCreate()
-        {
-            base.OnPreCreate();
-            Log.Debug(LogTag, "OnPreCreate()");
-            
-            ApplicationManager.ApplicationEnabled += EventEnabled;
-            ApplicationManager.ApplicationDisabled += EventDisabled;
-        }
-
-        protected override void OnCreate()
-        {
-            base.OnCreate();
-            LoadApplication(new App());
-            Log.Debug(LogTag, "OnCreate()");
-        }
-
-        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
-        {
-            base.OnAppControlReceived(e);
-            Log.Debug(LogTag, "OnAppControlReceived()");
-        }
-
-        protected override void OnResume()
-        {
-            base.OnResume();
-            Log.Debug(LogTag, "OnResume()");
-        }
-
-        protected override void OnPause()
-        {
-            base.OnPause();
-            Log.Debug(LogTag, "OnPause()");
-        }
-
-        protected override void OnTerminate()
-        {
-            base.OnTerminate();
-            Log.Debug(LogTag, "OnTerminate()");
-            ApplicationManager.ApplicationEnabled -= EventEnabled;
-            ApplicationManager.ApplicationDisabled -= EventDisabled;
-        }
-
-        static void Main(string[] args)
-        {
-            var app = new Program();
-            global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
-            app.Run(args);
-        }
-    }
-}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.csproj
deleted file mode 100755
index 3998c18..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{F74B9087-C2FC-4170-B39C-C7F7225B0F72}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EventListener.Tizen</RootNamespace>
-    <AssemblyName>EventListener.Tizen</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
-    <BaseNuGetRuntimeIdentifier>tizen.4.0.0-armel</BaseNuGetRuntimeIdentifier>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="EventListener.Tizen.project.json" />
-    <None Include="tizen-manifest.xml" />
-    <None Include="shared\res\EventListener.Tizen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="EventListener.cs" />
-    <Compile Include="EventListener.Tizen.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="lib\" />
-    <Folder Include="res\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-		Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-  <PropertyGroup>
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-			 https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-		-->
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-			 properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-			 to prevent it from outputting a warning (MSB3644).
-		-->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCommonFlavorCfg>
-          <excludeXamarinForms>True</excludeXamarinForms>
-        </ProjectCommonFlavorCfg>
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.project.json b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.project.json
deleted file mode 100755
index c76a986..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "debugType": "portable",
-    "platform": "AnyCPU",
-    "preserveCompilationContext": true
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": "2.0.0-preview1-002111-00",
-    "Tizen.Applications.Common": "1.5.8",
-    "Tizen.Applications.UI": "1.5.8",
-    "Xamarin.Forms": "2.3.5.256-pre6",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r256-001"
-  },
-  "runtimes": {
-    "tizen.4.0.0-armel": {}
-  },
-  "frameworks": {
-    "netcoreapp2.0": {
-      "imports": [
-        "portable-net45+wp80+win81+wpa81",
-        "netstandard1.6"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.sln b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.sln
deleted file mode 100755
index bd8adc6..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.Tizen.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventListener.Tizen", "EventListener.Tizen.csproj", "{F74B9087-C2FC-4170-B39C-C7F7225B0F72}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F74B9087-C2FC-4170-B39C-C7F7225B0F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F74B9087-C2FC-4170-B39C-C7F7225B0F72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F74B9087-C2FC-4170-B39C-C7F7225B0F72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F74B9087-C2FC-4170-B39C-C7F7225B0F72}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/Properties/AssemblyInfo.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/Properties/AssemblyInfo.cs
deleted file mode 100755
index 8d9aa51..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EventListener.Tizen")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EventListener.Tizen")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f74b9087-c2fc-4170-b39c-c7f7225b0f72")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/shared/res/EventListener.Tizen.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/shared/res/EventListener.Tizen.png
deleted file mode 100755
index 9765b1b..0000000
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/shared/res/EventListener.Tizen.png and /dev/null differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener.sln b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener.sln
new file mode 100644
index 0000000..e1e798b
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2002
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventListener", "EventListener\EventListener\EventListener.csproj", "{A876FD73-CABC-4CCD-8C2A-36490E9E5637}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventListener.Tizen", "EventListener\EventListener.Tizen\EventListener.Tizen.csproj", "{D8A7ED42-DA8B-4E58-AE4A-918CE7BABAE9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A876FD73-CABC-4CCD-8C2A-36490E9E5637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A876FD73-CABC-4CCD-8C2A-36490E9E5637}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A876FD73-CABC-4CCD-8C2A-36490E9E5637}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A876FD73-CABC-4CCD-8C2A-36490E9E5637}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8A7ED42-DA8B-4E58-AE4A-918CE7BABAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8A7ED42-DA8B-4E58-AE4A-918CE7BABAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8A7ED42-DA8B-4E58-AE4A-918CE7BABAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8A7ED42-DA8B-4E58-AE4A-918CE7BABAE9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EC7F9067-40D6-4979-B7E8-DDB85B0A92BA}
+	EndGlobalSection
+EndGlobal
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.cs
new file mode 100644
index 0000000..337e075
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.cs
@@ -0,0 +1,105 @@
+using System;
+using Tizen;
+using Tizen.Applications;
+
+namespace EventListener.Tizen
+{
+    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication, App.IAppEvent
+    {
+        private const string LogTag = "[EventListener]";
+        private const string LogTag2 = "EventListener";
+        private App app_;
+
+        public void OnButtonPressed()
+        {
+            Log.Info(LogTag, "Call Exit()");
+            Log.Info(LogTag2, "Call Exit()");
+            Current.Exit();
+        }
+
+
+        private static void EventEnabled(object sender, ApplicationEnabledEventArgs args)
+        {
+            Log.Info(LogTag, "====================================================");
+            Log.Info(LogTag, "[EventEnabled] ApplicationEnabled");
+            Log.Info(LogTag, "[EventEnabled] ApplicationId: " + args.ApplicationId);
+            Log.Info(LogTag, "[EventEnabled] EventState: " + args.EventState.ToString());
+            Log.Info(LogTag, "====================================================");
+
+            Log.Info(LogTag2, "====================================================");
+            Log.Info(LogTag2, "[EventEnabled] ApplicationEnabled");
+            Log.Info(LogTag2, "[EventEnabled] ApplicationId: " + args.ApplicationId);
+            Log.Info(LogTag2, "[EventEnabled] EventState: " + args.EventState.ToString());
+            Log.Info(LogTag2, "====================================================");
+        }
+
+        private static void EventDisabled(object sender, ApplicationDisabledEventArgs args)
+        {
+            Log.Info(LogTag, "====================================================");
+            Log.Info(LogTag, "[EventDisabled] ApplicationDisabled");
+            Log.Info(LogTag, "[EventDisabled] ApplicationId: " + args.ApplicationId);
+            Log.Info(LogTag, "[EventDisabled] EventState: " + args.EventState.ToString());
+            Log.Info(LogTag, "====================================================");
+
+            Log.Info(LogTag2, "====================================================");
+            Log.Info(LogTag2, "[EventDisabled] ApplicationDisabled");
+            Log.Info(LogTag2, "[EventDisabled] ApplicationId: " + args.ApplicationId);
+            Log.Info(LogTag2, "[EventDisabled] EventState: " + args.EventState.ToString());
+            Log.Info(LogTag2, "====================================================");
+        }
+
+        protected override void OnPreCreate()
+        {
+            base.OnPreCreate();
+            Log.Info(LogTag, "OnPreCreate()");
+
+            ApplicationManager.ApplicationEnabled += EventEnabled;
+            ApplicationManager.ApplicationDisabled += EventDisabled;
+
+            app_ = new App()
+            {
+                AppEvent = this
+            };
+        }
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            LoadApplication(app_);
+            Log.Info(LogTag, "OnCreate()");
+        }
+
+        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
+        {
+            base.OnAppControlReceived(e);
+            Log.Info(LogTag, "OnAppControlReceived()");
+        }
+
+        protected override void OnResume()
+        {
+            base.OnResume();
+            Log.Info(LogTag, "OnResume()");
+        }
+
+        protected override void OnPause()
+        {
+            base.OnPause();
+            Log.Info(LogTag, "OnPause()");
+        }
+
+        protected override void OnTerminate()
+        {
+            base.OnTerminate();
+            Log.Info(LogTag, "OnTerminate()");
+            ApplicationManager.ApplicationEnabled -= EventEnabled;
+            ApplicationManager.ApplicationDisabled -= EventDisabled;
+        }
+
+        static void Main(string[] args)
+        {
+            var app = new Program();
+            global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
+            app.Run(args);
+        }
+    }
+}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.csproj
new file mode 100644
index 0000000..b9e8cb0
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/EventListener.Tizen.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!-- Property Group for Tizen40 Project -->
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>tizen40</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="lib\" />
+    <Folder Include="res\" />
+  </ItemGroup>
+
+  
+  <!-- If solution already has PCL project, will reference -->
+  <ItemGroup>
+    <ProjectReference Include="..\EventListener\EventListener.csproj" />
+  </ItemGroup>
+  
+
+  <!-- Include Nuget Package for Tizen Project building -->
+  <ItemGroup>
+    <PackageReference Include="Tizen.NET" Version="4.0.0" >
+      <ExcludeAssets>Runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1-pre1" />
+    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
+  </ItemGroup>
+</Project>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/shared/res/EventListener.Tizen.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/shared/res/EventListener.Tizen.png
new file mode 100644
index 0000000..9f3cb98
Binary files /dev/null and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/shared/res/EventListener.Tizen.png differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/tizen-manifest.xml
old mode 100755
new mode 100644
similarity index 57%
rename from tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/tizen-manifest.xml
rename to tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/tizen-manifest.xml
index 49b066e..0c3d7e3
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener.Tizen/tizen-manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="EventListener.Tizen" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4" package="org.tizen.example.EventListener.Tizen" version="1.0.0">
 	<profile name="common" />
 	<ui-application appid="org.tizen.example.EventListener.Tizen"
-					exec="EventListener.Tizen.exe"
+					exec="EventListener.Tizen.dll"
 					type="dotnet"
 					multiple="false"
 					taskmanage="true"
@@ -10,5 +10,6 @@
 					launch_mode="single">
   <label>EventListener.Tizen</label>
 	<icon>EventListener.Tizen.png</icon>
+        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
 	</ui-application>
 </manifest>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.cs
old mode 100755
new mode 100644
similarity index 57%
rename from tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.cs
rename to tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.cs
index 29afb2f..ec94274
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener.Tizen/EventListener.cs
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.cs
@@ -9,8 +9,29 @@ namespace EventListener
 {
     public class App : Application
     {
+        public interface IAppEvent
+        {
+            void OnButtonPressed();
+        }
+        public IAppEvent AppEvent { get; set; }
+
+
         public App()
         {
+            Button eButton = new Button
+            {
+                HorizontalOptions = LayoutOptions.Center,
+                Text = "EXIT",
+                FontSize = 15,
+                WidthRequest = 330,
+                HeightRequest = 80
+            };
+
+            eButton.Clicked += (sender, e) =>
+            {
+                AppEvent?.OnButtonPressed();
+            };
+
             // The root page of your application
             MainPage = new ContentPage
             {
@@ -20,8 +41,9 @@ namespace EventListener
                     Children = {
                         new Label {
                             HorizontalTextAlignment = TextAlignment.Center,
-                            Text = "Welcome to Xamarin Forms!"
-                        }
+                            Text = "org.tizen.example.EventListener.Tizen"
+                        },
+                        eButton
                     }
                 }
             };
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.csproj
new file mode 100644
index 0000000..864e4bf
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/EventListener/EventListener/EventListener/EventListener.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <!-- Include Nuget Package for Xamarin building -->
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+  </ItemGroup>
+
+</Project>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/Properties/AssemblyInfo.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/Properties/AssemblyInfo.cs
deleted file mode 100755
index 532c4e0..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ServiceApplicationManual.Tizen")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ServiceApplicationManual.Tizen")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f63e274a-f69e-4146-b4ef-74b61731e550")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.cs
deleted file mode 100755
index b48241b..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Threading;
-using Tizen;
-
-namespace org.tizen.ServiceApplicationManual.Tizen
-{
-    class Program : global::Tizen.Applications.ServiceApplication
-    {
-        protected override void OnCreate()
-        {
-            base.OnCreate();
-
-            Thread.Sleep(5000);
-            Exit();
-        }
-
-        public override void Exit()
-        {
-            Log.Debug("TCT", "[TestCase][Exit][ServiceApplication] Pass");
-            base.Exit();
-        }
-
-        public override void Run(string[] args)
-        {
-            Log.Debug("TCT", "[TestCase][Run][ServiceApplication] Pass");
-            base.Run(args);
-        }
-
-        static void Main(string[] args)
-        {
-            var app = new Program();
-            app.Run(args);
-        }
-    }
-}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.csproj
deleted file mode 100755
index 4a6c08b..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{F63E274A-F69E-4146-B4EF-74B61731E550}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ServiceApplicationManual.Tizen</RootNamespace>
-    <AssemblyName>ServiceApplicationManual.Tizen</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
-    <BaseNuGetRuntimeIdentifier>tizen.4.0.0-armel</BaseNuGetRuntimeIdentifier>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="ServiceApplicationManual.Tizen.project.json" />
-    <None Include="tizen-manifest.xml" />
-    <None Include="shared\res\ServiceApplicationManual.Tizen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ServiceApplicationManual.Tizen.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="lib\" />
-    <Folder Include="res\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-		Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-  <PropertyGroup>
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-			 https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-		-->
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-			 properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-			 to prevent it from outputting a warning (MSB3644).
-		-->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.project.json b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.project.json
deleted file mode 100755
index bfedff6..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "debugType": "portable",
-    "platform": "AnyCPU",
-    "preserveCompilationContext": true
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "version": "2.0.0-preview1-002111-00"
-    },
-    "Tizen.Applications.Common": "1.5.11",
-    "Tizen.Applications.Service": "1.5.8"
-  },
-  "runtimes": {
-    "tizen.4.0.0-armel": {}
-  },
-  "frameworks": {
-    "netcoreapp2.0": {
-      "imports": [
-        "portable-net45+wp80+win81+wpa81",
-        "netstandard1.6"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/shared/res/ServiceApplicationManual.Tizen.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/shared/res/ServiceApplicationManual.Tizen.png
deleted file mode 100755
index 9765b1b..0000000
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/shared/res/ServiceApplicationManual.Tizen.png and /dev/null differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/tizen-manifest.xml
deleted file mode 100755
index d3cbcde..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/tizen-manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="ServiceApplicationManual.Tizen" version="1.0.0">
-	<profile name="common" />
-	<service-application appid="org.tizen.ServiceApplicationManual.Tizen"
-					exec="ServiceApplicationManual.Tizen.exe"
-					type="dotnet"
-					multiple="false"
-					taskmanage="true"
-					nodisplay="false"
-					launch_mode="single">
-  <label>ServiceApplicationManual.Tizen</label>
-	<icon>ServiceApplicationManual.Tizen.png</icon>
-    <metadata key="http://tizen.org/metadata/allowedappid" value="Tizen.Applications.Manual.Tests"/>
-	</service-application>
-</manifest>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.sln b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual.sln
old mode 100755
new mode 100644
similarity index 52%
rename from tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.sln
rename to tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual.sln
index 0ea19b7..e3f9a3c
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual.Tizen/ServiceApplicationManual.Tizen.sln
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceApplicationManual.Tizen", "ServiceApplicationManual.Tizen.csproj", "{F63E274A-F69E-4146-B4EF-74B61731E550}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceApplicationManual", "ServiceApplicationManual\ServiceApplicationManual.csproj", "{531F0CC2-E402-4C5B-9D69-7F5012169477}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,12 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F63E274A-F69E-4146-B4EF-74B61731E550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F63E274A-F69E-4146-B4EF-74B61731E550}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F63E274A-F69E-4146-B4EF-74B61731E550}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F63E274A-F69E-4146-B4EF-74B61731E550}.Release|Any CPU.Build.0 = Release|Any CPU
+		{531F0CC2-E402-4C5B-9D69-7F5012169477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{531F0CC2-E402-4C5B-9D69-7F5012169477}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{531F0CC2-E402-4C5B-9D69-7F5012169477}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{531F0CC2-E402-4C5B-9D69-7F5012169477}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D1DE5E85-D84E-4234-BDF9-342668A096C9}
+	EndGlobalSection
 EndGlobal
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual.csproj
new file mode 100644
index 0000000..fc7fc97
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual.csproj
@@ -0,0 +1,46 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <!-- Setting Tizen Extension Path -->
+  <PropertyGroup Label="Globals">
+    <TizenProjectExtensionsPath>$(MSBuildExtensionsPath)\Tizen\VisualStudio\</TizenProjectExtensionsPath>
+  </PropertyGroup>
+
+  <!-- Import Tizen property in Tizen.NET SDK -->
+  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" />
+
+  <!-- Property Group for .NET Core Project -->
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="lib\"/>
+    <Folder Include="res\"/>
+  </ItemGroup>
+
+  <!-- Include Nuget Package for Tizen Project building -->
+  <ItemGroup>
+    <PackageReference Include="Tizen.NET" Version="4.0.0" >
+      <ExcludeAssets>Runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1-pre1" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" />
+
+  <!-- Install Check 'Visual Studio for Tizen' for developing on Visual Studio -->
+  <Target Name="TizenVsixInstallCheck" BeforeTargets="CompileDesignTime">
+    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props is not exist.&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
+    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets is not exist.\&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
+  </Target>
+</Project>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual_App.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual_App.cs
new file mode 100644
index 0000000..912a269
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/ServiceApplicationManual_App.cs
@@ -0,0 +1,69 @@
+using System.Threading;
+using Tizen;
+using Tizen.Applications;
+
+namespace ServiceApplicationManual
+{
+    class App : ServiceApplication
+    {
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            Thread.Sleep(5000);
+            Exit();
+        }
+
+        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
+        {
+            base.OnAppControlReceived(e);
+        }
+
+        protected override void OnDeviceOrientationChanged(DeviceOrientationEventArgs e)
+        {
+            base.OnDeviceOrientationChanged(e);
+        }
+
+        protected override void OnLocaleChanged(LocaleChangedEventArgs e)
+        {
+            base.OnLocaleChanged(e);
+        }
+
+        protected override void OnLowBattery(LowBatteryEventArgs e)
+        {
+            base.OnLowBattery(e);
+        }
+
+        protected override void OnLowMemory(LowMemoryEventArgs e)
+        {
+            base.OnLowMemory(e);
+        }
+
+        protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
+        {
+            base.OnRegionFormatChanged(e);
+        }
+
+        protected override void OnTerminate()
+        {
+            base.OnTerminate();
+        }
+
+        public override void Exit()
+        {
+            Log.Info("TCT", "[TestCase][Exit][ServiceApplication] Pass");
+            base.Exit();
+        }
+
+        public override void Run(string[] args)
+        {
+            Log.Info("TCT", "[TestCase][Run][ServiceApplication] Pass");
+            base.Run(args);
+        }
+
+        static void Main(string[] args)
+        {
+            App app = new App();
+            app.Run(args);
+        }
+    }
+}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/shared/res/ServiceApplicationManual.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/shared/res/ServiceApplicationManual.png
new file mode 100644
index 0000000..9f3cb98
Binary files /dev/null and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/shared/res/ServiceApplicationManual.png differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/tizen-manifest.xml
new file mode 100644
index 0000000..755d41a
--- /dev/null
+++ b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/ServiceApplicationManual/ServiceApplicationManual/tizen-manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="org.tizen.ServiceApplicationManual.Tizen" version="1.0.0" api-version="4" xmlns="http://tizen.org/ns/packages">
+    <profile name="common" />
+    <service-application appid="org.tizen.ServiceApplicationManual.Tizen" exec="ServiceApplicationManual.dll" multiple="false" nodisplay="true" taskmanage="false" splash-screen-display="true" type="dotnet">
+        <label>ServiceApplicationManual</label>
+        <icon>ServiceApplicationManual.png</icon>
+        <metadata key="http://tizen.org/metadata/allowedappid" value="Tizen.Applications.Manual.Tests" />
+    </service-application>
+    <provides-appdefined-privileges />
+</manifest>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/Properties/AssemblyInfo.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/Properties/AssemblyInfo.cs
deleted file mode 100755
index 7b4ad1f..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("org.tizen.ApplicationManual.Tizen")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("org.tizen.ApplicationManual.Tizen")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("341e5235-6060-4179-906d-0b3f264b9f5a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.cs b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.cs
deleted file mode 100755
index d8c8c5e..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-using System;
-using Tizen;
-using Tizen.Applications;
-using System.Threading;
-
-namespace org.tizen.ApplicationManual.Tizen
-{
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
-    {
-        protected override void OnPreCreate()
-        {
-            Log.Debug("TCT", "[TestCase][OnPreCreate][Application] Pass");
-            base.OnPreCreate();
-        }
-        protected override void OnCreate()
-        {
-            base.OnCreate();
-
-            Log.Debug("TCT", "[TestCase][OnCreate][Application] Pass");
-
-            LoadApplication(new App());
-        }
-
-        protected override void OnResume()
-        {
-            Log.Debug("TCT", "[TestCase][OnResume][Application] Pass");
-            base.OnResume();
-        }
-
-        protected override void OnPause()
-        {
-            Log.Debug("TCT", "[TestCase][OnPause][Application] Pass");
-            base.OnPause();
-        }
-
-        protected override void OnTerminate()
-        {
-            Log.Debug("TCT", "Application::OnTerminate()");
-            Log.Debug("TCT", "[TestCase][OnTerminate][Application] Pass");
-            base.OnTerminate();
-        }
-
-        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnAppControlReceived()");
-            if (e.ReceivedAppControl != null)
-            {
-                Log.Debug("TCT", "[TestCase][Test_Properties] ReceivedAppControl properties is not null");
-                Log.Debug("TCT", "[TestCase][Test_Properties] ReceivedAppControl Type: " + e.ReceivedAppControl.GetType());
-            }
-            //logBuilder.AppendLine("TCT [TestCase][OnAppControlReceived] Pass");
-            Log.Debug("TCT", "[TestCase][OnAppControlReceived][Application] Pass");
-
-            base.OnAppControlReceived(e);
-            ShowPropertiesInfo();
-        }
-
-        protected override void OnLocaleChanged(LocaleChangedEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnLocaleChanged()");
-            if (e.Locale != null)
-            {
-                Log.Debug("TCT", "[Test_Properties] Locale properties is not null");
-                Log.Debug("TCT", "[Test_Properties] Current value of Locale : " + e.Locale);
-                Log.Debug("TCT", "[Test_Properties] Locale type: " + e.Locale.GetType());
-            }
-            
-            Log.Debug("TCT", "[TestCase][OnLocaleChanged][Application] Pass");
-            base.OnLocaleChanged(e);
-        }
-
-        protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnRegionFormatChanged()");
-            if (e != null)
-            {
-                Log.Debug("TCT", "[Test_Properties] Region properties is not null");
-                Log.Debug("TCT", "[Test_Properties] Current value of Region : " + e.Region);
-                Log.Debug("TCT", "[Test_Properties] Region type: " + e.Region.GetType());
-            }
-
-            Log.Debug("TCT", "[TestCase][OnRegionFormatChanged][Application] Pass");
-            base.OnRegionFormatChanged(e);
-        }
-
-        protected override void OnDeviceOrientationChanged(DeviceOrientationEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnDeviceOrientationChanged()");
-            if (e != null)
-            {
-                Log.Debug("TCT", "[Test_Properties] DeviceOrientation properties is not null");
-                Log.Debug("TCT", "[Test_Properties] Current value of DeviceOrientation : " + e.DeviceOrientation);
-                Log.Debug("TCT", "[Test_Properties] DeviceOrientation type: " + e.DeviceOrientation.GetType());
-            }
-
-            Log.Debug("TCT", "[TestCase][OnDeviceOrientationChanged][Application] Pass");
-            base.OnDeviceOrientationChanged(e);
-        }
-
-        protected override void OnLowMemory(LowMemoryEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnLowMemory()");
-            if (e.LowMemoryStatus != LowMemoryStatus.None)
-            {
-                Log.Debug("TCT", "[Test_Properties] LowMemoryStatus properties is not null");
-                Log.Debug("TCT", "[Test_Properties] Current value of LowMemoryStatus : " + e.LowMemoryStatus.ToString());
-                Log.Debug("TCT", "[Test_Properties] LowMemoryStatus type: " + e.LowMemoryStatus.GetType());
-            }
-            //logBuilder.AppendLine("TCT [TestCase][OnLowMemory] Pass");
-            Log.Debug("TCT", "[TestCase][OnLowMemory][Application] Pass");
-
-            base.OnLowMemory(e);
-        }
-
-        protected override void OnLowBattery(LowBatteryEventArgs e)
-        {
-            Log.Debug("TCT", "Application::OnLowBattery()");
-            if (e.LowBatteryStatus != LowBatteryStatus.None)
-            {
-                Log.Debug("TCT", "[Test_Properties] LowBatteryStatus properties is not null");
-                Log.Debug("TCT", "[Test_Properties] Current value of LowBatteryStatus : " + e.LowBatteryStatus.ToString());
-                Log.Debug("TCT", "[Test_Properties] LowBatteryStatus type: " + e.LowBatteryStatus.GetType());
-            }
-
-            Log.Debug("TCT", "[TestCase][OnLowBattery][Application] Pass");
-
-            base.OnLowBattery(e);
-        }
-
-        public override void Run(string[] args)
-        {
-            Created += Created_Event_Test;
-            AppControlReceived += AppControlReceived_Event_Test;
-            LocaleChanged += LocaleChanged_Event_Test;
-            LowMemory += LowMemory_Event_Test;
-            LowBattery += LowBattery_Event_Test;
-            Terminated += Terminated_Event_Test;
-            Paused += EventHandlerPaused;
-            Resumed += EventHandlerResumed;
-            DeviceOrientationChanged += DeviceOrientationCHanged_Event_Test;
-            RegionFormatChanged += RegionFormatChanged_Event_Test;
-
-            Log.Debug("TCT", "[TestCase][Run][Application] Pass");
-
-            base.Run(args);
-        }
-
-        private void Terminated_Event_Test(object sender, EventArgs e)
-        {
-            /* 
-                        * SCENARIO:
-                        * Launch app
-                        * -> If log show "Application::Terminated_Event_Test()" -> PASS
-                        */
-            Log.Debug("TCT", "Application::Terminated_Event_Test");
-            //logBuilder.AppendLine("TCT [TestCase][Terminated_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][Terminated_Event_Test][Application] Pass");
-        }
-
-        private void LocaleChanged_Event_Test(object sender, LocaleChangedEventArgs e)
-        {
-            /* 
-                        * SCENARIO:
-                        * Launch app
-                        * -> If log show "Application::LocaleChanged_Event_Test()" -> PASS
-                        */
-            Log.Debug("TCT", "Application::LocaleChanged_Event_Test");
-            Log.Debug("TCT", "Application::LocaleChanged_Event_Test: new located - " + e.Locale);
-            //logBuilder.AppendLine("TCT [TestCase][LocaleChanged_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][LocaleChanged_Event_Test][Application] Pass");
-        }
-
-        private void RegionFormatChanged_Event_Test(object sender, RegionFormatChangedEventArgs e)
-        {
-            Log.Debug("TCT", "Application::RegionFormatChanged_Event_Test");
-            Log.Debug("TCT", "Application::RegionFormatChanged_Event_Test: new region - " + e.Region);
-            //logBuilder.AppendLine("TCT [TestCase][LocaleChanged_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][RegionFormatChanged_Event_Test][Application] Pass");
-        }
-
-        private void DeviceOrientationCHanged_Event_Test(object sender, DeviceOrientationEventArgs e)
-        {            
-            Log.Debug("TCT", "Application::DeviceOrientationCHanged_Event_Test");
-            Log.Debug("TCT", "Application::DeviceOrientationCHanged_Event_Test: new located - " + e.DeviceOrientation);
-            Log.Debug("TCT", "[TestCase][DeviceOrientationCHanged_Event_Test][Application] Pass");
-        }
-
-        private void LowMemory_Event_Test(object sender, LowMemoryEventArgs e)
-        {
-            /* 
-                        * SCENARIO:
-                        * Launch app
-                        * -> If log show "Application::LowMemory_Event_Test()" -> PASS
-                        */
-            Log.Debug("TCT", "Application::LowMemory_Event_Test");
-            if (e.LowMemoryStatus == LowMemoryStatus.None)
-            {
-                Log.Debug("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.None");
-            }
-            else if (e.LowMemoryStatus == LowMemoryStatus.Normal)
-            {
-                Log.Debug("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.Normal");
-            }
-            else if (e.LowMemoryStatus == LowMemoryStatus.SoftWarning)
-            {
-                Log.Debug("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.SoftWarning");
-            }
-            else if (e.LowMemoryStatus == LowMemoryStatus.HardWarning)
-            {
-                Log.Debug("TCT", "Application::LowMemory_Event_Test: LowMemoryStatus.HardWarning");
-            }
-            //logBuilder.AppendLine("TCT [TestCase][LowMemory_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][LowMemory_Event_Test][Application] Pass");
-        }
-
-        private void LowBattery_Event_Test(object sender, LowBatteryEventArgs e)
-        {
-            Log.Debug("TCT", "Application::LowBattery_Event_Test");
-
-            if (e.LowBatteryStatus == LowBatteryStatus.CriticalLow)
-            {
-                Log.Debug("TCT", "Application::LowBattery_Event_Test: LowMemoryStatus.CriticalLow");
-            }
-            Log.Debug("TCT", "[TestCase][LowBattery_Event_Test][Application] Pass");
-        }
-
-        private void AppControlReceived_Event_Test(object sender, AppControlReceivedEventArgs e)
-        {
-            /* 
-                        * SCENARIO:
-                        * Launch app
-                        * -> If log show "Application::AppControlReceived_Event_Test()" -> PASS
-                        */
-            Log.Debug("TCT", "Application::AppControlReceived_Event_Test");
-            //logBuilder.AppendLine("TCT [TestCase][AppControlReceived_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][AppControlReceived_Event_Test][Application] Pass");
-        }
-
-        private void Created_Event_Test(object sender, EventArgs e)
-        {
-            /* 
-                        * SCENARIO:
-                        * Launch app
-                        * -> If log show "Application::Created_Event_Test()" -> PASS
-                        */
-            Log.Debug("TCT", "Application::Created_Event_Test");
-            //logBuilder.AppendLine("TCT [TestCase][Created_Event_Test] Pass");
-            Log.Debug("TCT", "[TestCase][Created_Event_Test][Application] Pass");
-        }
-        public void EventHandlerPaused(object sender, EventArgs e)
-        {
-            /* 
-             * PRECONDITION
-             * 1. Open Application app.
-             * 2. Open other app.
-             */             
-            Log.Debug("TCT", "[TestCase][EventHandlerPaused][Application] Pass");
-        }
-        public void EventHandlerResumed(object sender, EventArgs e)
-        {
-            /* 
-             * PRECONDITION
-             * 1. Open Application app.
-             * 2. Open other app.
-             * 3. Long press HOME button and tap to Applicaton shortcut.
-             */
-            Log.Debug("TCT", "Application Resumed event occur!");
-            Log.Debug("TCT", "[TestCase][EventHandlerResumed][Application] Pass");
-        }
-
-        public override void Exit()
-        {
-            Log.Debug("TCT", "[TestCase][Exit][Application] Pass");
-            base.Exit();
-        }
-        void ShowPropertiesInfo()
-        {
-            if (base.ApplicationInfo != null)
-            {
-                Log.Debug("TCT", "[Info] ApplicationInfo is not null");
-                Log.Debug("TCT", "[Info] ApplicationInfo.ApplicationId = " + base.ApplicationInfo.ApplicationId);
-                Log.Debug("TCT", "[Info] ApplicationInfo.ApplicationType = " + base.ApplicationInfo.ApplicationType);
-                Log.Debug("TCT", "[Info] ApplicationInfo.ExecutablePath = " + base.ApplicationInfo.ExecutablePath);
-                Log.Debug("TCT", "[Info] ApplicationInfo.ExternalSharedDataPath = " + base.ApplicationInfo.ExternalSharedDataPath);
-                Log.Debug("TCT", "[Info] ApplicationInfo.IconPath = " + base.ApplicationInfo.IconPath);
-                Log.Debug("TCT", "[Info] ApplicationInfo.IsNoDisplay = " + base.ApplicationInfo.IsNoDisplay);
-                Log.Debug("TCT", "[Info] ApplicationInfo.IsOnBoot = " + base.ApplicationInfo.IsOnBoot);
-                Log.Debug("TCT", "[Info] ApplicationInfo.IsPreload = " + base.ApplicationInfo.IsPreload);
-                Log.Debug("TCT", "[Info] ApplicationInfo.Label = " + base.ApplicationInfo.Label);
-                Log.Debug("TCT", "[Info] ApplicationInfo.Metadata Count = " + base.ApplicationInfo.Metadata.Count);
-                foreach (var item in base.ApplicationInfo.Metadata)
-                {
-                    Log.Debug("TCT", "[Info] ApplicationInfo.Metadata, Key: " + item.Key + " Value: " + item.Value);
-                }
-                Log.Debug("TCT", "[Info] ApplicationInfo.PackageId = " + base.ApplicationInfo.PackageId);
-                Log.Debug("TCT", "[Info] ApplicationInfo.SharedDataPath = " + base.ApplicationInfo.SharedDataPath);
-                Log.Debug("TCT", "[Info] ApplicationInfo.SharedResourcePath = " + base.ApplicationInfo.SharedResourcePath);
-                Log.Debug("TCT", "[Info] ApplicationInfo.SharedTrustedPath = " + base.ApplicationInfo.SharedTrustedPath);
-            }
-            if (base.DirectoryInfo != null)
-            {
-                Log.Debug("TCT", "[Info] DirectoryInfo is not null");
-                Log.Debug("TCT", "[Info] DirectoryInfo.Cache = " + base.DirectoryInfo.Cache);
-                Log.Debug("TCT", "[Info] DirectoryInfo.Data = " + base.DirectoryInfo.Data);
-                Log.Debug("TCT", "[Info] DirectoryInfo.ExpansionPackageResource = " + base.DirectoryInfo.ExpansionPackageResource);
-                Log.Debug("TCT", "[Info] DirectoryInfo.ExternalCache = " + base.DirectoryInfo.ExternalCache);
-                Log.Debug("TCT", "[Info] DirectoryInfo.ExternalData = " + base.DirectoryInfo.ExternalData);
-                Log.Debug("TCT", "[Info] DirectoryInfo.ExternalSharedData = " + base.DirectoryInfo.ExternalSharedData);
-                Log.Debug("TCT", "[Info] DirectoryInfo.Resource = " + base.DirectoryInfo.Resource);
-                Log.Debug("TCT", "[Info] DirectoryInfo.SharedData = " + base.DirectoryInfo.SharedData);
-                Log.Debug("TCT", "[Info] DirectoryInfo.SharedResource = " + base.DirectoryInfo.SharedResource);
-                Log.Debug("TCT", "[Info] DirectoryInfo.SharedTrusted = " + base.DirectoryInfo.SharedTrusted);
-            }
-
-            Log.Debug("TCT", "[Info] Current == this : " + (Current == this));
-            Log.Debug("TCT", "[Info] Current.ApplicationInfo.ApplicationId = " + Current.ApplicationInfo.ApplicationId);
-        }
-
-        static void Main(string[] args)
-        {
-            var app = new Program();
-            global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
-            app.Run(args);
-        }
-    }
-}
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.csproj b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.csproj
deleted file mode 100755
index 31bc7c5..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{2F98DAC9-6F16-457B-AED7-D43CAC379341};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{341E5235-6060-4179-906D-0B3F264B9F5A}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>org.tizen.ApplicationManual.Tizen</RootNamespace>
-    <AssemblyName>org.tizen.ApplicationManual.Tizen</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
-    <BaseNuGetRuntimeIdentifier>tizen.4.0.0-armel</BaseNuGetRuntimeIdentifier>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="org.tizen.ApplicationManual.Tizen.project.json" />
-    <None Include="tizen-manifest.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="shared\res\org.tizen.ApplicationManual.Tizen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="org.tizen.ApplicationManual.cs" />
-    <Compile Include="org.tizen.ApplicationManual.Tizen.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="lib\" />
-    <Folder Include="res\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-		Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-  <PropertyGroup>
-    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
-			 https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
-		-->
-    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
-			 properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
-			 to prevent it from outputting a warning (MSB3644).
-		-->
-    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
-    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
-    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCommonFlavorCfg>
-          <excludeXamarinForms>True</excludeXamarinForms>
-        </ProjectCommonFlavorCfg>
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.project.json b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.project.json
deleted file mode 100755
index dd8f8ef..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "buildOptions": {
-    "emitEntryPoint": true,
-    "debugType": "portable",
-    "platform": "AnyCPU",
-    "preserveCompilationContext": true
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": "2.0.0-preview1-002111-00",
-    "Tizen": "1.0.5",
-    "Tizen.Applications.Common": "1.5.8",
-    "Tizen.Applications.UI": "1.5.8",
-    "Xamarin.Forms": "2.3.5.256-pre6",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r256-001"
-  },
-  "runtimes": {
-    "tizen.4.0.0-armel": {}
-  },
-  "frameworks": {
-    "netcoreapp2.0": {
-      "imports": [
-        "portable-net45+wp80+win81+wpa81",
-        "netstandard1.6"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.sln b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.sln
deleted file mode 100755
index a67f0cd..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/org.tizen.ApplicationManual.Tizen.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.tizen.ApplicationManual.Tizen", "org.tizen.ApplicationManual.Tizen.csproj", "{341E5235-6060-4179-906D-0B3F264B9F5A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{341E5235-6060-4179-906D-0B3F264B9F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{341E5235-6060-4179-906D-0B3F264B9F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{341E5235-6060-4179-906D-0B3F264B9F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{341E5235-6060-4179-906D-0B3F264B9F5A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/shared/res/org.tizen.ApplicationManual.Tizen.png b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/shared/res/org.tizen.ApplicationManual.Tizen.png
deleted file mode 100755
index 9765b1b..0000000
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/shared/res/org.tizen.ApplicationManual.Tizen.png and /dev/null differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/tizen-manifest.xml
deleted file mode 100755
index a1051cf..0000000
--- a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/code/org.tizen.ApplicationManual.Tizen/tizen-manifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.ApplicationManual.Tizen" version="1.0.0">
-	<profile name="common" />
-	<ui-application appid="org.tizen.ApplicationManual.Tizen"
-					exec="org.tizen.ApplicationManual.Tizen.exe"
-					type="dotnet"
-					multiple="false"
-					taskmanage="true"
-					launch_mode="single">
-	<icon>org.tizen.ApplicationManual.Tizen.png</icon>
-	<label>org.tizen.ApplicationManual.Tizen</label>
-	</ui-application>
-</manifest>
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ApplicationManual.Tizen.tpk b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ApplicationManual.Tizen.tpk
old mode 100755
new mode 100644
index 7aca064..491ebbb
Binary files a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ApplicationManual.Tizen.tpk and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ApplicationManual.Tizen.tpk differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ServiceApplicationManual.Tizen.tpk b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ServiceApplicationManual.Tizen.tpk
new file mode 100644
index 0000000..40f02ea
Binary files /dev/null and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.ServiceApplicationManual.Tizen.tpk differ
diff --git a/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.example.EventListener.Tizen.tpk b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.example.EventListener.Tizen.tpk
new file mode 100644
index 0000000..6228e16
Binary files /dev/null and b/tct-suite-vs/Resource/Tizen.Applications.Manual.Tests/org.tizen.example.EventListener.Tizen.tpk differ