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

Change-Id: Ide7360f5b22ba17484e73242962c73fdf229067c
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 .gitignore                                              |  7 +++++++
 packaging/csapi-network-connection.spec                 |  2 +-
 .../Tizen.Network.Connection.csproj                     | 14 +++++++++++---
 .../Tizen.Network.Connection.nuspec                     | 17 -----------------
 4 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 src/Tizen.Network.Connection/Tizen.Network.Connection.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/packaging/csapi-network-connection.spec b/packaging/csapi-network-connection.spec
index 614a320..7f42220 100755
--- a/packaging/csapi-network-connection.spec
+++ b/packaging/csapi-network-connection.spec
@@ -30,7 +30,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install
diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
index 14ca15f..4bf81dd 100644
--- a/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
+++ b/src/Tizen.Network.Connection/Tizen.Network.Connection.csproj
@@ -1,4 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.18</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Connection APIs 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.3</TargetFramework>
@@ -6,11 +16,9 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Network.Connection.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
 
diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection.nuspec b/src/Tizen.Network.Connection/Tizen.Network.Connection.nuspec
deleted file mode 100644
index 8d7b189..0000000
--- a/src/Tizen.Network.Connection/Tizen.Network.Connection.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-	<metadata>
-		<id>Tizen.Network.Connection</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 Connection APIs for Tizen.Network.Connection</description>
-		<dependencies>
-			<dependency id="Tizen" version="1.0.5" />
-		</dependencies>
-	</metadata>
-</package>
-- 
2.7.4