From 6ed9ce7ca81d86698715c59aa978ebb5a55a2e82 Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 8 Jun 2017 09:44:26 +0900 Subject: [PATCH] Merge packaging information to csproj Change-Id: I38eb1947568237a88e2248297ac1bc0279c3eb83 Signed-off-by: WonYoung Choi --- .gitignore | 1 - .../Tizen.Security.SecureRepository.csproj | 16 +++++++++-- .../Tizen.Security.SecureRepository.nuspec | 17 ----------- Tizen.Security.sln | 33 ++++++++++++++++++++++ Tizen.Security/Tizen.Security.csproj | 19 +++++++++---- Tizen.Security/Tizen.Security.nuspec | 19 ------------- build/build.props | 18 ++++++++++++ packaging/csapi-security.spec | 9 ++---- 8 files changed, 80 insertions(+), 52 deletions(-) delete mode 100644 Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec create mode 100644 Tizen.Security.sln mode change 100755 => 100644 Tizen.Security/Tizen.Security.csproj delete mode 100755 Tizen.Security/Tizen.Security.nuspec create mode 100644 build/build.props diff --git a/.gitignore b/.gitignore index b734e70..9903f26 100755 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ [Dd]ebug/ [Rr]elease/ x64/ -build/ [Bb]in/ [Oo]bj/ diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj index 31bcdda..61e05df 100644 --- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj +++ b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.csproj @@ -1,14 +1,24 @@ - + + + + 1.0.9 + + 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. + + + netstandard1.3 True True Tizen.Security.SecureRepository.snk true - True + - + + diff --git a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec b/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec deleted file mode 100644 index 3b30f12..0000000 --- a/Tizen.Security.SecureRepository/Tizen.Security.SecureRepository.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - Tizen.Security.SecureRepository - $version$ - Samsung Electronics - false - https://www.apache.org/licenses/LICENSE-2.0 - https://www.tizen.org/ - https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png - © Samsung Electronics Co., Ltd All Rights Reserved - 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. - - - - - diff --git a/Tizen.Security.sln b/Tizen.Security.sln new file mode 100644 index 0000000..7b17b86 --- /dev/null +++ b/Tizen.Security.sln @@ -0,0 +1,33 @@ + +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.Security", "Tizen.Security\Tizen.Security.csproj", "{73F76515-CE1B-4029-90B7-8FF807AD71CC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Security.SecureRepository", "Tizen.Security.SecureRepository\Tizen.Security.SecureRepository.csproj", "{108EB80E-B0A6-4204-8DAE-A21856D46A4C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D560FE12-D9D3-4906-8E93-AC034AA95089}" + ProjectSection(SolutionItems) = preProject + build\build.props = build\build.props + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73F76515-CE1B-4029-90B7-8FF807AD71CC}.Release|Any CPU.Build.0 = Release|Any CPU + {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {108EB80E-B0A6-4204-8DAE-A21856D46A4C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Tizen.Security/Tizen.Security.csproj b/Tizen.Security/Tizen.Security.csproj old mode 100755 new mode 100644 index edfcc65..0f449ba --- a/Tizen.Security/Tizen.Security.csproj +++ b/Tizen.Security/Tizen.Security.csproj @@ -1,15 +1,24 @@ - + + + + + + 1.0.7 + Provides the display name or description of privileges. + + netstandard1.3 True True Tizen.Security.snk true - True + - - - + + + + diff --git a/Tizen.Security/Tizen.Security.nuspec b/Tizen.Security/Tizen.Security.nuspec deleted file mode 100755 index 3e63539..0000000 --- a/Tizen.Security/Tizen.Security.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - Tizen.Security - $version$ - Samsung Electronics - false - https://www.apache.org/licenses/LICENSE-2.0 - https://www.tizen.org/ - https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png - © Samsung Electronics Co., Ltd All Rights Reserved - Provides the display name or description of privileges. - - - - - - - diff --git a/build/build.props b/build/build.props new file mode 100644 index 0000000..4193da9 --- /dev/null +++ b/build/build.props @@ -0,0 +1,18 @@ + + + + + Samsung Electronics + © Samsung Electronics Co., Ltd All Rights Reserved + https://www.tizen.org/ + https://www.apache.org/licenses/LICENSE-2.0 + https://developer.tizen.org/sites/default/files/images/tizen-pinwheel-on-light-rgb_64_64.png + + + + + 1.0.5 + 1.5.8 + + + \ No newline at end of file diff --git a/packaging/csapi-security.spec b/packaging/csapi-security.spec index 47aac46..4ccf7a8 100755 --- 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 -- 2.7.4