Merge packaging information to csproj

Change-Id: I1702ec8b5a646666f30d2d9a88daf3821e271e69
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..46619d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+bin/
+obj/
+*.exe
+*.dll
+*.csproj.user
+*.lock.json
+.vs/

diff --git a/Tizen.System.Information/Tizen.System.Information.csproj b/Tizen.System.Information/Tizen.System.Information.csproj
old mode 100755 (executable)
new mode 100644 (file)
index 156afe0..690997d
--- a/Tizen.System.Information/Tizen.System.Information.csproj
+++ b/Tizen.System.Information/Tizen.System.Information.csproj
@@ -1,16 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">\r
 \r
+  <PropertyGroup>\r
+    <Version>1.0.4</Version>\r
+    <Authors>Samsung Electronics</Authors>\r
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>\r
+    <Description>Provide classes for SystemInformation and RuntimeInformation APIs</Description>\r
+    <PackageProjectUrl>https://www.tizen.org/</PackageProjectUrl>\r
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>\r
+    <PackageIconUrl>https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png</PackageIconUrl>\r
+  </PropertyGroup>\r
+\r
   <PropertyGroup>\r
     <TargetFramework>netstandard1.3</TargetFramework>\r
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>\r
     <SignAssembly>True</SignAssembly>\r
     <AssemblyOriginatorKeyFile>Tizen.System.Information.snk</AssemblyOriginatorKeyFile>\r
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>\r
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>\r
   </PropertyGroup>\r
 \r
   <ItemGroup>\r
-    <PackageReference Include="Tizen" Version="1.0.4" />\r
+    <PackageReference Include="Tizen" Version="1.0.5" />\r
   </ItemGroup>\r
 \r
 </Project>\r

diff --git a/Tizen.System.Information/Tizen.System.Information.nuspec b/Tizen.System.Information/Tizen.System.Information.nuspec
deleted file mode 100644 (file)
index e78b17e..0000000
--- a/Tizen.System.Information/Tizen.System.Information.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-               <id>Tizen.System.Information</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 SystemInformation and RuntimeInformation APIs</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.4" />
-    </dependencies>
-       </metadata>
-</package>

diff --git a/packaging/csapi-information.spec b/packaging/csapi-information.spec
index 8387c98e7b587cf95e9fa953557909f3d0ef3e16..d719fd982357059a12271eeedd8169b229a4ec75 100644 (file)
--- a/packaging/csapi-information.spec
+++ b/packaging/csapi-information.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