From df4dff4af3034b653a67b5f218b2f5fe12bca328 Mon Sep 17 00:00:00 2001 From: Sidharth Gupta Date: Tue, 22 Mar 2016 20:11:17 +0900 Subject: [PATCH] [Errors] Make internal and add friend assembles - Added Tizen.Applications and Tizen.Network as friend assemblies. - Visual studio will now give warnings such as: warning CS0436: The type 'Interop' in 'Z:\work\csapi\application \Tizen.Applications\Interop\Interop.AppControl.cs' conflicts with the imported type 'Interop' in 'Tizen.Internals, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6bd6425c835e8fd7'. Using the type defined in 'Z:\work\csapi\application \Tizen.Applications\Interop\Interop.AppControl.cs'. Signed-off-by: Sidharth Gupta Change-Id: Ie8c141733048b1079be089933e6c4c32546209c4 --- Tizen.Internals/Interop/Interop.CommonError.cs | 0 Tizen.Internals/Properties/AssemblyInfo.cs | 17 +++++++++++++++++ Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs | 2 +- Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs | 6 +++--- 4 files changed, 21 insertions(+), 4 deletions(-) mode change 100755 => 100644 Tizen.Internals/Interop/Interop.CommonError.cs mode change 100755 => 100644 Tizen.Internals/Properties/AssemblyInfo.cs mode change 100755 => 100644 Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs mode change 100755 => 100644 Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs diff --git a/Tizen.Internals/Interop/Interop.CommonError.cs b/Tizen.Internals/Interop/Interop.CommonError.cs old mode 100755 new mode 100644 diff --git a/Tizen.Internals/Properties/AssemblyInfo.cs b/Tizen.Internals/Properties/AssemblyInfo.cs old mode 100755 new mode 100644 index 0fa808a..438bd79 --- a/Tizen.Internals/Properties/AssemblyInfo.cs +++ b/Tizen.Internals/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Tizen.Internals")] @@ -14,5 +15,21 @@ using System.Runtime.InteropServices; [assembly: Guid("b9aa1cb2-f72d-4a30-a33b-a20c850a38a0")] +[assembly: + InternalsVisibleTo("Tizen.Applications, PublicKey=" + + "00240000048000009400000006020000002400005253413100040000010001001b03324ad629ad" + + "45d9a2cad9b530a5cdb5c9ac4392b427c8fb2dc3a5d389f031956c1a8f506c9db2acfc6197afe3" + + "978205eaccd7bb9630f40c445bb459b6363d4478a21c529b9889b767523ebbbf2f6c620e0c4f19" + + "1417fa94c132fcb889263ce072580a6681c6bcedc285b369f41a69d66e266a9526779dee1cbcb8" + + "f0b790bd"), + + InternalsVisibleTo("Tizen.Network, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010031252807b5ef81" + + "fea7d37b8b8a345df35db5c6820577b598057738cdeee8eafa2efd5dbd8393215d61090091e05e" + + "8475cbc2d9b7bdb7442cff8079942de9c2dbc5e621ce54b63a2a11d9a4ae961117b0a1ac55cf10" + + "4e66c3f64edc2aed09eae9af46e70803f1cafbb3f132ea39b0f97e8679374b54d5a7529797e48a" + + "093e54ae") +] + [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs b/Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs old mode 100755 new mode 100644 index 331f7e2..3f6ef90 --- a/Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs +++ b/Tizen.Internals/Tizen.Internals.Errors/ErrorCode.cs @@ -9,7 +9,7 @@ namespace Tizen.Internals.Errors { - public enum ErrorCode : int + internal enum ErrorCode : int { None = 0, // 0, /**< Successful */ NotPermitted = -1, // -EPERM, /**< Operation not permitted */ diff --git a/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs b/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs old mode 100755 new mode 100644 index 4a09063..3c9cf5a --- a/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs +++ b/Tizen.Internals/Tizen.Internals.Errors/ErrorFacts.cs @@ -15,13 +15,13 @@ namespace Tizen.Internals.Errors /// /// /// - public static class ErrorFacts + internal static class ErrorFacts { /// /// /// /// - public static int GetLastResult() + internal static int GetLastResult() { return Interop.CommonError.GetLastResult(); } @@ -31,7 +31,7 @@ namespace Tizen.Internals.Errors /// /// /// - public static string GetErrorMessage(int errorCode) + internal static string GetErrorMessage(int errorCode) { IntPtr errorPtr = Interop.CommonError.GetErrorMessage(errorCode); return Marshal.PtrToStringAuto(errorPtr); -- 2.7.4