Merge packaging information to csproj

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

diff --git a/.gitignore b/.gitignore
index b734e70..9903f26 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
 [Bb]in/
 [Oo]bj/
 

diff --git a/Tizen.Security.sln b/Tizen.Security.sln
new file mode 100644 (file)
index 0000000..7b17b86
--- /dev/null
+++ b/Tizen.Security.sln
@@ -0,0 +1,33 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26430.12\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Security", "Tizen.Security\Tizen.Security.csproj", "{73F76515-CE1B-4029-90B7-8FF807AD71CC}"\r
+EndProject\r
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Security.SecureRepository", "Tizen.Security.SecureRepository\Tizen.Security.SecureRepository.csproj", "{108EB80E-B0A6-4204-8DAE-A21856D46A4C}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D560FE12-D9D3-4906-8E93-AC034AA95089}"\r
+       ProjectSection(SolutionItems) = preProject\r
+               build\build.props = build\build.props\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/build/build.props b/build/build.props
new file mode 100644 (file)
index 0000000..4193da9
--- /dev/null
+++ b/build/build.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <!-- Common information for packaging -->
+  <PropertyGroup>
+    <Authors>Samsung Electronics</Authors>
+    <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright>
+    <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>
+
+  <!-- Dependencies -->
+  <PropertyGroup>
+    <TizenVersion>1.0.5</TizenVersion>
+    <ApplicationsVersion>1.5.8</ApplicationsVersion>
+  </PropertyGroup>
+  
+</Project>
\ No newline at end of file

diff --git a/packaging/csapi-security.spec b/packaging/csapi-security.spec
index 47aac46..4ccf7a8 100755 (executable)
--- a/packaging/csapi-security.spec
+++ b/packaging/csapi-security.spec
@@ -1,10 +1,8 @@
 %define Assemblies Tizen.Security Tizen.Security.SecureRepository
-%define version_security          1.0.7
-%define version_secure_repository 1.0.8
 
 Name:       csapi-security
 Summary:    Tizen Security API for C#
-Version:    1.0.8
+Version:    1.0.9
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -34,10 +32,7 @@ cp %{SOURCE1} .
 %build
 for ASM in %{Assemblies}; do
 %dotnet_build $ASM
-[ "$ASM" = "Tizen.Security" ] &&
-       %dotnet_pack $ASM/$ASM.nuspec %{version_security}
-[ "$ASM" = "Tizen.Security.SecureRepository" ] &&
-       %dotnet_pack $ASM/$ASM.nuspec %{version_secure_repository}
+%dotnet_pack $ASM
 done
 
 %install

diff --git a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
index 31bcdda..61e05df 100644 (file)
--- a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
+++ b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj
@@ -1,14 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Version>1.0.9</Version>
+    <Description>
+      Provides the secure repository protected by Tizen platform for keys, certificates, and sensitive data of users and/or their apps.
+      Additionally, secure cryptographic operations for non-exportable keys without revealing key values to clients are provided.
+    </Description>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Security.SecureRepository.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Tizen" Version="1.0.5" />
+    <PackageReference Include="Tizen" Version="$(TizenVersion)" />
   </ItemGroup>
+
 </Project>
 

diff --git a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec b/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec
deleted file mode 100644 (file)
index 3b30f12..0000000
--- a/src/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen.Security.SecureRepository</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 secure repository protected by Tizen platform for keys, certificates, and sensitive data of users and/or their apps. Additionally, secure cryptographic operations for non-exportable keys without revealing key values to clients are provided.</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.5" />
-    </dependencies>
-  </metadata>
-</package>

diff --git a/src/Tizen.Security/Tizen.Security.csproj b/src/Tizen.Security/Tizen.Security.csproj
old mode 100755 (executable)
new mode 100644 (file)
index edfcc65..0f449ba
--- a/src/Tizen.Security/Tizen.Security.csproj
+++ b/src/Tizen.Security/Tizen.Security.csproj
@@ -1,15 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="../build/build.props" />
+  
+  <PropertyGroup>
+    <Version>1.0.7</Version>
+    <Description>Provides the display name or description of privileges.</Description>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Tizen.Security.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Tizen" Version="1.0.5" />
-    <PackageReference Include="Tizen.Applications.Common" Version="1.4.2"/>
-    <PackageReference Include="Tizen.Applications.PackageManager" Version="1.4.2"/>
+    <PackageReference Include="Tizen" Version="$(TizenVersion)" />
+    <PackageReference Include="Tizen.Applications.Common" Version="$(ApplicationsVersion)" />
+    <PackageReference Include="Tizen.Applications.PackageManager" Version="$(ApplicationsVersion)" />
   </ItemGroup>
+
 </Project>

diff --git a/src/Tizen.Security/Tizen.Security.nuspec b/src/Tizen.Security/Tizen.Security.nuspec
deleted file mode 100755 (executable)
index 3e63539..0000000
--- a/src/Tizen.Security/Tizen.Security.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Tizen.Security</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 display name or description of privileges.</description>
-    <dependencies>
-      <dependency id="Tizen" version="1.0.5" />
-      <dependency id="Tizen.Applications.Common" version="1.4.2" />
-      <dependency id="Tizen.Applications.PackageManager" version="1.4.2" />
-    </dependencies>
-  </metadata>
-</package>