Migrate to latest TizenStudio Visual Studio plugin

Migrate solution to VisualStudioToolsForTizen cps_test15

Change-Id: I84b3bda6414ab90802ac15cfbec50006f3990ad2

diff --git a/TaskManager.sln b/TaskManager.sln
index 263f60dbf6c8d6ec670d3b05428bd15c2c77203d..d1dd7d38f896367fde56d6f6e2a100a51c3a1c52 100644 (file)
--- a/TaskManager.sln
+++ b/TaskManager.sln
@@ -1,26 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskManager.Tizen", "TaskManager\TaskManager.Tizen\TaskManager.Tizen.csproj", "{DFB502D6-497D-48BC-ACAD-BEBB91696CE0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskManager.Tizen", "TaskManager\TaskManager.Tizen\TaskManager.Tizen.csproj", "{95714044-A5C5-418B-9A8E-F7FD3DE3D106}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
-               Debug|x86 = Debug|x86
                Release|Any CPU = Release|Any CPU
-               Release|x86 = Release|x86
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Debug|x86.ActiveCfg = Debug|x86
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Debug|x86.Build.0 = Debug|x86
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Release|Any CPU.Build.0 = Release|Any CPU
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Release|x86.ActiveCfg = Release|x86
-               {DFB502D6-497D-48BC-ACAD-BEBB91696CE0}.Release|x86.Build.0 = Release|x86
+               {95714044-A5C5-418B-9A8E-F7FD3DE3D106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {95714044-A5C5-418B-9A8E-F7FD3DE3D106}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {95714044-A5C5-418B-9A8E-F7FD3DE3D106}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {95714044-A5C5-418B-9A8E-F7FD3DE3D106}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/TaskManager/TaskManager.Tizen/Properties/AssemblyInfo.cs b/TaskManager/TaskManager.Tizen/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index f52e621..0000000
--- a/TaskManager/TaskManager.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("TaskManager.Tizen")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung")]
-[assembly: AssemblyProduct("TaskManager.Tizen")]
-[assembly: AssemblyCopyright("Copyright © Samsung 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("dfb502d6-497d-48bc-acad-bebb91696ce0")]
-
-// 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/TaskManager/TaskManager.Tizen/TaskManager.Tizen.cs b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.cs
index 6bea48ff6d9ce3c884e908843dfd0006ab7748a7..5c82fc5181841c8ae20ea5161f5b8efa732f44ee 100644 (file)
--- a/TaskManager/TaskManager.Tizen/TaskManager.Tizen.cs
+++ b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.cs
@@ -3,7 +3,7 @@ using ElmSharp;
 
 namespace TaskManager.Tizen
 {
-    class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
+    class Program : Xamarin.Forms.Platform.Tizen.FormsApplication
     {
         protected override void OnCreate()
         {

diff --git a/TaskManager/TaskManager.Tizen/TaskManager.Tizen.csproj b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.csproj
index 37e6ebf418c6ec45267a82d07b168fc77d1745ae..bac1e03036896c3a0195724af8345621c3728a60 100644 (file)
--- a/TaskManager/TaskManager.Tizen/TaskManager.Tizen.csproj
+++ b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.csproj
@@ -1,157 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
-    <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>{DFB502D6-497D-48BC-ACAD-BEBB91696CE0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TaskManager.Tizen</RootNamespace>
-    <AssemblyName>TaskManager.Tizen</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
+
+  <!-- Property Group for Tizen Project -->
   <PropertyGroup>
-    <TargetFrameworkIdentifier>DNXCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
-    <NoStdLib>true</NoStdLib>
-    <NoWarn>$(NoWarn);1701</NoWarn>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <TizenCreateTpkOnBuild>true</TizenCreateTpkOnBuild>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+wp80+win81+wpa81</PackageTargetFallback>
   </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>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <NoWarn>;1701</NoWarn>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>portable</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <DebugType>None</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;1701</NoWarn>
-    <NoStdLib>true</NoStdLib>
-    <DebugType>portable</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="TaskManager.Tizen.project.json" />
-    <None Include="tizen-manifest.xml" />
-    <None Include="shared\res\TaskManager.Tizen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Intefaces\ITaskManagedAppController.cs" />
-    <Compile Include="Interop\Interop.ApplicationManager.cs" />
-    <Compile Include="Model\AppContext.cs" />
-    <Compile Include="Model\TaskmanagedAppController.cs" />
-    <Compile Include="Controls\HiddenBarScrollView.cs" />
-    <Compile Include="Model\ApplicationInfo.cs" />
-    <Compile Include="Controls\Renderers\HiddenBarScrollViewRenderer.cs" />
-    <Compile Include="Services\ApplicationService.cs" />
-    <Compile Include="TaskManager.cs" />
-    <Compile Include="TaskManager.Tizen.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utils\Converters\ListToBoolConverter.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="Views\AppItemView.xaml.cs">
-      <DependentUpon>AppItemView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\BindableStackLayout.cs" />
-    <Compile Include="Views\ClearAllItemView.xaml.cs">
-      <DependentUpon>ClearAllItemView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
-    <Folder Include="lib\" />
+    <None Remove="Views\AppItemView.xaml" />
+    <None Remove="Views\ClearAllItemView.xaml" />
+    <None Remove="Views\MainView.xaml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\MainView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Views\AppItemView.xaml" />
+    <EmbeddedResource Include="Views\ClearAllItemView.xaml" />
+    <EmbeddedResource Include="Views\MainView.xaml" />
   </ItemGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="Views\AppItemView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
+       <Folder Include="lib\" />
+       <Folder Include="Properties\" />
+       <Folder Include="Properties\" />
+       <Folder Include="res\" />
   </ItemGroup>
+
+  <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <EmbeddedResource Include="Views\ClearAllItemView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
+    <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00142" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0-pre1" />
+    <PackageReference Include="Xamarin.Forms" Version="2.4.0.269-pre2" />
+    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r266-006" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="res\images\clear_all_button_icon.png" />
-  </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="Debug|x86">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-      <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|x86">
-        <ProjectCommonFlavorCfg />
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
+
+  <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/TaskManager/TaskManager.Tizen/TaskManager.Tizen.nuget.targets b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.nuget.targets
deleted file mode 100644 (file)
index 9f1ee96..0000000
--- a/TaskManager/TaskManager.Tizen/TaskManager.Tizen.nuget.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.5.239-pre3\build\netstandard1.0\Xamarin.Forms.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/TaskManager/TaskManager.Tizen/TaskManager.Tizen.project.json b/TaskManager/TaskManager.Tizen/TaskManager.Tizen.project.json
deleted file mode 100644 (file)
index e92ec99..0000000
--- a/TaskManager/TaskManager.Tizen/TaskManager.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-preview2-25318-02",
-    "Tizen.Library": "1.0.0-pre3",
-    "Xamarin.Forms": "2.3.5.239-pre3",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-004"
-  },
-  "runtimes": {
-    "win": {},
-    "linux": {}
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "portable-net45+wp80+win81+wpa81",
-        "netstandard1.6"
-      ]
-    }
-  }
-}
\ No newline at end of file

diff --git a/TaskManager/TaskManager.Tizen/shared/res/TaskManager.Tizen.png b/TaskManager/TaskManager.Tizen/shared/res/TaskManager.Tizen.png
index 9765b1bda7e5bddf0925555ab204b887a873bf24..9f3cb98608134e7b9eb4beb7394fec9f03e40f63 100644 (file)
Binary files a/TaskManager/TaskManager.Tizen/shared/res/TaskManager.Tizen.png and b/TaskManager/TaskManager.Tizen/shared/res/TaskManager.Tizen.png differ

diff --git a/TaskManager/TaskManager.Tizen/tizen-manifest.xml b/TaskManager/TaskManager.Tizen/tizen-manifest.xml
index 4f8ebcf57a210f06649d1a23e4b18ff815b87472..442d06a9b8d1cd360a37a5ecc8cb6754ccda612a 100644 (file)
--- a/TaskManager/TaskManager.Tizen/tizen-manifest.xml
+++ b/TaskManager/TaskManager.Tizen/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.task-mgr" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
+<manifest package="org.tizen.task-mgr" version="1.0.0" api-version="4" xmlns="http://tizen.org/ns/packages">
   <profile name="mobile" />
-  <ui-application appid="org.tizen.task-mgr" exec="TaskManager.Tizen.exe" multiple="false" nodisplay="false" taskmanage="false" splash-screen-display="true" type="dotnet" launch_mode="single">
+  <ui-application appid="org.tizen.task-mgr" exec="TaskManager.Tizen.dll" multiple="false" nodisplay="true" taskmanage="false" splash-screen-display="true" type="dotnet" hw-acceleration="on" launch_mode="single">
     <label>task-mgr</label>
     <icon>TaskManager.Tizen.png</icon>
   </ui-application>