summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonYoung Choi <wy80.choi@samsung.com>2016-07-28 18:33:27 +0900
committerWonYoung Choi <wy80.choi@samsung.com>2016-07-28 18:33:27 +0900
commit341dff096f6878c5cdb2157a6e858f0950616341 (patch)
tree6817ee6f70bcac38535b0bd58dcd3b4ec0afe631
parent53a1eeb11481f469b330bb71b99d4bc3adeadb1b (diff)
downloadsystem-settings-341dff096f6878c5cdb2157a6e858f0950616341.tar.gz
system-settings-341dff096f6878c5cdb2157a6e858f0950616341.tar.bz2
system-settings-341dff096f6878c5cdb2157a6e858f0950616341.zip
Fix code for building with corefx
Change-Id: Idfae789f85843a804b4ea32916a44785d838f185
-rw-r--r--Tizen.System.SystemSettings/CoreFx.References.targets265
-rw-r--r--Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj3
-rw-r--r--packaging/csapi-systemsettings.spec21
3 files changed, 280 insertions, 9 deletions
diff --git a/Tizen.System.SystemSettings/CoreFx.References.targets b/Tizen.System.SystemSettings/CoreFx.References.targets
new file mode 100644
index 0000000..dab29ec
--- /dev/null
+++ b/Tizen.System.SystemSettings/CoreFx.References.targets
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Condition=" '$(CoreFxPath)' != '' ">
+ <Reference Include="Microsoft.Win32.Primitives">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/Microsoft.Win32.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.AppContext">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.AppContext.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Collections.Concurrent">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Collections.Concurrent.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Collections">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Collections.dll</HintPath>
+ </Reference>
+ <Reference Include="System.ComponentModel.Annotations">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.ComponentModel.Annotations.dll</HintPath>
+ </Reference>
+ <Reference Include="System.ComponentModel">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.ComponentModel.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Console">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Console.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Diagnostics.Debug">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Diagnostics.Debug.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Diagnostics.Process">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Diagnostics.Process.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Diagnostics.Tools">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Diagnostics.Tools.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Diagnostics.TraceSource">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Diagnostics.TraceSource.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Diagnostics.Tracing">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Diagnostics.Tracing.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Dynamic.Runtime">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Dynamic.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Globalization.Calendars">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Globalization.Calendars.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Globalization">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Globalization.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Globalization.Extensions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Globalization.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.Compression">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.Compression.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.Compression.ZipFile">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.Compression.ZipFile.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.FileSystem">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.FileSystem.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.FileSystem.Primitives">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.FileSystem.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.FileSystem.Watcher">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.FileSystem.Watcher.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.MemoryMappedFiles">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.MemoryMappedFiles.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.UnmanagedMemoryStream">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.IO.UnmanagedMemoryStream.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Linq">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Linq.Expressions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Linq.Expressions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Linq.Parallel">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Linq.Parallel.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Linq.Queryable">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Linq.Queryable.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.Http.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.NameResolution">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.NameResolution.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Primitives">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Requests">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.Requests.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Security">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.Security.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Sockets">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.Sockets.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.WebHeaderCollection">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Net.WebHeaderCollection.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Numerics.Vectors">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Numerics.Vectors.dll</HintPath>
+ </Reference>
+ <Reference Include="System.ObjectModel">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.ObjectModel.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reflection.DispatchProxy">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Reflection.DispatchProxy.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reflection">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Reflection.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reflection.Extensions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Reflection.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reflection.Primitives">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Reflection.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reflection.TypeExtensions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Reflection.TypeExtensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Resources.ResourceManager">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Resources.ResourceManager.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Extensions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Handles">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.Handles.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.InteropServices">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.InteropServices.RuntimeInformation">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Loader">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.Loader.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Runtime.Numerics">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Runtime.Numerics.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Cryptography.Algorithms">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Security.Cryptography.Algorithms.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Cryptography.Encoding">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Security.Cryptography.Encoding.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Cryptography.Primitives">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Security.Cryptography.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Cryptography.X509Certificates">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Security.Cryptography.X509Certificates.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.Encoding">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Text.Encoding.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.Encoding.Extensions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Text.Encoding.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.RegularExpressions">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Text.RegularExpressions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.Tasks.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks.Parallel">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.Tasks.Parallel.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Thread">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.Thread.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.ThreadPool">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.ThreadPool.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Timer">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Threading.Timer.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml.ReaderWriter">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Xml.ReaderWriter.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml.XDocument">
+ <Private>False</Private>
+ <HintPath>$(CoreFxPath)/System.Xml.XDocument.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
index ddd7182..6f82b19 100644
--- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
+++ b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj
@@ -36,7 +36,8 @@
<PropertyGroup>
<AssemblyOriginatorKeyFile>Tizen.System.SystemSettings.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <ItemGroup>
+ <Import Project="CoreFx.References.targets" />
+ <ItemGroup Condition=" '$(CoreFxPath)' == '' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
diff --git a/packaging/csapi-systemsettings.spec b/packaging/csapi-systemsettings.spec
index a664d27..f5acf8c 100644
--- a/packaging/csapi-systemsettings.spec
+++ b/packaging/csapi-systemsettings.spec
@@ -1,4 +1,5 @@
%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly}
+%{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref}
%if 0%{?tizen_build_devel_mode}
%define BUILDCONF Debug
@@ -20,8 +21,11 @@ Source1: %{name}.manifest
BuildRequires: mono-compiler
BuildRequires: mono-devel
-# P/Invoke Build Requires
-BuildRequires: pkgconfig(capi-system-system-settings)
+# .NETCore
+%if 0%{?_with_corefx}
+AutoReqProv: no
+BuildRequires: corefx-managed-32b-ref
+%endif
# C# API Requires
BuildRequires: csapi-tizen
@@ -38,22 +42,23 @@ cp %{SOURCE1} .
%build
for ASM in %{Assemblies}; do
xbuild $ASM/$ASM.csproj \
+%if 0%{?_with_corefx}
+ /p:NoStdLib=True \
+ /p:TargetFrameworkVersion=v5.0 \
+ /p:AddAdditionalExplicitAssemblyReferences=False \
+ /p:CoreFxPath=%{dotnet_core_path} \
+%endif
/p:Configuration=%{BUILDCONF} \
/p:ReferencePath=%{dotnet_assembly_path}
done
%install
-# Assemblies
mkdir -p %{buildroot}%{dotnet_assembly_path}
for ASM in %{Assemblies}; do
install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
done
-# License
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE %{buildroot}%{_datadir}/license/%{name}
-
%files
%manifest %{name}.manifest
+%license LICENSE
%attr(644,root,root) %{dotnet_assembly_path}/*.dll
-%attr(644,root,root) %{_datadir}/license/%{name}