From 35366da2e6b3a5e4c02d6e769b9e3af3f4d8d669 Mon Sep 17 00:00:00 2001
From: Wonyoung Choi <wy80.choi@samsung.com>
Date: Tue, 26 Sep 2017 17:13:12 +0900
Subject: [PATCH] Fix build props and targets of Tizen.NET nuget package

Change-Id: I84ed8446baef99997d13e10a7547e3b7c6341907
---
 pkg/build/Tizen.NET.props           | 12 ------------
 pkg/build/Tizen.NET.targets         |  9 ---------
 pkg/build/tizen40/Tizen.NET.props   |  7 -------
 pkg/build/tizen40/Tizen.NET.targets | 29 +++++++++++++++++++++--------
 4 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 pkg/build/Tizen.NET.props
 delete mode 100644 pkg/build/Tizen.NET.targets

diff --git a/pkg/build/Tizen.NET.props b/pkg/build/Tizen.NET.props
deleted file mode 100644
index 5f2f172..0000000
--- a/pkg/build/Tizen.NET.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TizenNETPackageName>Tizen.NET</TizenNETPackageName>
-    <TizenNETPackageVersion>4.0.0</TizenNETPackageVersion>
-  </PropertyGroup>
-
-</Project>
diff --git a/pkg/build/Tizen.NET.targets b/pkg/build/Tizen.NET.targets
deleted file mode 100644
index 6afc032..0000000
--- a/pkg/build/Tizen.NET.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <!-- TBD -->
-
-</Project>
\ No newline at end of file
diff --git a/pkg/build/tizen40/Tizen.NET.props b/pkg/build/tizen40/Tizen.NET.props
index e75cfc9..14225f6 100644
--- a/pkg/build/tizen40/Tizen.NET.props
+++ b/pkg/build/tizen40/Tizen.NET.props
@@ -4,16 +4,9 @@
     <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 e745ed8..76995dc 100644
--- a/pkg/build/tizen40/Tizen.NET.targets
+++ b/pkg/build/tizen40/Tizen.NET.targets
@@ -4,23 +4,39 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <BundledNETStandardPackageVersion Condition="'$(BundledNETStandardPackageVersion)' == ''">2.0.0</BundledNETStandardPackageVersion>
+    <BundledNETCoreAppPackageVersion Condition="'$(BundledNETCoreAppPackageVersion)' == ''">2.0.0</BundledNETCoreAppPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DisableStandardFrameworkResolution>true</DisableStandardFrameworkResolution>
+    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
+    <TargetExt Condition="'$(TargetExt)' == ''">.dll</TargetExt>
+    <GenerateDependencyFile Condition=" '$(GenerateDependencyFile)' == '' ">true</GenerateDependencyFile>
+    <CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
   <!--
     Tizen4.0 TFM supports NETStandard2.0. However NETStandard.Library does not
     provide reference assemblies when referenced by other TFMs.
     So, the same reference assemblies are provided directly from Tizen.NET.
     These reference assemblies came from NETStandard.Library 2.0.0.
   -->
-
-  <ItemGroup>
+  <ItemGroup  Condition="'$(OutputType)' != 'Exe'">
     <Reference Include="$(MSBuildThisFileDirectory)\ref\*.dll">
       <Private>false</Private>
       <Visible>false</Visible>
       <Facade Condition="'%(FileName)' != 'netstandard'">true</Facade>
-      <NuGetPackageId>$(TizenNETPackageName)</NuGetPackageId>
-      <NuGetPackageVersion>$(TizenNETPackageVersion)</NuGetPackageVersion>
+      <NuGetPackageId>NETStandard.Library</NuGetPackageId>
+      <NuGetPackageVersion>$(BundledNETStandardPackageVersion)</NuGetPackageVersion>
     </Reference>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(OutputType)' != 'Exe'">
+    <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <!--
     Tizen platform supports .NETCore 2.0 runtime.
     In application, NETCoreApp2.0 APIs are also available.
@@ -31,10 +47,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(OutputType)' == 'Exe'">
-    <PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="$(BundledNETCoreAppPackageVersion)" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  <!-- Import common targets -->
-  <Import Project="$(MSBuildThisFileDirectory)..\Tizen.NET.targets" />
-
 </Project>
\ No newline at end of file
-- 
2.7.4