Apply new csproj format for VS2017

Change-Id: I14f2bcfb1b8e5eed60671343b0360ab1abbf6322

diff --git a/src/ElmSharp/ElmSharp.csproj b/src/ElmSharp/ElmSharp.csproj
index 1379553..a662a59 100644 (file)
--- a/src/ElmSharp/ElmSharp.csproj
+++ b/src/ElmSharp/ElmSharp.csproj
@@ -1,199 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-    <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.3</TargetFrameworkVersion>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</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>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>ElmSharp.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <GenerateReferenceAssembly>True</GenerateReferenceAssembly>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="ElmSharp\AccessRole.cs" />
-    <Compile Include="ElmSharp\AccessibleObject.cs" />
-    <Compile Include="ElmSharp\AccessibleRelation.cs" />
-    <Compile Include="ElmSharp\AccessibleUtil.cs" />
-    <Compile Include="ElmSharp\IAccessibleObject.cs" />
-    <Compile Include="ElmSharp\ItemObjectExtension.cs" />
-    <Compile Include="ElmSharp\ReadingInfoType.cs" />
-    <Compile Include="Interop\Interop.Eext.Event.cs" />
-    <Compile Include="Interop\Interop.Elementary.Accessibility.cs" />
-    <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\EcoreEvent.cs" />
-    <Compile Include="ElmSharp\EcoreKeyEventArgs.cs" />
-    <Compile Include="ElmSharp\HoverselItem.cs" />
-    <Compile Include="ElmSharp\Conformant.cs" />
-    <Compile Include="ElmSharp\Container.cs" />
-    <Compile Include="ElmSharp\MultiButtonEntryItem.cs" />
-    <Compile Include="ElmSharp\MultiButtonEntry.cs" />
-    <Compile Include="ElmSharp\ContextPopup.cs" />
-    <Compile Include="ElmSharp\ColorSelectorItem.cs" />
-    <Compile Include="ElmSharp\ContextPopupItem.cs" />
-    <Compile Include="ElmSharp\DateChangedEventArgs.cs" />
-    <Compile Include="ElmSharp\DateTimeSelector.cs" />
-    <Compile Include="ElmSharp\DisplayedMonthChangedEventArgs.cs" />
-    <Compile Include="ElmSharp\EcoreAnimator.cs" />
-    <Compile Include="ElmSharp\EcoreMainloop.cs" />
-    <Compile Include="ElmSharp\EcoreSynchronizationContext.cs" />
-    <Compile Include="ElmSharp\EdjeObject.cs" />
-    <Compile Include="ElmSharp\ElmScrollConfig.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\EvasObjectEvent.cs" />
-    <Compile Include="ElmSharp\FlipSelector.cs" />
-    <Compile Include="ElmSharp\FlipSelectorItem.cs" />
-    <Compile Include="ElmSharp\FloatingButton.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\GestureLayer.cs" />
-    <Compile Include="ElmSharp\Hoversel.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\Polygon.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\SmartEvent.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.Eext.FloatingButton.cs" />
-    <Compile Include="Interop\Interop.Eina.cs" />
-    <Compile Include="Interop\Interop.Elementary.Hoversel.cs" />
-    <Compile Include="Interop\Interop.Elementary.FlipSelector.cs" />
-    <Compile Include="Interop\Interop.Elementary.MultiButtonEntry.cs" />
-    <Compile Include="Interop\Interop.Eo.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.GestureLayer.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.Libc.cs" />
-    <Compile Include="Interop\Interop.Libdl.cs" />
-    <Compile Include="Interop\Interop.Libraries.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ElmSharp.nuspec" />
-    <None Include="ElmSharp.project.json" />
-    <None Include="ElmSharp.snk" />
-  </ItemGroup>
-  <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
+
+</Project>

diff --git a/src/ElmSharp/ElmSharp.nuspec b/src/ElmSharp/ElmSharp.nuspec
index 789e195..4fe2243 100644 (file)
--- a/src/ElmSharp/ElmSharp.nuspec
+++ b/src/ElmSharp/ElmSharp.nuspec
@@ -11,7 +11,4 @@
                <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
                <description>ElmSharp is the top-most library based on Tizen Native UI Framwork (EFL). It provides a variety of pre-built UI components, such as layout objects and widgets, that allow you to build rich graphical user interfaces.</description>
        </metadata>
-       <files>
-               <file src="bin/$Configuration$/ElmSharp.dll" target="lib/netstandard1.3" />
-       </files>
 </package>

diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json
deleted file mode 100644 (file)
index e8c7d8f..0000000
--- a/src/ElmSharp/ElmSharp.project.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "dependencies": {
-    "NETStandard.Library": "1.6.0"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  }
-}

diff --git a/src/ElmSharp/ElmSharp/Color.cs b/src/ElmSharp/ElmSharp/Color.cs
old mode 100755 (executable)
new mode 100644 (file)
index 7bc0cb8..9b27f0f
--- a/src/ElmSharp/ElmSharp/Color.cs
+++ b/src/ElmSharp/ElmSharp/Color.cs
@@ -222,7 +222,6 @@ namespace ElmSharp
         /// </summary>
         /// <param name="argb">Unsigned integer indicates RGBA.</param>
         /// <returns>New instance of Color struct.</returns>
-        [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
old mode 100755 (executable)
new mode 100644 (file)
index da24713..7b5ce28
--- a/src/ElmSharp/ElmSharp/Image.cs
+++ b/src/ElmSharp/ElmSharp/Image.cs
@@ -239,8 +239,7 @@ namespace ElmSharp
         {
             get
             {
-                int w, h;
-                Interop.Elementary.elm_image_object_size_get(RealHandle, out w, out h);
+                Interop.Elementary.elm_image_object_size_get(RealHandle, out int w, out int h);
                 return new Size(w, h);
             }
         }
@@ -384,7 +383,6 @@ namespace ElmSharp
         /// <param name="img">The binary data that is used as an image source</param>
         /// <param name="size">The size of the binary data blob img</param>
         /// <returns>(true = success, false = error)</returns>
-        [CLSCompliant(false)]
         [Obsolete("This method will be removed. Use Load(Stream stream) instead.")]
         public unsafe bool Load(byte* img, long size)
         {
@@ -574,8 +572,7 @@ namespace ElmSharp
         /// <returns>color object</returns>
         public override Color GetPartColor(string part)
         {
-            int r, g, b, a;
-            Interop.Elementary.elm_object_color_class_color_get(Handle, part, out r, out g, out b, out a);
+            Interop.Elementary.elm_object_color_class_color_get(Handle, part, out int r, out int g, out int b, out int a);
             return new Color((int)(r / (a / 255.0)), (int)(g / (a / 255.0)), (int)(b / (a / 255.0)), a);
         }
 

diff --git a/src/ElmSharp/Properties/AssemblyInfo.cs b/src/ElmSharp/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index e1f34b3..0000000
--- a/src/ElmSharp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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("ElmSharp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Samsung Electronics")]
-[assembly: AssemblyProduct("ElmSharp")]
-[assembly: AssemblyCopyright("Copyright (c) 2015 Samsung Electronics Co., Ltd")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bfb6195c-3271-45e8-96fa-5872fa23c920")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-