From: Dongsug Song Date: Fri, 11 Dec 2020 01:17:08 +0000 (+0900) Subject: [NUI] Suppress CA1716, CA1052, CA1034 for deprecated APIs X-Git-Tag: accepted/tizen/unified/20210219.040944~191 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9dcb34283d2cd7c7d362e99aa7b386e2c014a18;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Suppress CA1716, CA1052, CA1034 for deprecated APIs - Since the detected classes will be deprecated, CA1716 warning message is suppressed. https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1716 - This is conflict resolving patch for https://github.com/Samsung/TizenFX/pull/2374 --- diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 060b821..aa37389 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -63,11 +63,11 @@ namespace Tizen.NUI /// /// Property for ItemView. This is internal use only, so not recommended to use. Need to use ItemView's properties. /// - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")] +#pragma warning disable CA1034, CA1052, CA1716 // Identifiers should not match keywords public new class Property +#pragma warning restore CA1034, CA1052, CA1716 // Identifiers should not match keywords { /// /// LAYOUT. This is internal use only, so not recommended to use. Need to use ItemView's properties. diff --git a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs index 254e148..40bd2f7 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs @@ -747,10 +747,11 @@ namespace Tizen.NUI.BaseComponents /// Enumeration for the instance of properties belonging to the Scrollable class. /// /// 3 - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [EditorBrowsable(EditorBrowsableState.Never)] [Obsolete("Deprecated in API6; Will be removed in API9.")] +#pragma warning disable CA1716, CA1052, CA1034 // Identifiers should not match keywords public new class Property +#pragma warning restore CA1716, CA1052, CA1034 // Identifiers should not match keywords { /// /// The color of the overshoot effect. diff --git a/src/Tizen.NUI/src/public/Renderer.cs b/src/Tizen.NUI/src/public/Renderer.cs index e714b29..a3da998 100755 --- a/src/Tizen.NUI/src/public/Renderer.cs +++ b/src/Tizen.NUI/src/public/Renderer.cs @@ -618,11 +618,11 @@ namespace Tizen.NUI /// Enumeration for instances of properties belonging to the Renderer class. /// /// 3 - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [EditorBrowsable(EditorBrowsableState.Never)] [Obsolete("Deprecated in API6; Will be removed in API9.")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")] +#pragma warning disable CA1716, CA1052, CA1034 // Identifiers should not match keywords public class Property +#pragma warning restore CA1716, CA1052, CA1034 // Identifiers should not match keywords { /// /// This should be internal, please do not use. diff --git a/src/Tizen.NUI/src/public/Shader.cs b/src/Tizen.NUI/src/public/Shader.cs index 84ad8c7..64f7653 100755 --- a/src/Tizen.NUI/src/public/Shader.cs +++ b/src/Tizen.NUI/src/public/Shader.cs @@ -120,11 +120,11 @@ namespace Tizen.NUI /// Enumeration for instances of properties belonging to the Shader class. /// /// 3 - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [EditorBrowsable(EditorBrowsableState.Never)] [Obsolete("Deprecated in API6; Will be removed in API9.")] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")] +#pragma warning disable CA1716, CA1052, CA1034 // Identifiers should not match keywords public class Property +#pragma warning restore CA1716, CA1052, CA1034 // Identifiers should not match keywords { /// /// The default value is empty. diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs index 10a1bc3..52764fe 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs @@ -1247,11 +1247,11 @@ namespace Tizen.NUI /// /// 3 /// This will be deprecated - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [Obsolete("Deprecated in API6; Will be removed in API9. Please use Tizen.NUI.Components")] [EditorBrowsable(EditorBrowsableState.Never)] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")] +#pragma warning disable CA1716, CA1052, CA1034 // Identifiers should not match keywords public new class Property +#pragma warning restore CA1716, CA1052, CA1034 // Identifiers should not match keywords { /// /// This should be internal, please do not use. diff --git a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs index 0ecd6e7..d7b9356 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs @@ -175,11 +175,11 @@ namespace Tizen.NUI /// /// 3 /// This will be deprecated - [SuppressMessage("Microsoft.Design", "CA1052:StaticHolderTypesShouldBeStaticOrNotInheritable")] [Obsolete("Deprecated in API6; Will be removed in API9. Please use Tizen.NUI.Components")] [EditorBrowsable(EditorBrowsableState.Never)] - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")] +#pragma warning disable CA1716, CA1052, CA1034 // Identifiers should not match keywords public new class Property +#pragma warning restore CA1716, CA1052, CA1034 // Identifiers should not match keywords { /// /// This should be internal, please do not use.