Merge packaging information to csproj

Change-Id: Ida6b6ae7c9c4da29d43f5f56bbd56acf274c4d4e
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/packaging/csapi-data-control.spec b/packaging/csapi-data-control.spec
index 0de4495..abf16ab 100755 (executable)
--- a/packaging/csapi-data-control.spec
+++ b/packaging/csapi-data-control.spec
@@ -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

diff --git a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
old mode 100755 (executable)
new mode 100644 (file)
index 0274e74..8274506
--- a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
+++ b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.csproj
@@ -1,16 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.6</Version>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <Description>Provides the Data Control 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.Application.DataControl.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>Tizen.Applications.DataControl.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <PackageReference Include="Tizen" Version="1.0.5" />
-    <PackageReference Include="Tizen.Applications.Common" Version="1.5.7" />
+    <PackageReference Include="Tizen.Applications.Common" Version="1.5.8" />
   </ItemGroup>
+
 </Project>

diff --git a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.nuspec b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.nuspec
deleted file mode 100755 (executable)
index 5179544..0000000
--- a/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package>
-       <metadata>
-               <id>Tizen.Applications.DataControl</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 Data Control API for Tizen.Net</description>
-               <dependencies>
-                       <dependency id="Tizen" version="1.0.5" />
-                       <dependency id="Tizen.Applications.Common" version="1.5.7" />
-               </dependencies>
-       </metadata>
-</package>

diff --git a/src/Tizen.Applications.DataControl/Tizen.Application.DataControl.snk b/src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.snk
similarity index 100%
rename from src/Tizen.Applications.DataControl/Tizen.Application.DataControl.snk
rename to src/Tizen.Applications.DataControl/Tizen.Applications.DataControl.snk