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

Change-Id: I71e746e3ba43e8b49fcc7b849d63d71c15eb6ec3
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 .gitignore                                     |  7 +++++++
 Tizen.Security.TEEC/Tizen.Security.TEEC.csproj | 18 +++++++++++++++---
 Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec | 17 -----------------
 packaging/csapi-security-libteec.spec          |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 mode change 100755 => 100644 Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
 delete mode 100755 Tizen.Security.TEEC/Tizen.Security.TEEC.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.Security.TEEC/Tizen.Security.TEEC.csproj b/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
old mode 100755
new mode 100644
index b668146..bae5e7d
--- a/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
+++ b/Tizen.Security.TEEC/Tizen.Security.TEEC.csproj
@@ -1,13 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <Version>1.0.0</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Security TEEC 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>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Security.TEEC.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
+  
   <ItemGroup>
     <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
+  
 </Project>
diff --git a/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec b/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec
deleted file mode 100755
index fa25ce6..0000000
--- a/Tizen.Security.TEEC/Tizen.Security.TEEC.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-    <metadata>
-        <id>Tizen.Security.TEEC</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>Security TEEC API for Tizen.Net</description>
-            <dependencies>
-                <dependency id="Tizen" version="1.0.5" />
-            </dependencies>
-    </metadata>
-</package>
diff --git a/packaging/csapi-security-libteec.spec b/packaging/csapi-security-libteec.spec
index 9c237a6..d8401a5 100755
--- a/packaging/csapi-security-libteec.spec
+++ b/packaging/csapi-security-libteec.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
-- 
2.7.4