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

Change-Id: I5d37055406e60a10830f31d018894c4dabb55d30
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
---
 .gitignore                                         |  7 +++++++
 packaging/csapi-storage.spec                       |  4 ++--
 .../Tizen.System.Storage.csproj                    | 15 ++++++++++++---
 .../Tizen.System.Storage.nuspec                    | 17 -----------------
 src/Tizen.System.Storage/Tizen.System.Storage.sln  | 22 ++++++++++++++++++++++
 5 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 src/Tizen.System.Storage/Tizen.System.Storage.nuspec
 create mode 100644 src/Tizen.System.Storage/Tizen.System.Storage.sln

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/packaging/csapi-storage.spec b/packaging/csapi-storage.spec
index d403c7b..a4505ba 100644
--- a/packaging/csapi-storage.spec
+++ b/packaging/csapi-storage.spec
@@ -1,6 +1,6 @@
 Name:       csapi-storage
 Summary:    Tizen Storage API for C#
-Version:    1.0.2
+Version:    1.0.3
 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
diff --git a/src/Tizen.System.Storage/Tizen.System.Storage.csproj b/src/Tizen.System.Storage/Tizen.System.Storage.csproj
index 9fae00b..f063c0c 100644
--- a/src/Tizen.System.Storage/Tizen.System.Storage.csproj
+++ b/src/Tizen.System.Storage/Tizen.System.Storage.csproj
@@ -1,4 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.3</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provide classes for Storage API</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>
@@ -6,11 +16,10 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.System.Storage.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen" Version="1.0.3" />
+    <PackageReference Include="Tizen" Version="1.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Tizen.System.Storage/Tizen.System.Storage.nuspec b/src/Tizen.System.Storage/Tizen.System.Storage.nuspec
deleted file mode 100644
index db6718d..0000000
--- a/src/Tizen.System.Storage/Tizen.System.Storage.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-		<id>Tizen.System.Storage</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>Provide classes for Storage API</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.3" />
-    </dependencies>
-	</metadata>
-</package>
diff --git a/src/Tizen.System.Storage/Tizen.System.Storage.sln b/src/Tizen.System.Storage/Tizen.System.Storage.sln
new file mode 100644
index 0000000..37364ba
--- /dev/null
+++ b/src/Tizen.System.Storage/Tizen.System.Storage.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.System.Storage", "Tizen.System.Storage.csproj", "{87D9CAE4-A6D5-460B-930A-216329E3C783}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{87D9CAE4-A6D5-460B-930A-216329E3C783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D9CAE4-A6D5-460B-930A-216329E3C783}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D9CAE4-A6D5-460B-930A-216329E3C783}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D9CAE4-A6D5-460B-930A-216329E3C783}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
-- 
2.7.4