Fix namespaces and ThrowHelper

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>

diff --git a/src/mscorlib/shared/System/Globalization/Normalization.Unix.cs b/src/mscorlib/shared/System/Globalization/Normalization.Unix.cs
index 6616c6efa471dec1b7663e47560f81ac68af9ff4..a25c1b9380b8a5e16b6196fbe0a658e51ca26b4b 100644 (file)
--- a/src/mscorlib/shared/System/Globalization/Normalization.Unix.cs
+++ b/src/mscorlib/shared/System/Globalization/Normalization.Unix.cs
@@ -3,11 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Security;
 using System.Text;
-using System.Globalization;
 
-namespace System.Text
+namespace System.Globalization
 {
     internal static partial class Normalization
     {

diff --git a/src/mscorlib/shared/System/Globalization/Normalization.Windows.cs b/src/mscorlib/shared/System/Globalization/Normalization.Windows.cs
index 56217a5beb4cc0138452d94903dfa971cd8e42e2..8418c53b6ca8ece315d046a77153ab236e8706fb 100644 (file)
--- a/src/mscorlib/shared/System/Globalization/Normalization.Windows.cs
+++ b/src/mscorlib/shared/System/Globalization/Normalization.Windows.cs
@@ -3,11 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics;
-using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace System.Text
+namespace System.Globalization
 {
     internal static partial class Normalization
     {

diff --git a/src/mscorlib/shared/System/Nullable.cs b/src/mscorlib/shared/System/Nullable.cs
index 5ee55e70379994f77ad38c826ab2aef9f9328fb7..cb748a6df06a64c2c3fe7ea91ed53517b4bda710 100644 (file)
--- a/src/mscorlib/shared/System/Nullable.cs
+++ b/src/mscorlib/shared/System/Nullable.cs
@@ -2,20 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Globalization;
-using System.Reflection;
 using System.Collections.Generic;
-using System.Runtime;
 using System.Runtime.Versioning;
-using System.Runtime.CompilerServices;
 
 namespace System
 {
-    // Also, because we have special type system support that says a a boxed Nullable<T>
+    // Because we have special type system support that says a a boxed Nullable<T>
     // can be used where a boxed<T> is use, Nullable<T> can not implement any intefaces
     // at all (since T may not).   Do NOT add any interfaces to Nullable!
-    // 
+    //
     [Serializable]
     [NonVersionable] // This only applies to field layout
     [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
@@ -46,7 +41,7 @@ namespace System
             {
                 if (!hasValue)
                 {
-                    ThrowHelper.ThrowInvalidOperationException(ExceptionResource.InvalidOperation_NoValue);
+                    ThrowHelper.ThrowInvalidOperationException_InvalidOperation_NoValue();
                 }
                 return value;
             }

diff --git a/src/mscorlib/src/System/ThrowHelper.cs b/src/mscorlib/src/System/ThrowHelper.cs
index 782c30a397c32eedde7d5ad876d69fe86b5eda57..c3dc2c42fe1e4a0e73c6d0efdfebd649121aad1d 100644 (file)
--- a/src/mscorlib/src/System/ThrowHelper.cs
+++ b/src/mscorlib/src/System/ThrowHelper.cs
@@ -260,6 +260,11 @@ namespace System
             throw GetInvalidOperationException(ExceptionResource.InvalidOperation_EnumOpCantHappen);
         }
 
+        internal static void ThrowInvalidOperationException_InvalidOperation_NoValue()
+        {
+            throw GetInvalidOperationException(ExceptionResource.InvalidOperation_NoValue);
+        }
+
         internal static void ThrowArraySegmentCtorValidationFailedExceptions(Array array, int offset, int count)
         {
             throw GetArraySegmentCtorValidationFailedException(array, offset, count);