From 07bacd89bb4b675a04d9b2b47ed93785dead2409 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Tue, 4 Oct 2016 13:21:56 +0900
Subject: [PATCH] Use nuget restore to solve dependencies

Change-Id: I4c6b637320563f438bcbba040d92c7010eec2808
---
 Tizen.Applications/Tizen.Applications.Net45.csproj |  5 +-
 .../Tizen.Applications.Net45.project.json          |  2 +-
 Tizen.Applications/Tizen.Applications.csproj       |  9 ++-
 Tizen.Applications/Tizen.Applications.nuspec       |  6 +-
 Tizen.Applications/Tizen.Applications.project.json |  7 +--
 Tizen.Applications/Tizen.Applications/Bundle.cs    |  2 +-
 packaging/csapi-application.spec                   | 66 +++++-----------------
 7 files changed, 30 insertions(+), 67 deletions(-)

diff --git a/Tizen.Applications/Tizen.Applications.Net45.csproj b/Tizen.Applications/Tizen.Applications.Net45.csproj
index 28b8e30..da4817c 100644
--- a/Tizen.Applications/Tizen.Applications.Net45.csproj
+++ b/Tizen.Applications/Tizen.Applications.Net45.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -122,7 +122,6 @@
     <None Include="Tizen.Applications.Net45.project.json" />
     <None Include="Tizen.Applications.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
   <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.
@@ -131,4 +130,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tizen.Applications/Tizen.Applications.Net45.project.json b/Tizen.Applications/Tizen.Applications.Net45.project.json
index d9af4f0..ab1a0ee 100644
--- a/Tizen.Applications/Tizen.Applications.Net45.project.json
+++ b/Tizen.Applications/Tizen.Applications.Net45.project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Tizen": "1.0.0"
+    "Tizen": "1.0.1"
   },
   "frameworks": {
     "net45": {}
diff --git a/Tizen.Applications/Tizen.Applications.csproj b/Tizen.Applications/Tizen.Applications.csproj
index da97323..d591db9 100644
--- a/Tizen.Applications/Tizen.Applications.csproj
+++ b/Tizen.Applications/Tizen.Applications.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <NoStdLib>true</NoStdLib>
     <NoWarn>$(NoWarn);1701;1702</NoWarn>
@@ -119,7 +119,6 @@
     <None Include="Tizen.Applications.project.json" />
     <None Include="Tizen.Applications.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
   <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.
@@ -140,4 +139,4 @@
     <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
     <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tizen.Applications/Tizen.Applications.nuspec b/Tizen.Applications/Tizen.Applications.nuspec
index 2d5891a..3e97dda 100644
--- a/Tizen.Applications/Tizen.Applications.nuspec
+++ b/Tizen.Applications/Tizen.Applications.nuspec
@@ -6,7 +6,11 @@
 		<authors>Tizen Developers</authors>
 		<description>Application Frameworks API for Tizen.Net</description>
     <dependencies>
-      <dependency id="Tizen" version="1.0.0" />
+      <dependency id="Tizen" version="1.0.1" />
     </dependencies>
 	</metadata>
+  <files>
+    <file src="bin/$Configuration$/Tizen.Applications.dll" target="lib/netstandard1.3" />
+    <file src="bin/$Configuration$/Net45/Tizen.Applications.dll" target="lib/net45" />
+  </files>
 </package>
\ No newline at end of file
diff --git a/Tizen.Applications/Tizen.Applications.project.json b/Tizen.Applications/Tizen.Applications.project.json
index beb9e15..db7436c 100644
--- a/Tizen.Applications/Tizen.Applications.project.json
+++ b/Tizen.Applications/Tizen.Applications.project.json
@@ -1,12 +1,9 @@
 {
   "dependencies": {
     "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.0"
+    "Tizen": "1.0.1"
   },
   "frameworks": {
-    "netstandard1.6": {}
-  },
-  "runtimes": {
-    "win": {}
+    "netstandard1.3": {}
   }
 }
diff --git a/Tizen.Applications/Tizen.Applications/Bundle.cs b/Tizen.Applications/Tizen.Applications/Bundle.cs
index 0a5bc68..bc2f3b4 100644
--- a/Tizen.Applications/Tizen.Applications/Bundle.cs
+++ b/Tizen.Applications/Tizen.Applications/Bundle.cs
@@ -525,7 +525,7 @@ namespace Tizen.Applications
                         return typeof(string) == typeof(T);
 
                     case (int)BundleType.StringArray:
-                        return typeof(T).GetTypeInfo().IsAssignableFrom(typeof(string[]));
+                        return typeof(T).GetTypeInfo().IsAssignableFrom(typeof(string[]).GetTypeInfo());
 
                     case (int)BundleType.Byte:
                         return typeof(byte[]) == typeof(T);
diff --git a/packaging/csapi-application.spec b/packaging/csapi-application.spec
index 65f21dc..24a658a 100755
--- a/packaging/csapi-application.spec
+++ b/packaging/csapi-application.spec
@@ -1,5 +1,4 @@
 %{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework}
-%{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref}
 
 %if 0%{?tizen_build_devel_mode}
 %define BUILDCONF Debug
@@ -9,7 +8,7 @@
 
 Name:       csapi-application
 Summary:    Tizen Application API for C#
-Version:    1.0.0
+Version:    1.0.1
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -17,20 +16,14 @@ URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 
-# Mono
 BuildRequires: mono-compiler
 BuildRequires: mono-devel
 
-# .NETCore
-%if 0%{?_with_corefx}
-AutoReqProv: no
-BuildRequires: corefx-managed-32b-ref
-%endif
-
 BuildRequires: dotnet-build-tools
 
-# C# API Requries
-BuildRequires: csapi-tizen-devel
+# NuGet for Dependencies
+BuildRequires: csapi-tizen-nuget
+
 
 %description
 Tizen Application API for C#
@@ -42,42 +35,26 @@ cp %{SOURCE1} .
 %define Assemblies Tizen.Applications
 
 %build
-# Build for Net45
 for ASM in %{Assemblies}; do
-if [ -e $ASM/$ASM.Net45.csproj ]; then
-  xbuild $ASM/$ASM.Net45.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/net45 \
-         /p:OutputPath=bin/net45
-fi
-
-# Build for Dotnet
-%if 0%{?_with_corefx}
-if [ -e $ASM/$ASM.csproj ]; then
-  xbuild $ASM/$ASM.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/netstandard1.6 \
-         /p:CoreFxPath=%{dotnet_core_path} \
-         /p:OutputPath=bin/netstandard1.6
-fi
-%endif
-
-# Make NuGet package
-dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin
-
+# NuGet Restore
+find $ASM/*.project.json -exec nuget restore {} \;
+# Build
+find $ASM/*.csproj -exec xbuild {} /p:Configuration=%{BUILDCONF} \;
+# NuGet Pack
+nuget pack $ASM/$ASM.nuspec -Version %{version} -Properties Configuration=%{BUILDCONF}
 done
 
 %install
-mkdir -p %{buildroot}%{dotnet_assembly_path}/devel
+# Runtime Binary
+mkdir -p %{buildroot}%{dotnet_assembly_path}
 for ASM in %{Assemblies}; do
-  cp -fr $ASM/bin/* %{buildroot}%{dotnet_assembly_path}/devel
 %if 0%{?_with_corefx}
-  install -p -m 644 $ASM/bin/netstandard1.6/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %else
-  install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %endif
 done
-
+# NuGet
 mkdir -p %{buildroot}/nuget
 install -p -m 644 *.nupkg %{buildroot}/nuget
 
@@ -86,22 +63,9 @@ install -p -m 644 *.nupkg %{buildroot}/nuget
 %license LICENSE
 %attr(644,root,root) %{dotnet_assembly_path}/*.dll
 
-%package devel
-Summary:   Development package for %{name}
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-AutoReqProv: no
-
-%description devel
-Development package for %{name}
-
-%files devel
-%{dotnet_assembly_path}/devel/*
-
 %package nuget
 Summary:   NuGet package for %{name}
 Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
 
 %description nuget
 NuGet package for %{name}
-- 
2.7.4