From: WonYoung Choi Date: Mon, 15 May 2017 13:45:13 +0000 (+0900) Subject: Apply new csproj format for VS2017 X-Git-Tag: submit/trunk/20170823.075128~110^2~93 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c64520ad488adb56c5e6fc3bccf5eb4b6fe4e80;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git 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 --- a/src/ElmSharp/ElmSharp.csproj +++ b/src/ElmSharp/ElmSharp.csproj @@ -1,199 +1,12 @@ - - - - Debug - AnyCPU - {7B15AF72-70CC-11E6-AE37-EB727F0BD84E} - Library - Properties - ElmSharp - ElmSharp - 512 - - - .NETStandard - v1.3 - .NETStandard,Version=v1.3 - false - true - $(NoWarn);1701;1702 - - - true - full - true - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - true - + + + netstandard1.6 + True + True ElmSharp.snk + true + True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) - true - - \ No newline at end of file + + diff --git a/src/ElmSharp/ElmSharp.nuspec b/src/ElmSharp/ElmSharp.nuspec index 789e195..4fe2243 100644 --- a/src/ElmSharp/ElmSharp.nuspec +++ b/src/ElmSharp/ElmSharp.nuspec @@ -11,7 +11,4 @@ © Samsung Electronics Co., Ltd All Rights Reserved 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. - - - diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json deleted file mode 100644 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 new mode 100644 index 7bc0cb8..9b27f0f --- a/src/ElmSharp/ElmSharp/Color.cs +++ b/src/ElmSharp/ElmSharp/Color.cs @@ -222,7 +222,6 @@ namespace ElmSharp /// /// Unsigned integer indicates RGBA. /// New instance of Color struct. - [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 new mode 100644 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 /// The binary data that is used as an image source /// The size of the binary data blob img /// (true = success, false = error) - [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 /// color object 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 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")] -