From 6f1988dcf8bcd103ea376086d1433b924c632cd4 Mon Sep 17 00:00:00 2001
From: WonYoung Choi <wy80.choi@samsung.com>
Date: Tue, 4 Oct 2016 15:39:10 +0900
Subject: [PATCH] Use nuget restore to solve dependencies

Change-Id: I9541707be648a37c493dc2715b67dbe45611b888
---
 packaging/elm-sharp.spec                      | 61 ++++++---------------------
 src/ElmSharp/ElmSharp.Net45.csproj            |  3 +-
 src/ElmSharp/ElmSharp.csproj                  |  7 ++-
 src/ElmSharp/ElmSharp.nuspec                  |  4 ++
 src/ElmSharp/ElmSharp.project.json            |  5 +--
 src/ElmSharp/ElmSharp/Color.cs                |  1 +
 src/ElmSharp/ElmSharp/Image.cs                |  1 +
 test/ElmSharp.Test/ElmSharp.Test.project.json | 24 +++++------
 8 files changed, 35 insertions(+), 71 deletions(-)

diff --git a/packaging/elm-sharp.spec b/packaging/elm-sharp.spec
index e909818..34f2202 100644
--- a/packaging/elm-sharp.spec
+++ b/packaging/elm-sharp.spec
@@ -1,5 +1,4 @@
 %{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework}
-%{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref}
 
 %if 0%{?tizen_build_devel_mode}
 %define BUILDCONF Debug
@@ -9,7 +8,7 @@
 
 Name:       elm-sharp
 Summary:    C# Binding for Elementary
-Version:    1.0.4
+Version:    1.0.5
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -17,16 +16,9 @@ URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
 
-# Mono
 BuildRequires: mono-compiler
 BuildRequires: mono-devel
 
-# .NETCore
-%if 0%{?_with_corefx}
-AutoReqProv: no
-BuildRequires: corefx-managed-32b-ref
-%endif
-
 BuildRequires: dotnet-build-tools
 
 %description
@@ -39,42 +31,26 @@ cp %{SOURCE1} .
 %define Assemblies ElmSharp
 
 %build
-# Build for Net45
 for ASM in %{Assemblies}; do
-if [ -e $ASM/$ASM.Net45.csproj ]; then
-  xbuild $ASM/$ASM.Net45.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/net45 \
-         /p:OutputPath=bin/net45
-fi
-
-# Build for Dotnet
-%if 0%{?_with_corefx}
-if [ -e $ASM/$ASM.csproj ]; then
-  xbuild $ASM/$ASM.csproj \
-         /p:Configuration=%{BUILDCONF} \
-         /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/netstandard1.6 \
-         /p:CoreFxPath=%{dotnet_core_path} \
-         /p:OutputPath=bin/netstandard1.6
-fi
-%endif
-
-# Make NuGet package
-dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin
-
+# NuGet Restore
+find $ASM/*.project.json -exec nuget restore {} \;
+# Build
+find $ASM/*.csproj -exec xbuild {} /p:Configuration=%{BUILDCONF} \;
+# NuGet Pack
+nuget pack $ASM/$ASM.nuspec -Version %{version} -Properties Configuration=%{BUILDCONF}
 done
 
 %install
-mkdir -p %{buildroot}%{dotnet_assembly_path}/devel
+# Runtime Binary
+mkdir -p %{buildroot}%{dotnet_assembly_path}
 for ASM in %{Assemblies}; do
-  cp -fr $ASM/bin/* %{buildroot}%{dotnet_assembly_path}/devel
 %if 0%{?_with_corefx}
-  install -p -m 644 $ASM/bin/netstandard1.6/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %else
-  install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+  install -p -m 644 $ASM/bin/%{BUILDCONF}/Net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
 %endif
 done
-
+# NuGet
 mkdir -p %{buildroot}/nuget
 install -p -m 644 *.nupkg %{buildroot}/nuget
 
@@ -83,22 +59,9 @@ install -p -m 644 *.nupkg %{buildroot}/nuget
 %license LICENSE
 %attr(644,root,root) %{dotnet_assembly_path}/*.dll
 
-%package devel
-Summary:   Development package for %{name}
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-AutoReqProv: no
-
-%description devel
-Development package for %{name}
-
-%files devel
-%{dotnet_assembly_path}/devel/*
-
 %package nuget
 Summary:   NuGet package for %{name}
 Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
 
 %description nuget
 NuGet package for %{name}
diff --git a/src/ElmSharp/ElmSharp.Net45.csproj b/src/ElmSharp/ElmSharp.Net45.csproj
index 92a8f32..f6d676e 100644
--- a/src/ElmSharp/ElmSharp.Net45.csproj
+++ b/src/ElmSharp/ElmSharp.Net45.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
@@ -152,7 +152,6 @@
     <None Include="ElmSharp.nuspec" />
     <None Include="ElmSharp.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
   <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.
diff --git a/src/ElmSharp/ElmSharp.csproj b/src/ElmSharp/ElmSharp.csproj
index 8af1fd5..f5aabe1 100644
--- a/src/ElmSharp/ElmSharp.csproj
+++ b/src/ElmSharp/ElmSharp.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
@@ -12,8 +12,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <TargetFrameworkVersion>v1.3</TargetFrameworkVersion>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <NoStdLib>true</NoStdLib>
     <NoWarn>$(NoWarn);1701;1702</NoWarn>
@@ -149,7 +149,6 @@
     <None Include="ElmSharp.project.json" />
     <None Include="ElmSharp.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />
   <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.
diff --git a/src/ElmSharp/ElmSharp.nuspec b/src/ElmSharp/ElmSharp.nuspec
index 7950b99..4a72702 100644
--- a/src/ElmSharp/ElmSharp.nuspec
+++ b/src/ElmSharp/ElmSharp.nuspec
@@ -6,4 +6,8 @@
 		<authors>Tizen Developers</authors>
 		<description>C# Binding for Elementary</description>
 	</metadata>
+  <files>
+    <file src="bin/$Configuration$/ElmSharp.dll" target="lib/netstandard1.3" />
+    <file src="bin/$Configuration$/Net45/ElmSharp.dll" target="lib/net45" />
+  </files>
 </package>
diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json
index 872bd5c..e8c7d8f 100644
--- a/src/ElmSharp/ElmSharp.project.json
+++ b/src/ElmSharp/ElmSharp.project.json
@@ -3,9 +3,6 @@
     "NETStandard.Library": "1.6.0"
   },
   "frameworks": {
-    "netstandard1.6": {}
-  },
-  "runtimes": {
-    "win": {}
+    "netstandard1.3": {}
   }
 }
diff --git a/src/ElmSharp/ElmSharp/Color.cs b/src/ElmSharp/ElmSharp/Color.cs
index 0843c95..004a66c 100644
--- a/src/ElmSharp/ElmSharp/Color.cs
+++ b/src/ElmSharp/ElmSharp/Color.cs
@@ -88,6 +88,7 @@ namespace ElmSharp
             return FromUint(Convert.ToUInt32(hex.Replace("#", ""), 16));
         }
 
+        [CLSCompliant(false)]
         public static Color FromUint(uint argb)
         {
             return FromRgba((byte)((argb & 0x00ff0000) >> 0x10), (byte)((argb & 0x0000ff00) >> 0x8), (byte)(argb & 0x000000ff), (byte)((argb & 0xff000000) >> 0x18));
diff --git a/src/ElmSharp/ElmSharp/Image.cs b/src/ElmSharp/ElmSharp/Image.cs
index 141623c..d90cd49 100644
--- a/src/ElmSharp/ElmSharp/Image.cs
+++ b/src/ElmSharp/ElmSharp/Image.cs
@@ -218,6 +218,7 @@ namespace ElmSharp
             LoadingCompleted?.Invoke(this, EventArgs.Empty);
         }
        
+        [CLSCompliant(false)]
         public unsafe void Load(byte* img, long size)
         {
             bool ret = Interop.Elementary.elm_image_memfile_set(Handle, img, size, IntPtr.Zero, IntPtr.Zero);
diff --git a/test/ElmSharp.Test/ElmSharp.Test.project.json b/test/ElmSharp.Test/ElmSharp.Test.project.json
index 33302d8..e6aacc0 100644
--- a/test/ElmSharp.Test/ElmSharp.Test.project.json
+++ b/test/ElmSharp.Test/ElmSharp.Test.project.json
@@ -1,12 +1,12 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.App": "1.0.0",
-    "Tizen.Applications": "1.0.0"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}
\ No newline at end of file
+{
+  "dependencies": {
+    "Microsoft.NETCore.App": "1.0.0",
+    "Tizen.Applications": "1.0.1"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
-- 
2.7.4