Support netstandard 1.6

Change-Id: I11e356d4d13b2636a02e5976e744101dcddcc08e

diff --git a/.gitignore b/.gitignore
index 4554980..46619d5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,5 @@ obj/
 *.exe
 *.dll
 *.csproj.user
-*.xproj.user
 *.lock.json
 .vs/

diff --git a/ElmSharpTest/ElmSharpTest.xproj.user b/ElmSharpTest/ElmSharpTest.xproj.user
new file mode 100644 (file)
index 0000000..ce9011d
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.xproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <ActiveDebugProfile>ElmSharpTest</ActiveDebugProfile>\r
+  </PropertyGroup>\r
+</Project>
\ No newline at end of file

diff --git a/ElmSharpTest/project.json b/ElmSharpTest/project.json
index 4ecb49f..6262aea 100644 (file)
--- a/ElmSharpTest/project.json
+++ b/ElmSharpTest/project.json
@@ -4,7 +4,7 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "ElmSharp": "1.0.0"
+    "ElmSharp": "1.0.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {

diff --git a/packaging/elm-sharp.spec b/packaging/elm-sharp.spec
index 36add48..33ddd2f 100644 (file)
--- a/packaging/elm-sharp.spec
+++ b/packaging/elm-sharp.spec
@@ -17,6 +17,10 @@ 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
@@ -35,23 +39,44 @@ cp %{SOURCE1} .
 %define Assemblies ElmSharp
 
 %build
-dotnet-gbs build %{Assemblies} \
+# 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}
-        --CoreFxPath=%{dotnet_core_path} \
+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
-        --Configuration=%{BUILDCONF} \
-        --DotnetAssemblyPath=%{dotnet_assembly_path}
 
-dotnet-gbs pack %{Assemblies} --PackageVersion=%{version}
+# Make NuGet package
+dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin
+
+done
 
 %install
-mkdir -p %{buildroot}%{dotnet_assembly_path}
-dotnet-gbs install %{Assemblies} \
-        --Configuration=%{BUILDCONF} \
-        --InstallPath=%{buildroot}%{dotnet_assembly_path}
+mkdir -p %{buildroot}%{dotnet_assembly_path}/devel
+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}
+%else
+  install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path}
+%endif
+done
 
 mkdir -p %{buildroot}/nuget
-install -p -m 644 .nuget/*.nupkg %{buildroot}/nuget
+install -p -m 644 *.nupkg %{buildroot}/nuget
 
 %files
 %manifest %{name}.manifest

diff --git a/src/ElmSharp/ElmSharp.Net45.csproj b/src/ElmSharp/ElmSharp.Net45.csproj
new file mode 100644 (file)
index 0000000..a1d64ec
--- /dev/null
+++ b/src/ElmSharp/ElmSharp.Net45.csproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProjectGuid>{657E0754-FAF0-42B9-B9F5-45868826758E}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>ElmSharp</RootNamespace>\r
+    <AssemblyName>ElmSharp</AssemblyName>\r
+    <FileAlignment>512</FileAlignment>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Debug\Net45\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\Net45\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>ElmSharp.snk</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Core" />\r
+    <Reference Include="System.Xml.Linq" />\r
+    <Reference Include="System.Data.DataSetExtensions" />\r
+    <Reference Include="Microsoft.CSharp" />\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Net.Http" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="ElmSharp\Background.cs" />\r
+    <Compile Include="ElmSharp\Box.cs" />\r
+    <Compile Include="ElmSharp\Button.cs" />\r
+    <Compile Include="ElmSharp\Calendar.cs" />\r
+    <Compile Include="ElmSharp\Check.cs" />\r
+    <Compile Include="ElmSharp\CheckStateChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\Color.cs" />\r
+    <Compile Include="ElmSharp\ColorChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\ColorSelector.cs" />\r
+    <Compile Include="ElmSharp\Conformant.cs" />\r
+    <Compile Include="ElmSharp\Container.cs" />\r
+    <Compile Include="ElmSharp\ContextPopup.cs" />\r
+    <Compile Include="ElmSharp\ContextPopupItem.cs" />\r
+    <Compile Include="ElmSharp\DateChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\DateTimeSelector.cs" />\r
+    <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\EcoreMainloop.cs" />\r
+    <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" />\r
+    <Compile Include="ElmSharp\EdjeObject.cs" />\r
+    <Compile Include="ElmSharp\Elementary.cs" />\r
+    <Compile Include="ElmSharp\Entry.cs" />\r
+    <Compile Include="ElmSharp\EvasKeyEventArgs.cs" />\r
+    <Compile Include="ElmSharp\EvasMap.cs" />\r
+    <Compile Include="ElmSharp\EvasObject.cs" />\r
+    <Compile Include="ElmSharp\GenGrid.cs" />\r
+    <Compile Include="ElmSharp\GenGridItem.cs" />\r
+    <Compile Include="ElmSharp\GenItem.cs" />\r
+    <Compile Include="ElmSharp\GenItemClass.cs" />\r
+    <Compile Include="ElmSharp\GenList.cs" />\r
+    <Compile Include="ElmSharp\GenListItem.cs" />\r
+    <Compile Include="ElmSharp\Icon.cs" />\r
+    <Compile Include="ElmSharp\Image.cs" />\r
+    <Compile Include="ElmSharp\Index.cs" />\r
+    <Compile Include="ElmSharp\IndexItem.cs" />\r
+    <Compile Include="ElmSharp\ItemObject.cs" />\r
+    <Compile Include="ElmSharp\Label.cs" />\r
+    <Compile Include="ElmSharp\Layout.cs" />\r
+    <Compile Include="ElmSharp\List.cs" />\r
+    <Compile Include="ElmSharp\ListItem.cs" />\r
+    <Compile Include="ElmSharp\Naviframe.cs" />\r
+    <Compile Include="ElmSharp\NaviItem.cs" />\r
+    <Compile Include="ElmSharp\Panel.cs" />\r
+    <Compile Include="ElmSharp\Panes.cs" />\r
+    <Compile Include="ElmSharp\Point.cs" />\r
+    <Compile Include="ElmSharp\Point3D.cs" />\r
+    <Compile Include="ElmSharp\Popup.cs" />\r
+    <Compile Include="ElmSharp\PopupItem.cs" />\r
+    <Compile Include="ElmSharp\ProgressBar.cs" />\r
+    <Compile Include="ElmSharp\Radio.cs" />\r
+    <Compile Include="ElmSharp\Rect.cs" />\r
+    <Compile Include="ElmSharp\Rectangle.cs" />\r
+    <Compile Include="ElmSharp\Scroller.cs" />\r
+    <Compile Include="ElmSharp\Size.cs" />\r
+    <Compile Include="ElmSharp\Slider.cs" />\r
+    <Compile Include="ElmSharp\Spinner.cs" />\r
+    <Compile Include="ElmSharp\Table.cs" />\r
+    <Compile Include="ElmSharp\Toolbar.cs" />\r
+    <Compile Include="ElmSharp\ToolbarItem.cs" />\r
+    <Compile Include="ElmSharp\Widget.cs" />\r
+    <Compile Include="ElmSharp\Window.cs" />\r
+    <Compile Include="ElmSharp\WrapType.cs" />\r
+    <Compile Include="Interop\Interop.Ecore.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Bg.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Box.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Button.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.CalendarView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ColorPicker.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.CtxPopup.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.DateTimePicker.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Entry.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.GenGridView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.GenListView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Image.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Index.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Label.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.List.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Naviframe.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Panel.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Panes.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Popup.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ProgressBar.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ScrollView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Slider.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Spinner.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Table.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Toolbar.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Win.cs" />\r
+    <Compile Include="Interop\Interop.Evas.cs" />\r
+    <Compile Include="Interop\Interop.Evas.Image.cs" />\r
+    <Compile Include="Interop\Interop.EvasObjectEvent.cs" />\r
+    <Compile Include="Interop\Interop.Libc.cs" />\r
+    <Compile Include="Interop\Interop.Libraries.cs" />\r
+    <Compile Include="Interop\Interop.SmartEvent.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="ElmSharp.nuspec" />\r
+    <None Include="ElmSharp.project.json" />\r
+    <None Include="ElmSharp.snk" />\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.\r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+</Project>
\ No newline at end of file

diff --git a/src/ElmSharp/ElmSharp.Net45.project.json b/src/ElmSharp/ElmSharp.Net45.project.json
new file mode 100644 (file)
index 0000000..5e1948a
--- /dev/null
+++ b/src/ElmSharp/ElmSharp.Net45.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}

diff --git a/src/ElmSharp/ElmSharp.csproj b/src/ElmSharp/ElmSharp.csproj
new file mode 100644 (file)
index 0000000..b9850d8
--- /dev/null
+++ b/src/ElmSharp/ElmSharp.csproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProjectGuid>{7B15AF72-70CC-11E6-AE37-EB727F0BD84E}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>ElmSharp</RootNamespace>\r
+    <AssemblyName>ElmSharp</AssemblyName>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>\r
+    <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>\r
+    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
+    <NoStdLib>true</NoStdLib>\r
+    <NoWarn>$(NoWarn);1701;1702</NoWarn>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release\</OutputPath>\r
+    <DefineConstants>TRACE</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <SignAssembly>true</SignAssembly>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <AssemblyOriginatorKeyFile>ElmSharp.snk</AssemblyOriginatorKeyFile>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Compile Include="ElmSharp\Background.cs" />\r
+    <Compile Include="ElmSharp\Box.cs" />\r
+    <Compile Include="ElmSharp\Button.cs" />\r
+    <Compile Include="ElmSharp\Calendar.cs" />\r
+    <Compile Include="ElmSharp\Check.cs" />\r
+    <Compile Include="ElmSharp\CheckStateChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\Color.cs" />\r
+    <Compile Include="ElmSharp\ColorChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\ColorSelector.cs" />\r
+    <Compile Include="ElmSharp\Conformant.cs" />\r
+    <Compile Include="ElmSharp\Container.cs" />\r
+    <Compile Include="ElmSharp\ContextPopup.cs" />\r
+    <Compile Include="ElmSharp\ContextPopupItem.cs" />\r
+    <Compile Include="ElmSharp\DateChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\DateTimeSelector.cs" />\r
+    <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" />\r
+    <Compile Include="ElmSharp\EcoreMainloop.cs" />\r
+    <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" />\r
+    <Compile Include="ElmSharp\EdjeObject.cs" />\r
+    <Compile Include="ElmSharp\Elementary.cs" />\r
+    <Compile Include="ElmSharp\Entry.cs" />\r
+    <Compile Include="ElmSharp\EvasKeyEventArgs.cs" />\r
+    <Compile Include="ElmSharp\EvasMap.cs" />\r
+    <Compile Include="ElmSharp\EvasObject.cs" />\r
+    <Compile Include="ElmSharp\GenGrid.cs" />\r
+    <Compile Include="ElmSharp\GenGridItem.cs" />\r
+    <Compile Include="ElmSharp\GenItem.cs" />\r
+    <Compile Include="ElmSharp\GenItemClass.cs" />\r
+    <Compile Include="ElmSharp\GenList.cs" />\r
+    <Compile Include="ElmSharp\GenListItem.cs" />\r
+    <Compile Include="ElmSharp\Icon.cs" />\r
+    <Compile Include="ElmSharp\Image.cs" />\r
+    <Compile Include="ElmSharp\Index.cs" />\r
+    <Compile Include="ElmSharp\IndexItem.cs" />\r
+    <Compile Include="ElmSharp\ItemObject.cs" />\r
+    <Compile Include="ElmSharp\Label.cs" />\r
+    <Compile Include="ElmSharp\Layout.cs" />\r
+    <Compile Include="ElmSharp\List.cs" />\r
+    <Compile Include="ElmSharp\ListItem.cs" />\r
+    <Compile Include="ElmSharp\Naviframe.cs" />\r
+    <Compile Include="ElmSharp\NaviItem.cs" />\r
+    <Compile Include="ElmSharp\Panel.cs" />\r
+    <Compile Include="ElmSharp\Panes.cs" />\r
+    <Compile Include="ElmSharp\Point.cs" />\r
+    <Compile Include="ElmSharp\Point3D.cs" />\r
+    <Compile Include="ElmSharp\Popup.cs" />\r
+    <Compile Include="ElmSharp\PopupItem.cs" />\r
+    <Compile Include="ElmSharp\ProgressBar.cs" />\r
+    <Compile Include="ElmSharp\Radio.cs" />\r
+    <Compile Include="ElmSharp\Rect.cs" />\r
+    <Compile Include="ElmSharp\Rectangle.cs" />\r
+    <Compile Include="ElmSharp\Scroller.cs" />\r
+    <Compile Include="ElmSharp\Size.cs" />\r
+    <Compile Include="ElmSharp\Slider.cs" />\r
+    <Compile Include="ElmSharp\Spinner.cs" />\r
+    <Compile Include="ElmSharp\Table.cs" />\r
+    <Compile Include="ElmSharp\Toolbar.cs" />\r
+    <Compile Include="ElmSharp\ToolbarItem.cs" />\r
+    <Compile Include="ElmSharp\Widget.cs" />\r
+    <Compile Include="ElmSharp\Window.cs" />\r
+    <Compile Include="ElmSharp\WrapType.cs" />\r
+    <Compile Include="Interop\Interop.Ecore.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Bg.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Box.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Button.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.CalendarView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ColorPicker.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.CtxPopup.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.DateTimePicker.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Entry.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.GenGridView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.GenListView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Image.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Index.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Label.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.List.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Naviframe.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Panel.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Panes.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Popup.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ProgressBar.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.ScrollView.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Slider.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Spinner.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Table.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Toolbar.cs" />\r
+    <Compile Include="Interop\Interop.Elementary.Win.cs" />\r
+    <Compile Include="Interop\Interop.Evas.cs" />\r
+    <Compile Include="Interop\Interop.Evas.Image.cs" />\r
+    <Compile Include="Interop\Interop.EvasObjectEvent.cs" />\r
+    <Compile Include="Interop\Interop.Libc.cs" />\r
+    <Compile Include="Interop\Interop.Libraries.cs" />\r
+    <Compile Include="Interop\Interop.SmartEvent.cs" />\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="ElmSharp.nuspec" />\r
+    <None Include="ElmSharp.project.json" />\r
+    <None Include="ElmSharp.snk" />\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets" Condition="Exists('$(MSBuildExtensionsPath)\Tizen\Tizen.CSharp.GBS.targets')" />\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.\r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <PropertyGroup>\r
+    <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and\r
+       https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild\r
+    -->\r
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two\r
+       properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and\r
+       to prevent it from outputting a warning (MSB3644).\r
+    -->\r
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>\r
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>\r
+    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>\r
+  </PropertyGroup>\r
+</Project>
\ No newline at end of file

diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json
new file mode 100644 (file)
index 0000000..04ccf35
--- /dev/null
+++ b/src/ElmSharp/ElmSharp.project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "NETStandard.Library": "1.6.0",
+  },
+  "frameworks": {
+    "netstandard1.6": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}

diff --git a/src/ElmSharp/ElmSharp.xproj b/src/ElmSharp/ElmSharp.xproj
deleted file mode 100644 (file)
index 3f3adab..0000000
--- a/src/ElmSharp/ElmSharp.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>\r
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>\r
-  </PropertyGroup>\r
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>ba32f892-baaa-43ef-b9b8-bcf022c54321</ProjectGuid>\r
-    <RootNamespace>ElmSharp</RootNamespace>\r
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>\r
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>\r
-  </PropertyGroup>\r
-\r
-  <PropertyGroup>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-  </PropertyGroup>\r
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />\r
-</Project>
\ No newline at end of file

diff --git a/src/ElmSharp/ElmSharp/Background.cs b/src/ElmSharp/ElmSharp/Background.cs
index ae25349..25d4446 100644 (file)
--- a/src/ElmSharp/ElmSharp/Background.cs
+++ b/src/ElmSharp/ElmSharp/Background.cs
@@ -10,18 +10,17 @@ namespace ElmSharp
 
         public override Color Color
         {
+            //TO-DO: Consider to support alpha to elm_bg.
             get
             {
                 int r;
                 int g;
                 int b;
                 Interop.Elementary.elm_bg_color_get(Handle, out r, out g, out b);
-                Color value = base.Color;
-                return new Color(r, g, b, value.A);
+                return new Color(r, g, b);
             }
             set
             {
-                base.Color = value;
                 Interop.Elementary.elm_bg_color_set(Handle, value.R, value.G, value.B);
             }
         }

diff --git a/src/ElmSharp/Interop/Interop.Elementary.cs b/src/ElmSharp/Interop/Interop.Elementary.cs
index 4e2cd42..6821173 100644 (file)
--- a/src/ElmSharp/Interop/Interop.Elementary.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.cs
@@ -74,6 +74,9 @@ internal static partial class Interop
         internal static extern void elm_object_item_part_content_set(IntPtr obj, IntPtr part, IntPtr content);
 
         [DllImport(Libraries.Elementary)]
+        internal static extern IntPtr elm_object_part_content_get(IntPtr obj, string part);
+
+        [DllImport(Libraries.Elementary)]
         internal static extern void elm_object_part_content_set(IntPtr obj, string part, IntPtr content);
 
         [DllImport(Libraries.Elementary)]
@@ -96,7 +99,10 @@ internal static partial class Interop
         internal static extern IntPtr elm_layout_add(IntPtr obj);
 
         [DllImport(Libraries.Elementary)]
-        internal static extern IntPtr elm_layout_content_set(IntPtr obj, string swallow, IntPtr content);
+        internal static extern IntPtr elm_layout_content_get(IntPtr obj, string swallow);
+
+        [DllImport(Libraries.Elementary)]
+        internal static extern bool elm_layout_content_set(IntPtr obj, string swallow, IntPtr content);
 
         [DllImport(Libraries.Elementary)]
         internal static extern IntPtr elm_layout_content_unset(IntPtr obj, string swallow);

diff --git a/src/ElmSharp/Properties/AssemblyInfo.cs b/src/ElmSharp/Properties/AssemblyInfo.cs
index 98d44f9..8648f95 100644 (file)
--- a/src/ElmSharp/Properties/AssemblyInfo.cs
+++ b/src/ElmSharp/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("EflSharp")]
+[assembly: AssemblyTitle("ElmSharp")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EflSharp")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCompany("Samsung Electronics")]
+[assembly: AssemblyProduct("ElmSharp")]
+[assembly: AssemblyCopyright("Copyright (c) 2015 Samsung Electronics Co., Ltd")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -22,15 +22,5 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("bfb6195c-3271-45e8-96fa-5872fa23c920")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+

diff --git a/src/ElmSharp/project.json b/src/ElmSharp/project.json
deleted file mode 100644 (file)
index 0348ec5..0000000
--- a/src/ElmSharp/project.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "keyFile": "ElmSharp.snk",
-    "allowUnsafe": true
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "NETStandard.Library": "1.6.0"
-      }
-    },
-    "net45": {}
-  }
-}