From 1ac3064bbc785b11392c3fed228ac2e3cd841fec Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 28 Jul 2016 17:15:53 +0900 Subject: [PATCH] Fix code for building with corefx Change-Id: I893e3cf905383c0fd2346721d16c0db57d10d31b --- Tizen.Location/CoreFx.References.targets | 265 +++++++++++++++++++++++++++++++ Tizen.Location/Tizen.Location.csproj | 3 +- packaging/csapi-location.spec | 22 +-- 3 files changed, 280 insertions(+), 10 deletions(-) create mode 100644 Tizen.Location/CoreFx.References.targets diff --git a/Tizen.Location/CoreFx.References.targets b/Tizen.Location/CoreFx.References.targets new file mode 100644 index 0000000..dab29ec --- /dev/null +++ b/Tizen.Location/CoreFx.References.targets @@ -0,0 +1,265 @@ + + + + + False + $(CoreFxPath)/Microsoft.Win32.Primitives.dll + + + False + $(CoreFxPath)/System.AppContext.dll + + + False + $(CoreFxPath)/System.Collections.Concurrent.dll + + + False + $(CoreFxPath)/System.Collections.dll + + + False + $(CoreFxPath)/System.ComponentModel.Annotations.dll + + + False + $(CoreFxPath)/System.ComponentModel.dll + + + False + $(CoreFxPath)/System.Console.dll + + + False + $(CoreFxPath)/System.Diagnostics.Debug.dll + + + False + $(CoreFxPath)/System.Diagnostics.Process.dll + + + False + $(CoreFxPath)/System.Diagnostics.Tools.dll + + + False + $(CoreFxPath)/System.Diagnostics.TraceSource.dll + + + False + $(CoreFxPath)/System.Diagnostics.Tracing.dll + + + False + $(CoreFxPath)/System.Dynamic.Runtime.dll + + + False + $(CoreFxPath)/System.Globalization.Calendars.dll + + + False + $(CoreFxPath)/System.Globalization.dll + + + False + $(CoreFxPath)/System.Globalization.Extensions.dll + + + False + $(CoreFxPath)/System.IO.Compression.dll + + + False + $(CoreFxPath)/System.IO.Compression.ZipFile.dll + + + False + $(CoreFxPath)/System.IO.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.Primitives.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.Watcher.dll + + + False + $(CoreFxPath)/System.IO.MemoryMappedFiles.dll + + + False + $(CoreFxPath)/System.IO.UnmanagedMemoryStream.dll + + + False + $(CoreFxPath)/System.Linq.dll + + + False + $(CoreFxPath)/System.Linq.Expressions.dll + + + False + $(CoreFxPath)/System.Linq.Parallel.dll + + + False + $(CoreFxPath)/System.Linq.Queryable.dll + + + False + $(CoreFxPath)/System.Net.Http.dll + + + False + $(CoreFxPath)/System.Net.NameResolution.dll + + + False + $(CoreFxPath)/System.Net.Primitives.dll + + + False + $(CoreFxPath)/System.Net.Requests.dll + + + False + $(CoreFxPath)/System.Net.Security.dll + + + False + $(CoreFxPath)/System.Net.Sockets.dll + + + False + $(CoreFxPath)/System.Net.WebHeaderCollection.dll + + + False + $(CoreFxPath)/System.Numerics.Vectors.dll + + + False + $(CoreFxPath)/System.ObjectModel.dll + + + False + $(CoreFxPath)/System.Reflection.DispatchProxy.dll + + + False + $(CoreFxPath)/System.Reflection.dll + + + False + $(CoreFxPath)/System.Reflection.Extensions.dll + + + False + $(CoreFxPath)/System.Reflection.Primitives.dll + + + False + $(CoreFxPath)/System.Reflection.TypeExtensions.dll + + + False + $(CoreFxPath)/System.Resources.ResourceManager.dll + + + False + $(CoreFxPath)/System.Runtime.dll + + + False + $(CoreFxPath)/System.Runtime.Extensions.dll + + + False + $(CoreFxPath)/System.Runtime.Handles.dll + + + False + $(CoreFxPath)/System.Runtime.InteropServices.dll + + + False + $(CoreFxPath)/System.Runtime.InteropServices.RuntimeInformation.dll + + + False + $(CoreFxPath)/System.Runtime.Loader.dll + + + False + $(CoreFxPath)/System.Runtime.Numerics.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Algorithms.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Encoding.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Primitives.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.X509Certificates.dll + + + False + $(CoreFxPath)/System.Text.Encoding.dll + + + False + $(CoreFxPath)/System.Text.Encoding.Extensions.dll + + + False + $(CoreFxPath)/System.Text.RegularExpressions.dll + + + False + $(CoreFxPath)/System.Threading.dll + + + False + $(CoreFxPath)/System.Threading.Tasks.dll + + + False + $(CoreFxPath)/System.Threading.Tasks.Parallel.dll + + + False + $(CoreFxPath)/System.Threading.Thread.dll + + + False + $(CoreFxPath)/System.Threading.ThreadPool.dll + + + False + $(CoreFxPath)/System.Threading.Timer.dll + + + False + $(CoreFxPath)/System.Xml.ReaderWriter.dll + + + False + $(CoreFxPath)/System.Xml.XDocument.dll + + + \ No newline at end of file diff --git a/Tizen.Location/Tizen.Location.csproj b/Tizen.Location/Tizen.Location.csproj index cac7938..f2aecbf 100644 --- a/Tizen.Location/Tizen.Location.csproj +++ b/Tizen.Location/Tizen.Location.csproj @@ -38,7 +38,8 @@ Tizen.Location.snk - + + diff --git a/packaging/csapi-location.spec b/packaging/csapi-location.spec index 72930d6..70973f1 100755 --- a/packaging/csapi-location.spec +++ b/packaging/csapi-location.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,9 +21,11 @@ Source1: %{name}.manifest BuildRequires: mono-compiler BuildRequires: mono-devel -# P/Invoke Build Requires -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(capi-location-manager) +# .NETCore +%if 0%{?_with_corefx} +AutoReqProv: no +BuildRequires: corefx-managed-32b-ref +%endif # C# API Requires BuildRequires: csapi-tizen @@ -39,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} -- 2.7.4