diff options
| author | Alex Perovich <alperovi@microsoft.com> | 2017-03-22 08:02:47 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2017-03-22 08:04:26 +0300 |
| commit | 700287e3c75ffdca581d9ab6bc352415a58a88c4 (patch) | |
| tree | 7cad4a0eab872049643fde8deae0e0d5d62ea8ae /src/System.Private.CoreLib/shared | |
| parent | c4a366e6bab030573fc6b006927b0f0f5b9b92f0 (diff) | |
Switch coreclr corelib to use resx (#10372)
* Revert "Revert "Switch coreclr corelib to use resx (#10268)""
* Add resources.target override
This fixes the GenerateResource task running on the arm emulator runs.
* Fix run.sh to have a working Tools-Override
Diffstat (limited to 'src/System.Private.CoreLib/shared')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/System.Private.CoreLib/shared/System/IO/Error.cs b/src/System.Private.CoreLib/shared/System/IO/Error.cs index acf5b35cd..2aef89518 100644 --- a/src/System.Private.CoreLib/shared/System/IO/Error.cs +++ b/src/System.Private.CoreLib/shared/System/IO/Error.cs @@ -18,7 +18,7 @@ namespace System.IO { internal static Exception GetStreamIsClosed() { - return new ObjectDisposedException(null, SR.ObjectDisposed_StreamIsClosed); + return new ObjectDisposedException(null, SR.ObjectDisposed_StreamClosed); } internal static Exception GetEndOfFile() diff --git a/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs b/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs index 65b120e6b..ad923dfae 100644 --- a/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs +++ b/src/System.Private.CoreLib/shared/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs @@ -54,4 +54,4 @@ namespace System.Runtime.CompilerServices /// </summary> public IList<string> TransformNames => _transformNames; } -}
\ No newline at end of file +} diff --git a/src/System.Private.CoreLib/shared/System/StringSplitOptions.cs b/src/System.Private.CoreLib/shared/System/StringSplitOptions.cs index 43b626a01..d7020559a 100644 --- a/src/System.Private.CoreLib/shared/System/StringSplitOptions.cs +++ b/src/System.Private.CoreLib/shared/System/StringSplitOptions.cs @@ -10,4 +10,4 @@ namespace System None = 0, RemoveEmptyEntries = 1 } -}
\ No newline at end of file +} diff --git a/src/System.Private.CoreLib/shared/System/TupleExtensions.cs b/src/System.Private.CoreLib/shared/System/TupleExtensions.cs index b63cb4121..106a88a08 100644 --- a/src/System.Private.CoreLib/shared/System/TupleExtensions.cs +++ b/src/System.Private.CoreLib/shared/System/TupleExtensions.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -927,4 +927,4 @@ namespace System private static Tuple<T1, T2, T3, T4, T5, T6, T7, TRest> CreateLongRef<T1, T2, T3, T4, T5, T6, T7, TRest>(T1 item1, T2 item2, T3 item3, T4 item4, T5 item5, T6 item6, T7 item7, TRest rest) where TRest : ITuple => new Tuple<T1, T2, T3, T4, T5, T6, T7, TRest>(item1, item2, item3, item4, item5, item6, item7, rest); } -}
\ No newline at end of file +} |