projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62539d5)
[NUI] Resolve conflicts types between friends assemblies (#1906)
authorWonYoung Choi <wy80.choi@samsung.com>
Mon, 10 Aug 2020 06:27:56 +0000 (15:27 +0900)
committerGitHub <noreply@github.com>
Mon, 10 Aug 2020 06:27:56 +0000 (15:27 +0900)
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelClient.cs patch | blob | history
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelService.cs patch | blob | history
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyClient.cs patch | blob | history
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyService.cs patch | blob | history
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenRegion.cs patch | blob | history
src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenShell.cs patch | blob | history
src/Tizen.NUI/src/internal/FriendAssembly.cs patch | blob | history

diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelClient.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelClient.cs
index b8536c7..0c54150 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelClient.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelClient.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelService.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelService.cs
index 5e67c48..a0297f5 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelService.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.QuickPanelService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyClient.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyClient.cs
index 52c5409..13e8e10 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyClient.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyClient.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyService.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyService.cs
index a4f4cee..f70ba6f 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyService.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.SoftkeyService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenRegion.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenRegion.cs
index c42297a..e4cffc5 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenRegion.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenRegion.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenShell.cs b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenShell.cs
index 4e1cb18..af1c91a 100644 (file)
--- a/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenShell.cs
+++ b/src/Tizen.NUI.WindowSystem/src/internal/Interop/Interop.TizenShell.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Tizen.NUI
+namespace Tizen.NUI.WindowSystem.Shell
 {
     internal static partial class Interop
     {
diff --git a/src/Tizen.NUI/src/internal/FriendAssembly.cs b/src/Tizen.NUI/src/internal/FriendAssembly.cs
index bdf2eec..da5141f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/FriendAssembly.cs
+++ b/src/Tizen.NUI/src/internal/FriendAssembly.cs
@@ -24,37 +24,42 @@ using System.Text;
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Tizen.Multimedia, " + PublicKey.TizenFX)]
-[assembly: InternalsVisibleTo("Tizen.NUI.Wearable, " + PublicKey.TizenFX)]
-[assembly: InternalsVisibleTo("Tizen.NUI.Components, " + PublicKey.TizenFX)]
-
-[assembly: InternalsVisibleTo("Tizen.TV.NUI, " + PublicKey.TizenTV)]
-[assembly: InternalsVisibleTo("Tizen.TV.NUI.Component, " + PublicKey.TizenTV)]
-
-[assembly: InternalsVisibleTo("Tizen.TV.FLUX, " + PublicKey.TizenTV)]
-[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Component, " + PublicKey.TizenTV)]
-[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Example, " + PublicKey.TizenTV)]
-[assembly: InternalsVisibleTo("Tizen.TV.NUI.Example, " + PublicKey.TizenTV)]
-
-[assembly: InternalsVisibleTo("NuiSample, " + PublicKey.Sample)]
-internal static class PublicKey
-{
-    internal const string TizenFX =
-        "PublicKey=0024000004800000940000000602000000240000525341310004000001000100d115b100424841" +
-        "6b12d21b626cfb17149c9303fe394693fd3b32d7872e89559a4fa96c98110c2e62eea48aca693b" +
-        "ddbe17094ca8ea2e2cd79970ca590fb672b9b371b5d7002076817321f62d6483ea50c56dbd1f37" +
-        "b185a4c24c47718876e6ae6d266508c551170d4cbdda3f82edaff9405ee3d7857282d8269e8e518d2f0fb2";
-
-    internal const string TizenTV = 
-        "PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b" +
-        "99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762" + 
-        "669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff" +
-        "64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad";
-
-    internal const string Sample = 
-        "PublicKey=0024000004800000940000000602000000240000525341310004000001000100a5bcf6fb6095141f" +
-        "a8146ec74d5b0be8b09a063f8f1f32604b10df6e498788182840bd15c93ba1a5c0b9aeee8fe2be42ea9c0b5fe32" + 
-        "e1d6d5602b2a4fa813114fd58c4b2910d93e5181b90925458b4b8b003c30d97830a17ad90a92f34f60a11f67a78757" +
-        "e6b2035e799be5ab69a41ede17cad2e2b7967fbf49b685452496be0";
+[assembly: InternalsVisibleTo("Tizen.Multimedia, " + Tizen.NUI.PublicKey.TizenFX)]
+[assembly: InternalsVisibleTo("Tizen.NUI.Wearable, " + Tizen.NUI.PublicKey.TizenFX)]
+[assembly: InternalsVisibleTo("Tizen.NUI.Components, " + Tizen.NUI.PublicKey.TizenFX)]
+
+[assembly: InternalsVisibleTo("Tizen.TV.NUI, " + Tizen.NUI.PublicKey.TizenTV)]
+[assembly: InternalsVisibleTo("Tizen.TV.NUI.Component, " + Tizen.NUI.PublicKey.TizenTV)]
+
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX, " + Tizen.NUI.PublicKey.TizenTV)]
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Component, " + Tizen.NUI.PublicKey.TizenTV)]
+[assembly: InternalsVisibleTo("Tizen.TV.FLUX.Example, " + Tizen.NUI.PublicKey.TizenTV)]
+[assembly: InternalsVisibleTo("Tizen.TV.NUI.Example, " + Tizen.NUI.PublicKey.TizenTV)]
+
+[assembly: InternalsVisibleTo("NuiSample, " + Tizen.NUI.PublicKey.Sample)]
+
+namespace Tizen.NUI {
+
+    internal static class PublicKey
+    {
+        internal const string TizenFX =
+            "PublicKey=0024000004800000940000000602000000240000525341310004000001000100d115b100424841" +
+            "6b12d21b626cfb17149c9303fe394693fd3b32d7872e89559a4fa96c98110c2e62eea48aca693b" +
+            "ddbe17094ca8ea2e2cd79970ca590fb672b9b371b5d7002076817321f62d6483ea50c56dbd1f37" +
+            "b185a4c24c47718876e6ae6d266508c551170d4cbdda3f82edaff9405ee3d7857282d8269e8e518d2f0fb2";
+
+        internal const string TizenTV =
+            "PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b" +
+            "99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762" +
+            "669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff" +
+            "64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad";
+
+        internal const string Sample =
+            "PublicKey=0024000004800000940000000602000000240000525341310004000001000100a5bcf6fb6095141f" +
+            "a8146ec74d5b0be8b09a063f8f1f32604b10df6e498788182840bd15c93ba1a5c0b9aeee8fe2be42ea9c0b5fe32" +
+            "e1d6d5602b2a4fa813114fd58c4b2910d93e5181b90925458b4b8b003c30d97830a17ad90a92f34f60a11f67a78757" +
+            "e6b2035e799be5ab69a41ede17cad2e2b7967fbf49b685452496be0";
+
+    }
 
 }
Domain: Dotnet / Frameworks;