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

Change-Id: I06ff7032823aaa92a9e84c392562f8fbed85948a
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 packaging/csapi-uix-voicecontrol.spec              |  2 +-
 .../Tizen.Uix.VoiceControl.csproj                  | 19 ++++++++++++++-----
 .../Tizen.Uix.VoiceControl.nuspec                  | 17 -----------------
 .../Tizen.Uix.VoiceControl.sln                     | 22 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
 delete mode 100755 src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec
 create mode 100644 src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.sln

diff --git a/packaging/csapi-uix-voicecontrol.spec b/packaging/csapi-uix-voicecontrol.spec
index 03c062e..c9e9607 100755
--- a/packaging/csapi-uix-voicecontrol.spec
+++ b/packaging/csapi-uix-voicecontrol.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.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
old mode 100755
new mode 100644
index 85f46b6..d291dcb
--- a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
+++ b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.csproj
@@ -1,16 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
- 
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.5</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>VoiceControl 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.VoiceControl.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/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec
deleted file mode 100755
index 075bbe2..0000000
--- a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen.Uix.VoiceControl</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>VoiceControl API for Tizen.Net</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.3" />
-    </dependencies>
-  </metadata>
-</package>
diff --git a/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.sln b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.sln
new file mode 100644
index 0000000..9d3eef1
--- /dev/null
+++ b/src/Tizen.Uix.VoiceControl/Tizen.Uix.VoiceControl.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.VoiceControl", "Tizen.Uix.VoiceControl.csproj", "{6DF81E8E-50B2-4604-A973-4A0F222FC584}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6DF81E8E-50B2-4604-A973-4A0F222FC584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DF81E8E-50B2-4604-A973-4A0F222FC584}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DF81E8E-50B2-4604-A973-4A0F222FC584}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DF81E8E-50B2-4604-A973-4A0F222FC584}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
-- 
2.7.4