From 91ba2e4148d27feb8b43b520bd057ad912ea2478 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Thu, 28 Jul 2016 16:16:28 +0900
Subject: [PATCH] Fix code for building with corefx

Change-Id: Iebae08a4bd54094b6a5fb8d43eb75a4378d21a88
---
 .gitignore                                         |   1 +
 Tizen.Internals/CoreFx.References.targets          | 265 +++++++++++++++++++++
 .../Tizen.Internals.Errors/ErrorFacts.cs           |   8 +-
 Tizen.Internals/Tizen.Internals.csproj             |  16 +-
 Tizen.Internals/Tizen.Internals.csproj.user        |   6 -
 packaging/csapi-tizen.spec                         |  22 +-
 src/Tizen/CoreFx.References.targets                | 265 +++++++++++++++++++++
 src/Tizen/Tizen.csproj                             |  18 +-
 src/Tizen/Tizen.csproj.user                        |   6 -
 9 files changed, 559 insertions(+), 48 deletions(-)
 create mode 100644 Tizen.Internals/CoreFx.References.targets
 delete mode 100755 Tizen.Internals/Tizen.Internals.csproj.user
 create mode 100644 src/Tizen/CoreFx.References.targets
 delete mode 100755 src/Tizen/Tizen.csproj.user

diff --git a/.gitignore b/.gitignore
index 8fd3218..17dd954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ bin/
 obj/
 *.exe
 *.dll
+*.csproj.user
 .vs/
diff --git a/Tizen.Internals/CoreFx.References.targets b/Tizen.Internals/CoreFx.References.targets
new file mode 100644
index 0000000..dab29ec
--- /dev/null
+++ b/Tizen.Internals/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.Internals/Tizen.Internals.Errors/ErrorFacts.cs b/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs
index 5eebd66..cc01676 100755
--- a/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs
+++ b/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs
@@ -12,12 +12,12 @@ using System.Runtime.InteropServices;
 namespace Tizen.Internals.Errors
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public static class ErrorFacts
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <returns></returns>
         public static int GetLastResult()
@@ -26,14 +26,14 @@ namespace Tizen.Internals.Errors
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="errorCode"></param>
         /// <returns></returns>
         public static string GetErrorMessage(int errorCode)
         {
             IntPtr errorPtr = Interop.CommonError.GetErrorMessage(errorCode);
-            return Marshal.PtrToStringAuto(errorPtr);
+            return Marshal.PtrToStringAnsi(errorPtr);
         }
     }
 }
diff --git a/Tizen.Internals/Tizen.Internals.csproj b/Tizen.Internals/Tizen.Internals.csproj
index 83d115e..3ea9d57 100755
--- a/Tizen.Internals/Tizen.Internals.csproj
+++ b/Tizen.Internals/Tizen.Internals.csproj
@@ -38,20 +38,14 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>Tizen.Internals.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" />
+  <Import Project="CoreFx.References.targets" />
+  <ItemGroup Condition=" '$(CoreFxPath)' == '' ">
+    <Reference Include="System"/>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Interop\Interop.CommonError.cs" />
     <Compile Include="Tizen.Internals.Errors\ErrorFacts.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tizen.Internals.Errors\ErrorCode.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -61,7 +55,7 @@
     <CodeAnalysisDictionary Include="CustomDictionary.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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>
diff --git a/Tizen.Internals/Tizen.Internals.csproj.user b/Tizen.Internals/Tizen.Internals.csproj.user
deleted file mode 100755
index 5283ef1..0000000
--- a/Tizen.Internals/Tizen.Internals.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/packaging/csapi-tizen.spec b/packaging/csapi-tizen.spec
index 131f68c..ab45199 100644
--- a/packaging/csapi-tizen.spec
+++ b/packaging/csapi-tizen.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(dlog)
-BuildRequires: pkgconfig(capi-base-common)
+# .NETCore
+%if 0%{?_with_corefx}
+AutoReqProv: no
+BuildRequires: corefx-managed-32b-ref
+%endif
 
 %description
 Tizen API for C#
@@ -36,22 +39,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}
diff --git a/src/Tizen/CoreFx.References.targets b/src/Tizen/CoreFx.References.targets
new file mode 100644
index 0000000..dab29ec
--- /dev/null
+++ b/src/Tizen/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/src/Tizen/Tizen.csproj b/src/Tizen/Tizen.csproj
index 2b02317..9e04af2 100644
--- a/src/Tizen/Tizen.csproj
+++ b/src/Tizen/Tizen.csproj
@@ -38,21 +38,15 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>Tizen.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" />
+  <Import Project="CoreFx.References.targets" />
+  <ItemGroup Condition=" '$(CoreFxPath)' == '' ">
+    <Reference Include="System"/>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Interop\Interop.Dlog.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tizen\Log.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Tizen.snk" />
@@ -61,11 +55,11 @@
     <CodeAnalysisDictionary Include="CustomDictionary.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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
+</Project>
diff --git a/src/Tizen/Tizen.csproj.user b/src/Tizen/Tizen.csproj.user
deleted file mode 100755
index 55f44b9..0000000
--- a/src/Tizen/Tizen.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
-- 
2.7.4