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

Change-Id: I1bdc0f53ceba84f6051dd34d8dacca5f66b324d0
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 Tizen.Uix.Stt/Tizen.Uix.Stt.csproj | 19 ++++++++++++++-----
 Tizen.Uix.Stt/Tizen.Uix.Stt.nuspec | 17 -----------------
 Tizen.Uix.Stt/Tizen.Uix.Stt.sln    | 22 ++++++++++++++++++++++
 packaging/csapi-uix-stt.spec       |  4 ++--
 4 files changed, 38 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
 delete mode 100755 Tizen.Uix.Stt/Tizen.Uix.Stt.nuspec
 create mode 100644 Tizen.Uix.Stt/Tizen.Uix.Stt.sln

diff --git a/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj b/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
old mode 100755
new mode 100644
index 820548b..ae98eb8
--- a/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
+++ b/Tizen.Uix.Stt/Tizen.Uix.Stt.csproj
@@ -1,16 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
- 
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.2</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>STT Uix 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.Uix.Stt.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.Uix.Stt/Tizen.Uix.Stt.nuspec b/Tizen.Uix.Stt/Tizen.Uix.Stt.nuspec
deleted file mode 100755
index 15176af..0000000
--- a/Tizen.Uix.Stt/Tizen.Uix.Stt.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-		<id>Tizen.Uix.Stt</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>STT Uix API for Tizen.Net</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.2" />
-    </dependencies>
-	</metadata>
-</package>
diff --git a/Tizen.Uix.Stt/Tizen.Uix.Stt.sln b/Tizen.Uix.Stt/Tizen.Uix.Stt.sln
new file mode 100644
index 0000000..b5cdecc
--- /dev/null
+++ b/Tizen.Uix.Stt/Tizen.Uix.Stt.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Uix.Stt", "Tizen.Uix.Stt.csproj", "{811C2DAE-A1AB-40A8-AD8B-C090AC2979B9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{811C2DAE-A1AB-40A8-AD8B-C090AC2979B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{811C2DAE-A1AB-40A8-AD8B-C090AC2979B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{811C2DAE-A1AB-40A8-AD8B-C090AC2979B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{811C2DAE-A1AB-40A8-AD8B-C090AC2979B9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/packaging/csapi-uix-stt.spec b/packaging/csapi-uix-stt.spec
index 138744f..06c8faa 100755
--- a/packaging/csapi-uix-stt.spec
+++ b/packaging/csapi-uix-stt.spec
@@ -1,6 +1,6 @@
 Name:       csapi-uix-stt
 Summary:    Tizen STT Uix API for C#
-Version:    1.0.1
+Version:    1.0.2
 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