summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--ElmSharp/ElmSharp.Net45.csproj160
-rw-r--r--ElmSharp/ElmSharp.Net45.project.json8
-rw-r--r--ElmSharp/ElmSharp.csproj169
-rw-r--r--ElmSharp/ElmSharp.project.json11
-rw-r--r--ElmSharp/ElmSharp.xproj19
-rw-r--r--ElmSharp/ElmSharp/Background.cs5
-rw-r--r--ElmSharp/Interop/Interop.Elementary.cs8
-rw-r--r--ElmSharp/Properties/AssemblyInfo.cs20
-rw-r--r--ElmSharp/project.json16
-rw-r--r--ElmSharpTest/ElmSharpTest.xproj.user6
-rw-r--r--ElmSharpTest/project.json2
-rw-r--r--packaging/elm-sharp.spec45
13 files changed, 404 insertions, 66 deletions
diff --git a/.gitignore b/.gitignore
index 4554980..46619d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,5 @@ obj/
*.exe
*.dll
*.csproj.user
-*.xproj.user
*.lock.json
.vs/
diff --git a/ElmSharp/ElmSharp.Net45.csproj b/ElmSharp/ElmSharp.Net45.csproj
new file mode 100644
index 0000000..a1d64ec
--- /dev/null
+++ b/ElmSharp/ElmSharp.Net45.csproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{657E0754-FAF0-42B9-B9F5-45868826758E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ElmSharp</RootNamespace>
+ <AssemblyName>ElmSharp</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Debug\Net45\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\Net45\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>ElmSharp.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" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="ElmSharp\Background.cs" />
+ <Compile Include="ElmSharp\Box.cs" />
+ <Compile Include="ElmSharp\Button.cs" />
+ <Compile Include="ElmSharp\Calendar.cs" />
+ <Compile Include="ElmSharp\Check.cs" />
+ <Compile Include="ElmSharp\CheckStateChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\Color.cs" />
+ <Compile Include="ElmSharp\ColorChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\ColorSelector.cs" />
+ <Compile Include="ElmSharp\Conformant.cs" />
+ <Compile Include="ElmSharp\Container.cs" />
+ <Compile Include="ElmSharp\ContextPopup.cs" />
+ <Compile Include="ElmSharp\ContextPopupItem.cs" />
+ <Compile Include="ElmSharp\DateChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\DateTimeSelector.cs" />
+ <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\EcoreMainloop.cs" />
+ <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" />
+ <Compile Include="ElmSharp\EdjeObject.cs" />
+ <Compile Include="ElmSharp\Elementary.cs" />
+ <Compile Include="ElmSharp\Entry.cs" />
+ <Compile Include="ElmSharp\EvasKeyEventArgs.cs" />
+ <Compile Include="ElmSharp\EvasMap.cs" />
+ <Compile Include="ElmSharp\EvasObject.cs" />
+ <Compile Include="ElmSharp\GenGrid.cs" />
+ <Compile Include="ElmSharp\GenGridItem.cs" />
+ <Compile Include="ElmSharp\GenItem.cs" />
+ <Compile Include="ElmSharp\GenItemClass.cs" />
+ <Compile Include="ElmSharp\GenList.cs" />
+ <Compile Include="ElmSharp\GenListItem.cs" />
+ <Compile Include="ElmSharp\Icon.cs" />
+ <Compile Include="ElmSharp\Image.cs" />
+ <Compile Include="ElmSharp\Index.cs" />
+ <Compile Include="ElmSharp\IndexItem.cs" />
+ <Compile Include="ElmSharp\ItemObject.cs" />
+ <Compile Include="ElmSharp\Label.cs" />
+ <Compile Include="ElmSharp\Layout.cs" />
+ <Compile Include="ElmSharp\List.cs" />
+ <Compile Include="ElmSharp\ListItem.cs" />
+ <Compile Include="ElmSharp\Naviframe.cs" />
+ <Compile Include="ElmSharp\NaviItem.cs" />
+ <Compile Include="ElmSharp\Panel.cs" />
+ <Compile Include="ElmSharp\Panes.cs" />
+ <Compile Include="ElmSharp\Point.cs" />
+ <Compile Include="ElmSharp\Point3D.cs" />
+ <Compile Include="ElmSharp\Popup.cs" />
+ <Compile Include="ElmSharp\PopupItem.cs" />
+ <Compile Include="ElmSharp\ProgressBar.cs" />
+ <Compile Include="ElmSharp\Radio.cs" />
+ <Compile Include="ElmSharp\Rect.cs" />
+ <Compile Include="ElmSharp\Rectangle.cs" />
+ <Compile Include="ElmSharp\Scroller.cs" />
+ <Compile Include="ElmSharp\Size.cs" />
+ <Compile Include="ElmSharp\Slider.cs" />
+ <Compile Include="ElmSharp\Spinner.cs" />
+ <Compile Include="ElmSharp\Table.cs" />
+ <Compile Include="ElmSharp\Toolbar.cs" />
+ <Compile Include="ElmSharp\ToolbarItem.cs" />
+ <Compile Include="ElmSharp\Widget.cs" />
+ <Compile Include="ElmSharp\Window.cs" />
+ <Compile Include="ElmSharp\WrapType.cs" />
+ <Compile Include="Interop\Interop.Ecore.cs" />
+ <Compile Include="Interop\Interop.Elementary.Bg.cs" />
+ <Compile Include="Interop\Interop.Elementary.Box.cs" />
+ <Compile Include="Interop\Interop.Elementary.Button.cs" />
+ <Compile Include="Interop\Interop.Elementary.CalendarView.cs" />
+ <Compile Include="Interop\Interop.Elementary.ColorPicker.cs" />
+ <Compile Include="Interop\Interop.Elementary.cs" />
+ <Compile Include="Interop\Interop.Elementary.CtxPopup.cs" />
+ <Compile Include="Interop\Interop.Elementary.DateTimePicker.cs" />
+ <Compile Include="Interop\Interop.Elementary.Entry.cs" />
+ <Compile Include="Interop\Interop.Elementary.GenGridView.cs" />
+ <Compile Include="Interop\Interop.Elementary.GenListView.cs" />
+ <Compile Include="Interop\Interop.Elementary.Image.cs" />
+ <Compile Include="Interop\Interop.Elementary.Index.cs" />
+ <Compile Include="Interop\Interop.Elementary.Label.cs" />
+ <Compile Include="Interop\Interop.Elementary.List.cs" />
+ <Compile Include="Interop\Interop.Elementary.Naviframe.cs" />
+ <Compile Include="Interop\Interop.Elementary.Panel.cs" />
+ <Compile Include="Interop\Interop.Elementary.Panes.cs" />
+ <Compile Include="Interop\Interop.Elementary.Popup.cs" />
+ <Compile Include="Interop\Interop.Elementary.ProgressBar.cs" />
+ <Compile Include="Interop\Interop.Elementary.ScrollView.cs" />
+ <Compile Include="Interop\Interop.Elementary.Slider.cs" />
+ <Compile Include="Interop\Interop.Elementary.Spinner.cs" />
+ <Compile Include="Interop\Interop.Elementary.Table.cs" />
+ <Compile Include="Interop\Interop.Elementary.Toolbar.cs" />
+ <Compile Include="Interop\Interop.Elementary.Win.cs" />
+ <Compile Include="Interop\Interop.Evas.cs" />
+ <Compile Include="Interop\Interop.Evas.Image.cs" />
+ <Compile Include="Interop\Interop.EvasObjectEvent.cs" />
+ <Compile Include="Interop\Interop.Libc.cs" />
+ <Compile Include="Interop\Interop.Libraries.cs" />
+ <Compile Include="Interop\Interop.SmartEvent.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="ElmSharp.nuspec" />
+ <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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project> \ No newline at end of file
diff --git a/ElmSharp/ElmSharp.Net45.project.json b/ElmSharp/ElmSharp.Net45.project.json
new file mode 100644
index 0000000..5e1948a
--- /dev/null
+++ b/ElmSharp/ElmSharp.Net45.project.json
@@ -0,0 +1,8 @@
+{
+ "frameworks": {
+ "net45": {}
+ },
+ "runtimes": {
+ "win": {}
+ }
+}
diff --git a/ElmSharp/ElmSharp.csproj b/ElmSharp/ElmSharp.csproj
new file mode 100644
index 0000000..b9850d8
--- /dev/null
+++ b/ElmSharp/ElmSharp.csproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{7B15AF72-70CC-11E6-AE37-EB727F0BD84E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ElmSharp</RootNamespace>
+ <AssemblyName>ElmSharp</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup>
+ <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier>
+ <TargetFrameworkVersion>v1.6</TargetFrameworkVersion>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+ <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+ <NoStdLib>true</NoStdLib>
+ <NoWarn>$(NoWarn);1701;1702</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>true</SignAssembly>
+ </PropertyGroup>
+ <PropertyGroup>
+ <AssemblyOriginatorKeyFile>ElmSharp.snk</AssemblyOriginatorKeyFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="ElmSharp\Background.cs" />
+ <Compile Include="ElmSharp\Box.cs" />
+ <Compile Include="ElmSharp\Button.cs" />
+ <Compile Include="ElmSharp\Calendar.cs" />
+ <Compile Include="ElmSharp\Check.cs" />
+ <Compile Include="ElmSharp\CheckStateChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\Color.cs" />
+ <Compile Include="ElmSharp\ColorChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\ColorSelector.cs" />
+ <Compile Include="ElmSharp\Conformant.cs" />
+ <Compile Include="ElmSharp\Container.cs" />
+ <Compile Include="ElmSharp\ContextPopup.cs" />
+ <Compile Include="ElmSharp\ContextPopupItem.cs" />
+ <Compile Include="ElmSharp\DateChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\DateTimeSelector.cs" />
+ <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" />
+ <Compile Include="ElmSharp\EcoreMainloop.cs" />
+ <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" />
+ <Compile Include="ElmSharp\EdjeObject.cs" />
+ <Compile Include="ElmSharp\Elementary.cs" />
+ <Compile Include="ElmSharp\Entry.cs" />
+ <Compile Include="ElmSharp\EvasKeyEventArgs.cs" />
+ <Compile Include="ElmSharp\EvasMap.cs" />
+ <Compile Include="ElmSharp\EvasObject.cs" />
+ <Compile Include="ElmSharp\GenGrid.cs" />
+ <Compile Include="ElmSharp\GenGridItem.cs" />
+ <Compile Include="ElmSharp\GenItem.cs" />
+ <Compile Include="ElmSharp\GenItemClass.cs" />
+ <Compile Include="ElmSharp\GenList.cs" />
+ <Compile Include="ElmSharp\GenListItem.cs" />
+ <Compile Include="ElmSharp\Icon.cs" />
+ <Compile Include="ElmSharp\Image.cs" />
+ <Compile Include="ElmSharp\Index.cs" />
+ <Compile Include="ElmSharp\IndexItem.cs" />
+ <Compile Include="ElmSharp\ItemObject.cs" />
+ <Compile Include="ElmSharp\Label.cs" />
+ <Compile Include="ElmSharp\Layout.cs" />
+ <Compile Include="ElmSharp\List.cs" />
+ <Compile Include="ElmSharp\ListItem.cs" />
+ <Compile Include="ElmSharp\Naviframe.cs" />
+ <Compile Include="ElmSharp\NaviItem.cs" />
+ <Compile Include="ElmSharp\Panel.cs" />
+ <Compile Include="ElmSharp\Panes.cs" />
+ <Compile Include="ElmSharp\Point.cs" />
+ <Compile Include="ElmSharp\Point3D.cs" />
+ <Compile Include="ElmSharp\Popup.cs" />
+ <Compile Include="ElmSharp\PopupItem.cs" />
+ <Compile Include="ElmSharp\ProgressBar.cs" />
+ <Compile Include="ElmSharp\Radio.cs" />
+ <Compile Include="ElmSharp\Rect.cs" />
+ <Compile Include="ElmSharp\Rectangle.cs" />
+ <Compile Include="ElmSharp\Scroller.cs" />
+ <Compile Include="ElmSharp\Size.cs" />
+ <Compile Include="ElmSharp\Slider.cs" />
+ <Compile Include="ElmSharp\Spinner.cs" />
+ <Compile Include="ElmSharp\Table.cs" />
+ <Compile Include="ElmSharp\Toolbar.cs" />
+ <Compile Include="ElmSharp\ToolbarItem.cs" />
+ <Compile Include="ElmSharp\Widget.cs" />
+ <Compile Include="ElmSharp\Window.cs" />
+ <Compile Include="ElmSharp\WrapType.cs" />
+ <Compile Include="Interop\Interop.Ecore.cs" />
+ <Compile Include="Interop\Interop.Elementary.Bg.cs" />
+ <Compile Include="Interop\Interop.Elementary.Box.cs" />
+ <Compile Include="Interop\Interop.Elementary.Button.cs" />
+ <Compile Include="Interop\Interop.Elementary.CalendarView.cs" />
+ <Compile Include="Interop\Interop.Elementary.ColorPicker.cs" />
+ <Compile Include="Interop\Interop.Elementary.cs" />
+ <Compile Include="Interop\Interop.Elementary.CtxPopup.cs" />
+ <Compile Include="Interop\Interop.Elementary.DateTimePicker.cs" />
+ <Compile Include="Interop\Interop.Elementary.Entry.cs" />
+ <Compile Include="Interop\Interop.Elementary.GenGridView.cs" />
+ <Compile Include="Interop\Interop.Elementary.GenListView.cs" />
+ <Compile Include="Interop\Interop.Elementary.Image.cs" />
+ <Compile Include="Interop\Interop.Elementary.Index.cs" />
+ <Compile Include="Interop\Interop.Elementary.Label.cs" />
+ <Compile Include="Interop\Interop.Elementary.List.cs" />
+ <Compile Include="Interop\Interop.Elementary.Naviframe.cs" />
+ <Compile Include="Interop\Interop.Elementary.Panel.cs" />
+ <Compile Include="Interop\Interop.Elementary.Panes.cs" />
+ <Compile Include="Interop\Interop.Elementary.Popup.cs" />
+ <Compile Include="Interop\Interop.Elementary.ProgressBar.cs" />
+ <Compile Include="Interop\Interop.Elementary.ScrollView.cs" />
+ <Compile Include="Interop\Interop.Elementary.Slider.cs" />
+ <Compile Include="Interop\Interop.Elementary.Spinner.cs" />
+ <Compile Include="Interop\Interop.Elementary.Table.cs" />
+ <Compile Include="Interop\Interop.Elementary.Toolbar.cs" />
+ <Compile Include="Interop\Interop.Elementary.Win.cs" />
+ <Compile Include="Interop\Interop.Evas.cs" />
+ <Compile Include="Interop\Interop.Evas.Image.cs" />
+ <Compile Include="Interop\Interop.EvasObjectEvent.cs" />
+ <Compile Include="Interop\Interop.Libc.cs" />
+ <Compile Include="Interop\Interop.Libraries.cs" />
+ <Compile Include="Interop\Interop.SmartEvent.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="ElmSharp.nuspec" />
+ <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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+ <PropertyGroup>
+ <!-- https://github.com/dotnet/corefxlab/tree/master/samples/NetCoreSample and
+ https://docs.microsoft.com/en-us/dotnet/articles/core/tutorials/target-dotnetcore-with-msbuild
+ -->
+ <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
+ properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
+ to prevent it from outputting a warning (MSB3644).
+ -->
+ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
+ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
+ <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/ElmSharp/ElmSharp.project.json b/ElmSharp/ElmSharp.project.json
new file mode 100644
index 0000000..04ccf35
--- /dev/null
+++ b/ElmSharp/ElmSharp.project.json
@@ -0,0 +1,11 @@
+{
+ "dependencies": {
+ "NETStandard.Library": "1.6.0",
+ },
+ "frameworks": {
+ "netstandard1.6": {}
+ },
+ "runtimes": {
+ "win": {}
+ }
+}
diff --git a/ElmSharp/ElmSharp.xproj b/ElmSharp/ElmSharp.xproj
deleted file mode 100644
index 3f3adab..0000000
--- a/ElmSharp/ElmSharp.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>ba32f892-baaa-43ef-b9b8-bcf022c54321</ProjectGuid>
- <RootNamespace>ElmSharp</RootNamespace>
- <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
- </PropertyGroup>
-
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project> \ No newline at end of file
diff --git a/ElmSharp/ElmSharp/Background.cs b/ElmSharp/ElmSharp/Background.cs
index ae25349..25d4446 100644
--- a/ElmSharp/ElmSharp/Background.cs
+++ b/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/ElmSharp/Interop/Interop.Elementary.cs b/ElmSharp/Interop/Interop.Elementary.cs
index 4e2cd42..6821173 100644
--- a/ElmSharp/Interop/Interop.Elementary.cs
+++ b/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/ElmSharp/Properties/AssemblyInfo.cs b/ElmSharp/Properties/AssemblyInfo.cs
index 98d44f9..8648f95 100644
--- a/ElmSharp/Properties/AssemblyInfo.cs
+++ b/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/ElmSharp/project.json b/ElmSharp/project.json
deleted file mode 100644
index 0348ec5..0000000
--- a/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": {}
- }
-}
diff --git a/ElmSharpTest/ElmSharpTest.xproj.user b/ElmSharpTest/ElmSharpTest.xproj.user
new file mode 100644
index 0000000..ce9011d
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.xproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ActiveDebugProfile>ElmSharpTest</ActiveDebugProfile>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/ElmSharpTest/project.json b/ElmSharpTest/project.json
index 4ecb49f..6262aea 100644
--- 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
--- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 14:03:45 +0000