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

Change-Id: I335376825863916d27c8b53da9685fd7bee10f00
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 Tizen.System.MediaKey/CustomDictionary.xml         |   0
 Tizen.System.MediaKey/GlobalSuppressions.cs        | Bin 954 -> 0 bytes
 Tizen.System.MediaKey/Tizen.System.MediaKey.csproj |  16 ++++++++++++++--
 Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec |  17 -----------------
 packaging/csapi-media-key.spec                     |   4 ++--
 5 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100755 Tizen.System.MediaKey/CustomDictionary.xml
 delete mode 100755 Tizen.System.MediaKey/GlobalSuppressions.cs
 delete mode 100755 Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec

diff --git a/Tizen.System.MediaKey/CustomDictionary.xml b/Tizen.System.MediaKey/CustomDictionary.xml
deleted file mode 100755
index e69de29..0000000
diff --git a/Tizen.System.MediaKey/GlobalSuppressions.cs b/Tizen.System.MediaKey/GlobalSuppressions.cs
deleted file mode 100755
index 9d742533852f291d5b872bdf32aedc33e5b3af4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 954
zcmaKr%}&EG5QO*Kr?7IS^cfHm5(gwCdf{l&&<5J1Y7(TrJn+rB?oTREr1)oNXUF69
z&-ct`7Hn=StF2@9&bYRUSy~V5R<>aMW_$kk*0NIk&Kiqg_aG9sCl+kOZcVH|jKN-P
zur1$?ypHebFh*NC(*zAt5y|O6)zli82^|<$9#LEj8pXB-mz1Tt!X+K5)Y=EplI&Z{
z{LdHrQ$Obys5PA3NMj8{<Mk_8#a)pdT#Ir7QJq$&-1#|rR;^>Q&Lx?`Hbk<9$h<?n
zwAJo*dBqaRkmDVg*0EZpQz~D+Z(tBl1XJ0K$M=raT+t0KO0(7#+2zrRtYz*eh}05)
zQg(S$$%S0|<Z$j1aqGU8_|n^y8oHIzKG{#6B`v!3eB0`cQ#5P&udh<y3~=}GsOA>s
zsmHRm;;PHSsLu+|%-)_W%^C`ObZz5)%`QApQ*Wa<IvMO0B?F2U?xlJ{eb9h9@6GJ-
X-(5ED;p}jFPYpHn*7Vxc&lCFvIi#i=

diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
index 3d8306f..15aa66d 100644
--- a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
+++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj
@@ -1,13 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.4</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the MediaKey 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.3</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.System.MediaKey.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.System.MediaKey/Tizen.System.MediaKey.nuspec b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec
deleted file mode 100755
index fdbd938..0000000
--- a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-	<metadata>
-		<id>Tizen.System.MediaKey</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 MediaKey API for Tizen.Net</description>
-		<dependencies>
-			<dependency id="Tizen" version="1.0.5" />
-		</dependencies>
-	</metadata>
-</package>
diff --git a/packaging/csapi-media-key.spec b/packaging/csapi-media-key.spec
index 01c0982..2f283e6 100755
--- a/packaging/csapi-media-key.spec
+++ b/packaging/csapi-media-key.spec
@@ -1,6 +1,6 @@
 Name:       csapi-media-key
 Summary:    Tizen Media Key API for C#
-Version:    1.0.3
+Version:    1.0.4
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -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