From d7eae699aabcb968b5483b1f202c4204c16ec226 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Thu, 8 Jun 2017 09:44:57 +0900
Subject: Merge packaging information to csproj

Change-Id: I8f57f42239e5899ecc08deb94e9f61cb61d2909e
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 Tizen.Sensor/Tizen.Sensor.csproj | 39 +++++++++++++++++++++++++--------------
 Tizen.Sensor/Tizen.Sensor.nuspec | 18 ------------------
 Tizen.Sensor/Tizen.Sensor.sln    | 22 ++++++++++++++++++++++
 packaging/csapi-sensor.spec      |  4 ++--
 4 files changed, 49 insertions(+), 34 deletions(-)
 delete mode 100755 Tizen.Sensor/Tizen.Sensor.nuspec
 create mode 100644 Tizen.Sensor/Tizen.Sensor.sln

diff --git a/Tizen.Sensor/Tizen.Sensor.csproj b/Tizen.Sensor/Tizen.Sensor.csproj
index b9346ee..c5a8727 100644
--- a/Tizen.Sensor/Tizen.Sensor.csproj
+++ b/Tizen.Sensor/Tizen.Sensor.csproj
@@ -1,15 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>netstandard1.3</TargetFramework>
-		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>Tizen.Sensor.snk</AssemblyOriginatorKeyFile>
-		<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-		<GenerateReferenceAssembly>True</GenerateReferenceAssembly>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Tizen" Version="1.0.3" />
-		<PackageReference Include="Tizen.System.Information" Version="1.0.1" />
-	</ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.7</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the classes to control and get data from the sensors supported by the device.</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.Sensor.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tizen" Version="1.0.5" />
+    <PackageReference Include="Tizen.System.Information" Version="1.0.4" />
+  </ItemGroup>
+
 </Project>
diff --git a/Tizen.Sensor/Tizen.Sensor.nuspec b/Tizen.Sensor/Tizen.Sensor.nuspec
deleted file mode 100755
index 7dce069..0000000
--- a/Tizen.Sensor/Tizen.Sensor.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-		<id>Tizen.Sensor</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 classes to control and get data from the sensors supported by the device.</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.3" />
-      <dependency id="Tizen.System.Information" version="1.0.1" />
-    </dependencies>
-	</metadata>
-</package>
diff --git a/Tizen.Sensor/Tizen.Sensor.sln b/Tizen.Sensor/Tizen.Sensor.sln
new file mode 100644
index 0000000..ce47bf5
--- /dev/null
+++ b/Tizen.Sensor/Tizen.Sensor.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.Sensor", "Tizen.Sensor.csproj", "{AAE48604-CF03-462D-8B82-692148FC0286}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AAE48604-CF03-462D-8B82-692148FC0286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAE48604-CF03-462D-8B82-692148FC0286}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAE48604-CF03-462D-8B82-692148FC0286}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAE48604-CF03-462D-8B82-692148FC0286}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/packaging/csapi-sensor.spec b/packaging/csapi-sensor.spec
index 0facce9..55906f6 100755
--- a/packaging/csapi-sensor.spec
+++ b/packaging/csapi-sensor.spec
@@ -1,6 +1,6 @@
 Name:       csapi-sensor
 Summary:    Tizen Sensor API for C#
-Version:    1.0.6
+Version:    1.0.7
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -31,7 +31,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-%dotnet_pack $ASM/$ASM.nuspec %{version}
+%dotnet_pack $ASM
 done
 
 %install
-- 
cgit v1.2.3