From 4c4b8080e9edbb2e4b4441b9289a859557205ee3 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Thu, 31 Aug 2017 17:14:55 +0900
Subject: [PATCH] Add netcoreapp2.0 supports in tizen40 TFM if OutputType is
 Exe

Change-Id: I7686a6f9e1c126c35fae341b2807a232e63fc112
---
 pkg/Tizen.NET.Private.nuspec        |  1 -
 pkg/Tizen.NET.nuspec                |  1 -
 pkg/build/tizen40/Tizen.NET.props   |  4 ++++
 pkg/build/tizen40/Tizen.NET.targets | 14 ++++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg/Tizen.NET.Private.nuspec b/pkg/Tizen.NET.Private.nuspec
index 662e29e..08e8ef9 100644
--- a/pkg/Tizen.NET.Private.nuspec
+++ b/pkg/Tizen.NET.Private.nuspec
@@ -13,7 +13,6 @@
     <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
   </metadata>
   <files>
-    <file src="pkg\PlatformFileList.txt" />
     <file src="pkg\build\**" target="build" />
     <file src="Artifacts\bin\*.dll" target="lib\netstandard1.6" />
     <file src="Artifacts\bin\*.pdb" target="lib\netstandard1.6" />
diff --git a/pkg/Tizen.NET.nuspec b/pkg/Tizen.NET.nuspec
index a00f3a2..8511a4b 100644
--- a/pkg/Tizen.NET.nuspec
+++ b/pkg/Tizen.NET.nuspec
@@ -13,7 +13,6 @@
     <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
   </metadata>
   <files>
-    <file src="pkg\PlatformFileList.txt" />
     <file src="pkg\build\**" target="build" />
     <file src="Artifacts\bin\ElmSharp.dll" target="lib\netstandard1.6" />
     <file src="Artifacts\bin\ElmSharp.pdb" target="lib\netstandard1.6" />
diff --git a/pkg/build/tizen40/Tizen.NET.props b/pkg/build/tizen40/Tizen.NET.props
index b47da45..e75cfc9 100644
--- a/pkg/build/tizen40/Tizen.NET.props
+++ b/pkg/build/tizen40/Tizen.NET.props
@@ -4,12 +4,16 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
+  <!--
+    Properties required to use Microsoft.NET.Sdk as is.
+  -->
   <PropertyGroup>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <_IsNETCoreOrNETStandard>true</_IsNETCoreOrNETStandard>
   </PropertyGroup>
 
+  <!-- Import common props -->
   <Import Project="$(MSBuildThisFileDirectory)..\Tizen.NET.props" />
 
 </Project>
diff --git a/pkg/build/tizen40/Tizen.NET.targets b/pkg/build/tizen40/Tizen.NET.targets
index e323041..e745ed8 100644
--- a/pkg/build/tizen40/Tizen.NET.targets
+++ b/pkg/build/tizen40/Tizen.NET.targets
@@ -21,6 +21,20 @@
     </Reference>
   </ItemGroup>
 
+  <!--
+    Tizen platform supports .NETCore 2.0 runtime.
+    In application, NETCoreApp2.0 APIs are also available.
+  -->
+  <PropertyGroup Condition="'$(OutputType)' == 'Exe'">
+    <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <AssetTargetFallback>netcoreapp2.0</AssetTargetFallback>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(OutputType)' == 'Exe'">
+    <PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+  <!-- Import common targets -->
   <Import Project="$(MSBuildThisFileDirectory)..\Tizen.NET.targets" />
 
 </Project>
\ No newline at end of file
-- 
2.7.4