Merge "Update content of nuspec file" into tizen

diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.csproj b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.csproj
deleted file mode 100644 (file)
index 1f76dd4..0000000
--- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9F66DBF9-243A-44C9-953B-28F01DD743DE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tizen.System.SystemSettings</RootNamespace>
-    <AssemblyName>Tizen.System.SystemSettings</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\Net45\</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\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Tizen.System.SystemSettings.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <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.Net45.project.json" />
-    <None Include="Tizen.System.SystemSettings.snk" />
-  </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>
-  -->
-</Project>
\ No newline at end of file

diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.project.json b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.project.json
deleted file mode 100644 (file)
index ab1a0ee..0000000
--- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.Net45.project.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "Tizen": "1.0.1"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}

diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec
index 49092b4..3c476da 100644 (file)
--- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec
+++ b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.nuspec
@@ -16,6 +16,5 @@
   </metadata>
   <files>
     <file src="bin/$Configuration$/Tizen.System.SystemSettings.dll" target="lib/netstandard1.3" />
-    <file src="bin/$Configuration$/Net45/Tizen.System.SystemSettings.dll" target="lib/net45" />
   </files>
 </package>

diff --git a/packaging/csapi-system-settings.spec b/packaging/csapi-system-settings.spec
index 861c6bf..5723388 100644 (file)
--- a/packaging/csapi-system-settings.spec
+++ b/packaging/csapi-system-settings.spec
@@ -1,6 +1,6 @@
 Name:       csapi-system-settings
 Summary:    Tizen System Settings API for C#
-Version:    1.0.1
+Version:    1.0.2
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -9,7 +9,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 
 AutoReqProv: no
-ExcludeArch: aarch64 %ix86
+ExcludeArch: aarch64
 
 BuildRequires: dotnet-build-tools
 
@@ -41,4 +41,4 @@ done
 %files
 %manifest %{name}.manifest
 %license LICENSE
-%attr(644,root,root) %{dotnet_assembly_files}
\ No newline at end of file
+%attr(644,root,root) %{dotnet_assembly_files}