diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:27:11 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:27:11 +0900 |
commit | 56a15571b502957ee9d5bd0d95de9daa75c4d8e1 (patch) | |
tree | 9f2019f532127df8754f8d13a632390c5498b9ab | |
parent | 052966939c4440f18a415ea8f4b54b15a2069f18 (diff) | |
download | media-key-accepted/tizen_unified.tar.gz media-key-accepted/tizen_unified.tar.bz2 media-key-accepted/tizen_unified.zip |
Merge packaging information to csprojsubmit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170828.100003submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen/20170705.015653submit/tizen/20170704.042017submit/tizen/20170612.041214accepted/tizen/unified/20170705.162418accepted/tizen/unified/20170612.170739accepted/tizen/4.0/unified/20170828.223244accepted/tizen/4.0/unified/20170816.014324tizen_4.0accepted/tizen_unifiedaccepted/tizen_4.0_unified
Change-Id: I335376825863916d27c8b53da9685fd7bee10f00
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
-rwxr-xr-x | Tizen.System.MediaKey/CustomDictionary.xml | 0 | ||||
-rwxr-xr-x | Tizen.System.MediaKey/GlobalSuppressions.cs | bin | 954 -> 0 bytes | |||
-rw-r--r-- | Tizen.System.MediaKey/Tizen.System.MediaKey.csproj | 16 | ||||
-rwxr-xr-x | Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec | 17 | ||||
-rwxr-xr-x | packaging/csapi-media-key.spec | 4 |
5 files changed, 16 insertions, 21 deletions
diff --git a/Tizen.System.MediaKey/CustomDictionary.xml b/Tizen.System.MediaKey/CustomDictionary.xml deleted file mode 100755 index e69de29..0000000 --- a/Tizen.System.MediaKey/CustomDictionary.xml +++ /dev/null diff --git a/Tizen.System.MediaKey/GlobalSuppressions.cs b/Tizen.System.MediaKey/GlobalSuppressions.cs Binary files differdeleted file mode 100755 index 9d74253..0000000 --- a/Tizen.System.MediaKey/GlobalSuppressions.cs +++ /dev/null diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj index 3d8306f..15aa66d 100644 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj +++ b/Tizen.System.MediaKey/Tizen.System.MediaKey.csproj @@ -1,13 +1,25 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <Version>1.0.4</Version> + <Authors>Samsung Electronics</Authors> + <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright> + <Description>Provides the MediaKey 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.System.MediaKey.snk</AssemblyOriginatorKeyFile> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> - <GenerateReferenceAssembly>True</GenerateReferenceAssembly> </PropertyGroup> + <ItemGroup> <PackageReference Include="Tizen" Version="1.0.5" /> </ItemGroup> + </Project> diff --git a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec b/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec deleted file mode 100755 index fdbd938..0000000 --- a/Tizen.System.MediaKey/Tizen.System.MediaKey.nuspec +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<package> - <metadata> - <id>Tizen.System.MediaKey</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 MediaKey API for Tizen.Net</description> - <dependencies> - <dependency id="Tizen" version="1.0.5" /> - </dependencies> - </metadata> -</package> diff --git a/packaging/csapi-media-key.spec b/packaging/csapi-media-key.spec index 01c0982..2f283e6 100755 --- a/packaging/csapi-media-key.spec +++ b/packaging/csapi-media-key.spec @@ -1,6 +1,6 @@ Name: csapi-media-key Summary: Tizen Media Key API for C# -Version: 1.0.3 +Version: 1.0.4 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 |