From: WonYoung Choi Date: Fri, 2 Sep 2016 09:35:40 +0000 (+0900) Subject: Fix project files of ElmSharpTest X-Git-Tag: submit/trunk/20170823.075128~110^2~296 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da0e7e2762f29d902301e987de8a4c22f455b49d;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Fix project files of ElmSharpTest Change-Id: Ib99724f4570cf7a5d3c1193805300abece2e2ec4 --- diff --git a/ElmSharpTest/ElmSharpTest.Net45.csproj b/ElmSharpTest/ElmSharpTest.Net45.csproj new file mode 100644 index 0000000..f30834a --- /dev/null +++ b/ElmSharpTest/ElmSharpTest.Net45.csproj @@ -0,0 +1,102 @@ + + + + Debug + AnyCPU + {0D01D989-E4C1-400C-BF05-8FD79EF828A8} + Exe + Properties + ElmSharpTest + ElmSharpTest + 512 + v4.5 + + + true + full + true + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {657e0754-faf0-42b9-b9f5-45868826758e} + ElmSharp.Net45 + + + + + \ No newline at end of file diff --git a/ElmSharpTest/ElmSharpTest.Net45.project.json b/ElmSharpTest/ElmSharpTest.Net45.project.json new file mode 100644 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 index 0000000..981cec4 --- /dev/null +++ b/ElmSharpTest/ElmSharpTest.csproj @@ -0,0 +1,111 @@ + + + + Debug + AnyCPU + {E901BB06-632D-489E-86AC-66AD2EF85BCC} + Exe + Properties + ElmSharpTest + ElmSharpTest + 512 + + + .NETCoreApp + v1.0 + .NETCoreApp,Version=v1.0 + false + true + $(NoWarn);1701;1702 + + + true + full + true + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {7b15af72-70cc-11e6-ae37-eb727f0bd84e} + ElmSharp + + + + + + + + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) + <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) + true + + \ No newline at end of file diff --git a/ElmSharpTest/ElmSharpTest.project.json b/ElmSharpTest/ElmSharpTest.project.json new file mode 100644 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 index 608c2fb..0000000 --- a/ElmSharpTest/ElmSharpTest.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ce20dbb2-ef5f-4563-9005-ffbec044aa20 - ElmSharpTest - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/ElmSharpTest/ElmSharpTest.xproj.user b/ElmSharpTest/ElmSharpTest.xproj.user deleted file mode 100644 index ce9011d..0000000 --- a/ElmSharpTest/ElmSharpTest.xproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - ElmSharpTest - - \ No newline at end of file diff --git a/ElmSharpTest/project.json b/ElmSharpTest/project.json deleted file mode 100644 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 --- a/src/ElmSharp/ElmSharp.Net45.csproj +++ b/src/ElmSharp/ElmSharp.Net45.csproj @@ -144,8 +144,8 @@ + - diff --git a/src/ElmSharp/ElmSharp.project.json b/src/ElmSharp/ElmSharp.project.json index 04ccf35..872bd5c 100644 --- 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 --- 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; - } } }