diff options
author | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:47:25 +0900 |
---|---|---|
committer | WonYoung Choi <wy80.choi@samsung.com> | 2017-06-08 09:47:25 +0900 |
commit | 42439992208f31e1ff24cfaf289cb91140f08ed5 (patch) | |
tree | 8d43fa8238c85d9c43bb39e1e9a3e4ab38b33a5a | |
parent | 67e3f0aa87e81f93d44f610dd04311bfd12e2662 (diff) | |
download | system-settings-42439992208f31e1ff24cfaf289cb91140f08ed5.tar.gz system-settings-42439992208f31e1ff24cfaf289cb91140f08ed5.tar.bz2 system-settings-42439992208f31e1ff24cfaf289cb91140f08ed5.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/20170612.020614submit/tizen/20170609.044403accepted/tizen/unified/20170612.073834accepted/tizen/4.0/unified/20170828.223607accepted/tizen/4.0/unified/20170816.020241tizen_4.0accepted/tizen_4.0_unified
Change-Id: I2fcc58232499019dc9dbc0fc5fc435abfb6d8562
Signed-off-by: WonYoung Choi <wy80.choi@samsung.com>
6 files changed, 41 insertions, 152 deletions
diff --git a/Tizen.System.SystemSettings/Properties/AssemblyInfo.cs b/Tizen.System.SystemSettings/Properties/AssemblyInfo.cs deleted file mode 100644 index 90a5652..0000000 --- a/Tizen.System.SystemSettings/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Tizen.System.SystemSettings")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Samsung Electronics")] -[assembly: AssemblyProduct("Tizen.System.SystemSettings")] -[assembly: AssemblyCopyright("Copyright (c) 2016 Samsung Electronics Co., Ltd")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("09d03c33-2fce-4c18-bec8-f585a865a4b4")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj index c2a7bfc..747a6fe 100644 --- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj +++ b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj @@ -1,77 +1,25 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{09D03C33-2FCE-4C18-BEC8-F585A865A4B4}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Tizen.System.SystemSettings</RootNamespace> - <AssemblyName>Tizen.System.SystemSettings</AssemblyName> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup> - <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v1.3</TargetFrameworkVersion> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences> - <NoStdLib>true</NoStdLib> - <NoWarn>$(NoWarn);1701;1702</NoWarn> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> + <Version>1.0.4</Version> + <Authors>Samsung Electronics</Authors> + <Copyright>© Samsung Electronics Co., Ltd All Rights Reserved</Copyright> + <Description>System Settings 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.SystemSettings.snk</AssemblyOriginatorKeyFile> + <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> </PropertyGroup> + <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Interop\Interop.SystemSettings.cs" /> - <Compile Include="Tizen.System.SystemSettings\SystemSettings.cs" /> - <Compile Include="Tizen.System.SystemSettings\SystemSettingsEnums.cs" /> - <Compile Include="Tizen.System.SystemSettings\SystemSettingsEventArgs.cs" /> - <Compile Include="Tizen.System.SystemSettings\SystemSettingsExceptionFactory.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="Tizen.System.SystemSettings.nuspec" /> - <None Include="Tizen.System.SystemSettings.project.json" /> - <None Include="Tizen.System.SystemSettings.snk" /> + <PackageReference Include="Tizen" Version="1.0.5" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> - <PropertyGroup> - <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and - https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild - --> - <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two - properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and - to prevent it from outputting a warning (MSB3644). - --> - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories> - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths> - <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences> - </PropertyGroup> -</Project>
\ No newline at end of file + +</Project> diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec deleted file mode 100644 index 3c476da..0000000 --- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<package> - <metadata> - <id>Tizen.System.SystemSettings</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>System Settings API for Tizen.Net</description> - <dependencies> - <dependency id="Tizen" version="1.0.1" /> - </dependencies> - </metadata> - <files> - <file src="bin/$Configuration$/Tizen.System.SystemSettings.dll" target="lib/netstandard1.3" /> - </files> -</package> diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.project.json b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.project.json deleted file mode 100644 index db7436c..0000000 --- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.0", - "Tizen": "1.0.1" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.sln b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.sln new file mode 100644 index 0000000..b618a4b --- /dev/null +++ b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.sln @@ -0,0 +1,22 @@ + +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.System.SystemSettings", "Tizen.System.SystemSettings.csproj", "{E18BFE2D-2C89-45D2-B31B-BE5C81B6CAAC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E18BFE2D-2C89-45D2-B31B-BE5C81B6CAAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E18BFE2D-2C89-45D2-B31B-BE5C81B6CAAC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E18BFE2D-2C89-45D2-B31B-BE5C81B6CAAC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E18BFE2D-2C89-45D2-B31B-BE5C81B6CAAC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/packaging/csapi-system-settings.spec b/packaging/csapi-system-settings.spec index b870a4b..749fa39 100644 --- a/packaging/csapi-system-settings.spec +++ b/packaging/csapi-system-settings.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 |