Fix project files of ElmSharpTest

Change-Id: Ib99724f4570cf7a5d3c1193805300abece2e2ec4

diff --git a/ElmSharpTest/ElmSharpTest.Net45.csproj b/ElmSharpTest/ElmSharpTest.Net45.csproj
new file mode 100644 (file)
index 0000000..f30834a
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.Net45.csproj
@@ -0,0 +1,102 @@
+<?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>{0D01D989-E4C1-400C-BF05-8FD79EF828A8}</ProjectGuid>\r
+    <OutputType>Exe</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>ElmSharpTest</RootNamespace>\r
+    <AssemblyName>ElmSharpTest</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\</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
+  <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="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="TC\BackgroundTest1.cs" />\r
+    <Compile Include="TC\BackgroundTest2.cs" />\r
+    <Compile Include="TC\BackgroundTest3.cs" />\r
+    <Compile Include="TC\BoxTest1.cs" />\r
+    <Compile Include="TC\ButtonTest1.cs" />\r
+    <Compile Include="TC\CalendarTest1.cs" />\r
+    <Compile Include="TC\CheckTest1.cs" />\r
+    <Compile Include="TC\ColorSelectorTest1.cs" />\r
+    <Compile Include="TC\ContextPopupTest1.cs" />\r
+    <Compile Include="TC\DateTimeSelectorTest1.cs" />\r
+    <Compile Include="TC\EntryTest1.cs" />\r
+    <Compile Include="TC\GenGridTest1.cs" />\r
+    <Compile Include="TC\GenGridTest2.cs" />\r
+    <Compile Include="TC\GenListTest1.cs" />\r
+    <Compile Include="TC\GenListTest2.cs" />\r
+    <Compile Include="TC\GenListTest3.cs" />\r
+    <Compile Include="TC\GenListTest4.cs" />\r
+    <Compile Include="TC\GenListTest5.cs" />\r
+    <Compile Include="TC\IconTest1.cs" />\r
+    <Compile Include="TC\IndexTest1.cs" />\r
+    <Compile Include="TC\IndexTest2.cs" />\r
+    <Compile Include="TC\LabelTest1.cs" />\r
+    <Compile Include="TC\ListTest1.cs" />\r
+    <Compile Include="TC\NaviframeTest1.cs" />\r
+    <Compile Include="TC\PanelTest1.cs" />\r
+    <Compile Include="TC\PanelTest2.cs" />\r
+    <Compile Include="TC\PanesTest1.cs" />\r
+    <Compile Include="TC\PopupTest1.cs" />\r
+    <Compile Include="TC\ProgressBarTest1.cs" />\r
+    <Compile Include="TC\RadioTest1.cs" />\r
+    <Compile Include="TC\RectangleTest1.cs" />\r
+    <Compile Include="TC\ScrollerTest1.cs" />\r
+    <Compile Include="TC\ScrollerTest2.cs" />\r
+    <Compile Include="TC\SliderTest1.cs" />\r
+    <Compile Include="TC\SpinnerTest1.cs" />\r
+    <Compile Include="TC\ToolbarTest1.cs" />\r
+    <Compile Include="TestCaseBase.cs" />\r
+    <Compile Include="TestRunner.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="ElmSharpTest.Net45.project.json" />\r
+    <None Include="test.sh" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\ElmSharp\ElmSharp.Net45.csproj">\r
+      <Project>{657e0754-faf0-42b9-b9f5-45868826758e}</Project>\r
+      <Name>ElmSharp.Net45</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\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/ElmSharpTest/ElmSharpTest.Net45.project.json b/ElmSharpTest/ElmSharpTest.Net45.project.json
new file mode 100644 (file)
index 0000000..5e1948a
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.Net45.project.json
@@ -0,0 +1,8 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}

diff --git a/ElmSharpTest/ElmSharpTest.csproj b/ElmSharpTest/ElmSharpTest.csproj
new file mode 100644 (file)
index 0000000..981cec4
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.csproj
@@ -0,0 +1,111 @@
+<?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>{E901BB06-632D-489E-86AC-66AD2EF85BCC}</ProjectGuid>\r
+    <OutputType>Exe</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>ElmSharpTest</RootNamespace>\r
+    <AssemblyName>ElmSharpTest</AssemblyName>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>\r
+    <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>\r
+    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</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
+  <ItemGroup>\r
+    <Compile Include="Properties\AssemblyInfo.cs" />\r
+    <Compile Include="TC\BackgroundTest1.cs" />\r
+    <Compile Include="TC\BackgroundTest2.cs" />\r
+    <Compile Include="TC\BackgroundTest3.cs" />\r
+    <Compile Include="TC\BoxTest1.cs" />\r
+    <Compile Include="TC\ButtonTest1.cs" />\r
+    <Compile Include="TC\CalendarTest1.cs" />\r
+    <Compile Include="TC\CheckTest1.cs" />\r
+    <Compile Include="TC\ColorSelectorTest1.cs" />\r
+    <Compile Include="TC\ContextPopupTest1.cs" />\r
+    <Compile Include="TC\DateTimeSelectorTest1.cs" />\r
+    <Compile Include="TC\EntryTest1.cs" />\r
+    <Compile Include="TC\GenGridTest1.cs" />\r
+    <Compile Include="TC\GenGridTest2.cs" />\r
+    <Compile Include="TC\GenListTest1.cs" />\r
+    <Compile Include="TC\GenListTest2.cs" />\r
+    <Compile Include="TC\GenListTest3.cs" />\r
+    <Compile Include="TC\GenListTest4.cs" />\r
+    <Compile Include="TC\GenListTest5.cs" />\r
+    <Compile Include="TC\IconTest1.cs" />\r
+    <Compile Include="TC\IndexTest1.cs" />\r
+    <Compile Include="TC\IndexTest2.cs" />\r
+    <Compile Include="TC\LabelTest1.cs" />\r
+    <Compile Include="TC\ListTest1.cs" />\r
+    <Compile Include="TC\NaviframeTest1.cs" />\r
+    <Compile Include="TC\PanelTest1.cs" />\r
+    <Compile Include="TC\PanelTest2.cs" />\r
+    <Compile Include="TC\PanesTest1.cs" />\r
+    <Compile Include="TC\PopupTest1.cs" />\r
+    <Compile Include="TC\ProgressBarTest1.cs" />\r
+    <Compile Include="TC\RadioTest1.cs" />\r
+    <Compile Include="TC\RectangleTest1.cs" />\r
+    <Compile Include="TC\ScrollerTest1.cs" />\r
+    <Compile Include="TC\ScrollerTest2.cs" />\r
+    <Compile Include="TC\SliderTest1.cs" />\r
+    <Compile Include="TC\SpinnerTest1.cs" />\r
+    <Compile Include="TC\ToolbarTest1.cs" />\r
+    <Compile Include="TestCaseBase.cs" />\r
+    <Compile Include="TestRunner.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="ElmSharpTest.project.json" />\r
+    <None Include="test.sh" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\ElmSharp\ElmSharp.csproj">\r
+      <Project>{7b15af72-70cc-11e6-ae37-eb727f0bd84e}</Project>\r
+      <Name>ElmSharp</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\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/ElmSharpTest/ElmSharpTest.project.json b/ElmSharpTest/ElmSharpTest.project.json
new file mode 100644 (file)
index 0000000..f9a9620
--- /dev/null
+++ b/ElmSharpTest/ElmSharpTest.project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.App": "1.0.0"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}

diff --git a/ElmSharpTest/ElmSharpTest.xproj b/ElmSharpTest/ElmSharpTest.xproj
deleted file mode 100644 (file)
index 608c2fb..0000000
--- a/ElmSharpTest/ElmSharpTest.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>ce20dbb2-ef5f-4563-9005-ffbec044aa20</ProjectGuid>\r
-    <RootNamespace>ElmSharpTest</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/ElmSharpTest/ElmSharpTest.xproj.user b/ElmSharpTest/ElmSharpTest.xproj.user
deleted file mode 100644 (file)
index ce9011d..0000000
--- a/ElmSharpTest/ElmSharpTest.xproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
deleted file mode 100644 (file)
index 6262aea..0000000
--- a/ElmSharpTest/project.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-  "dependencies": {
-    "ElmSharp": "1.0.0-*"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50",
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0"
-        }
-      }
-    },
-    "net45": {}
-  }
-}

diff --git a/src/ElmSharp/ElmSharp.Net45.csproj b/src/ElmSharp/ElmSharp.Net45.csproj
index a1d64ec..e9df237 100644 (file)
--- a/src/ElmSharp/ElmSharp.Net45.csproj
+++ b/src/ElmSharp/ElmSharp.Net45.csproj
@@ -144,8 +144,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <None Include="ElmSharp.Net45.project.json" />\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

diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json
index 04ccf35..872bd5c 100644 (file)
--- a/src/ElmSharp/ElmSharp.project.json
+++ b/src/ElmSharp/ElmSharp.project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "NETStandard.Library": "1.6.0",
+    "NETStandard.Library": "1.6.0"
   },
   "frameworks": {
     "netstandard1.6": {}

diff --git a/src/ElmSharp/Interop/Interop.Elementary.cs b/src/ElmSharp/Interop/Interop.Elementary.cs
index 6821173..fdd7e6d 100644 (file)
--- a/src/ElmSharp/Interop/Interop.Elementary.cs
+++ b/src/ElmSharp/Interop/Interop.Elementary.cs
@@ -235,13 +235,5 @@ internal static partial class Interop
         {
             elm_object_part_text_set(obj, IntPtr.Zero, text);
         }
-
-        internal static IntPtr GetPtrToObject(object data)
-        {
-            IntPtr dataPtr = IntPtr.Zero;
-            if (data != null)
-                Marshal.StructureToPtr(data, dataPtr, true);
-            return dataPtr;
-        }
     }
 }