From dac02675922fd93397319f3d95d4c934e939a224 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 19 Aug 2020 15:43:55 -0700 Subject: [PATCH 1/2] Suppress UTF-7 warnings --- .../namespaces/FileSystemProvider.cs | 2 ++ src/System.Management.Automation/utils/EncodingUtils.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs index eab04cb6e40..2c259a0748a 100644 --- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs +++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs @@ -7617,7 +7617,9 @@ public Encoding Encoding set { +#pragma warning disable 618 if (value == System.Text.Encoding.UTF7) +#pragma warning restore 618 { _provider.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete); } diff --git a/src/System.Management.Automation/utils/EncodingUtils.cs b/src/System.Management.Automation/utils/EncodingUtils.cs index 6825a259dae..d506dc4c740 100644 --- a/src/System.Management.Automation/utils/EncodingUtils.cs +++ b/src/System.Management.Automation/utils/EncodingUtils.cs @@ -95,7 +95,9 @@ internal static Encoding Convert(Cmdlet cmdlet, string encoding) /// The encoding to check for obsolescence. internal static void WarnIfObsolete(Cmdlet cmdlet, Encoding encoding) { +#pragma warning disable 618 if (encoding == System.Text.Encoding.UTF7) +#pragma warning restore 618 { cmdlet.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete); } From 33a1886121349c06efdced73f6f2994e94957a3a Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 19 Aug 2020 15:55:25 -0700 Subject: [PATCH 2/2] Add 612 to suppressions --- .../namespaces/FileSystemProvider.cs | 4 ++-- src/System.Management.Automation/utils/EncodingUtils.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs index 2c259a0748a..c1a539fb3ac 100644 --- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs +++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs @@ -7617,9 +7617,9 @@ public Encoding Encoding set { -#pragma warning disable 618 +#pragma warning disable 612, 618 if (value == System.Text.Encoding.UTF7) -#pragma warning restore 618 +#pragma warning restore 612, 618 { _provider.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete); } diff --git a/src/System.Management.Automation/utils/EncodingUtils.cs b/src/System.Management.Automation/utils/EncodingUtils.cs index d506dc4c740..abbe4a569f6 100644 --- a/src/System.Management.Automation/utils/EncodingUtils.cs +++ b/src/System.Management.Automation/utils/EncodingUtils.cs @@ -95,9 +95,9 @@ internal static Encoding Convert(Cmdlet cmdlet, string encoding) /// The encoding to check for obsolescence. internal static void WarnIfObsolete(Cmdlet cmdlet, Encoding encoding) { -#pragma warning disable 618 +#pragma warning disable 612, 618 if (encoding == System.Text.Encoding.UTF7) -#pragma warning restore 618 +#pragma warning restore 612, 618 { cmdlet.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete); }