From 3aa1876fd507969c1823183eb68bc3ef4c1da387 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Thu, 8 Jun 2017 09:18:25 +0900
Subject: [PATCH] Merge packaging information to csproj

Change-Id: I7da25c08f3551f56b2c9df1af0da874102348e70
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 .gitignore                                          |  7 +++++++
 .../Tizen.Network.Bluetooth.csproj                  | 21 +++++++++++++++------
 .../Tizen.Network.Bluetooth.nuspec                  | 17 -----------------
 packaging/csapi-network-bluetooth.spec              |  3 ++-
 4 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.nuspec

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..46619d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+bin/
+obj/
+*.exe
+*.dll
+*.csproj.user
+*.lock.json
+.vs/
diff --git a/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj b/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj
index ef03425..a88028a 100644
--- a/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj
+++ b/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.csproj
@@ -1,16 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <Version>1.0.9</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Bluetooth API for Tizen .NET</Description>
+    <PackageProjectUrl>https://www.tizen.org/</PackageProjectUrl>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</PackageIconUrl>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Network.Bluetooth.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NETStandard.Library" Version="1.6.0" />
-    <PackageReference Include="Tizen" Version="1.0.3" />
-	<PackageReference Include="Tizen.System.Information" Version="1.0.3" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
+    <PackageReference Include="Tizen.System.Information" Version="1.0.4" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.nuspec b/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.nuspec
deleted file mode 100644
index dc2b515..0000000
--- a/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-	<metadata>
-		<id>Tizen.Network.Bluetooth</id>
-		<version>$version$</version>
-		<authors>Samsung Electronics</authors>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<licenseUrl>https://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
-		<projectUrl>https://www.tizen.org/</projectUrl>
-		<iconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</iconUrl>
-		<copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
-		<description>Provides the Bluetooth API for Tizen.Net</description>
-		<dependencies>
-			<dependency id="Tizen" version="1.0.2" />
-		</dependencies>
-	</metadata>
-</package>
diff --git a/packaging/csapi-network-bluetooth.spec b/packaging/csapi-network-bluetooth.spec
index d872062..901116b 100644
--- a/packaging/csapi-network-bluetooth.spec
+++ b/packaging/csapi-network-bluetooth.spec
@@ -15,6 +15,7 @@ BuildRequires: dotnet-build-tools
 
 # C# API Requries
 BuildRequires: csapi-tizen-nuget
+BuildRequires: csapi-information-nuget
 
 %define Assemblies Tizen.Network.Bluetooth
 
@@ -30,7 +31,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install
-- 
2.7.4