From 993cfd5775b0ff3dd3790d830127bb4bc3b19fb0 Mon Sep 17 00:00:00 2001 From: Maxim Lipnin Date: Wed, 19 Feb 2020 13:53:43 +0300 Subject: [PATCH] [mono] Fix several nits (#32529) * Remove the commented code * Remove unused nint/nuint aliases from PNSE version of Utf8String --- .../AttributedModel/AllowNonPublicCompositionTests.cs | 1 - src/mono/netcore/System.Private.CoreLib/src/System/Utf8String.cs | 9 --------- 2 files changed, 10 deletions(-) diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs index 7eb4615..f0d3462 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/AllowNonPublicCompositionTests.cs @@ -8,7 +8,6 @@ using Xunit; namespace System.ComponentModel.Composition { - // [ActiveIssue("https://github.com/mono/mono/issues/16417", TestRuntimes.Mono)] public class AllowNonPublicCompositionTests { [Fact] diff --git a/src/mono/netcore/System.Private.CoreLib/src/System/Utf8String.cs b/src/mono/netcore/System.Private.CoreLib/src/System/Utf8String.cs index ebb787a..48a7cae 100644 --- a/src/mono/netcore/System.Private.CoreLib/src/System/Utf8String.cs +++ b/src/mono/netcore/System.Private.CoreLib/src/System/Utf8String.cs @@ -11,15 +11,6 @@ using System.Text; using System.Text.Unicode; using Internal.Runtime.CompilerServices; -#pragma warning disable SA1121 // explicitly using type aliases instead of built-in types -#if TARGET_64BIT -using nint = System.Int64; -using nuint = System.UInt64; -#else -using nint = System.Int32; -using nuint = System.UInt32; -#endif - namespace System { /// -- 2.7.4