diff options
author | Stephen Toub <stoub@microsoft.com> | 2017-04-15 01:55:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-15 01:55:13 +0300 |
commit | 0458094e52f216072eb2745db14cd2758cbc87b1 (patch) | |
tree | 44dbbc09230fe1f6ed28d34b79db50a085ddfdf8 /src/System.Data.SqlClient | |
parent | 0f5ceb5188fc45feb1c1300b88b24cf29e468a13 (diff) | |
parent | c03251050414df4f278b7bd4e50f9f08bc7bd238 (diff) |
Merge pull request #18281 from EgorBo/system-data-sqlresource
Move SQLResource.cs to Common
Diffstat (limited to 'src/System.Data.SqlClient')
-rw-r--r-- | src/System.Data.SqlClient/src/System.Data.SqlClient.csproj | 4 | ||||
-rw-r--r-- | src/System.Data.SqlClient/src/System/Data/SqlTypes/SQLResource.cs | 77 |
2 files changed, 3 insertions, 78 deletions
diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 8c2efdcd85..9f2cbbe81d 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -122,7 +122,9 @@ <Compile Include="System\Data\SqlClient\TdsRecordBufferSetter.cs" /> <Compile Include="System\Data\SqlClient\TdsValueSetter.cs" /> <Compile Include="System\Data\SqlTypes\SqlTypeWorkarounds.cs" /> - <Compile Include="System\Data\SqlTypes\SQLResource.cs" /> + <Compile Include="$(CommonPath)\System\Data\Common\SQLResource.cs"> + <Link>System\Data\SQLTypes\SQLResource.cs</Link> + </Compile> <Compile Include="$(CommonPath)\System\NotImplemented.cs" /> <Compile Include="$(CommonPath)\System\Threading\Tasks\TaskToApm.cs"> <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link> diff --git a/src/System.Data.SqlClient/src/System/Data/SqlTypes/SQLResource.cs b/src/System.Data.SqlClient/src/System/Data/SqlTypes/SQLResource.cs deleted file mode 100644 index a8afd22efe..0000000000 --- a/src/System.Data.SqlClient/src/System/Data/SqlTypes/SQLResource.cs +++ /dev/null @@ -1,77 +0,0 @@ -// 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. - - - - -//------------------------------------------------------------------------------ - - - - -namespace System.Data.SqlTypes -{ - internal static class SQLResource - { - internal static string NullString => SR.SqlMisc_NullString; - - internal static string MessageString => SR.SqlMisc_MessageString; - - internal static string ArithOverflowMessage => SR.SqlMisc_ArithOverflowMessage; - - internal static string DivideByZeroMessage => SR.SqlMisc_DivideByZeroMessage; - - internal static string NullValueMessage => SR.SqlMisc_NullValueMessage; - - internal static string TruncationMessage => SR.SqlMisc_TruncationMessage; - - internal static string DateTimeOverflowMessage => SR.SqlMisc_DateTimeOverflowMessage; - - internal static string ConcatDiffCollationMessage => SR.SqlMisc_ConcatDiffCollationMessage; - - internal static string CompareDiffCollationMessage => SR.SqlMisc_CompareDiffCollationMessage; - - internal static string InvalidFlagMessage => SR.SqlMisc_InvalidFlagMessage; - - internal static string NumeToDecOverflowMessage => SR.SqlMisc_NumeToDecOverflowMessage; - - internal static string ConversionOverflowMessage => SR.SqlMisc_ConversionOverflowMessage; - - internal static string InvalidDateTimeMessage => SR.SqlMisc_InvalidDateTimeMessage; - - internal static string TimeZoneSpecifiedMessage => SR.SqlMisc_TimeZoneSpecifiedMessage; - - internal static string InvalidArraySizeMessage => SR.SqlMisc_InvalidArraySizeMessage; - - internal static string InvalidPrecScaleMessage => SR.SqlMisc_InvalidPrecScaleMessage; - - internal static string FormatMessage => SR.SqlMisc_FormatMessage; - - internal static string NotFilledMessage => SR.SqlMisc_NotFilledMessage; - - internal static string AlreadyFilledMessage => SR.SqlMisc_AlreadyFilledMessage; - - internal static string ClosedXmlReaderMessage => SR.SqlMisc_ClosedXmlReaderMessage; - - internal static string InvalidOpStreamClosed(string method) - { - return SR.GetString(SR.SqlMisc_InvalidOpStreamClosed, method); - } - - internal static string InvalidOpStreamNonWritable(string method) - { - return SR.GetString(SR.SqlMisc_InvalidOpStreamNonWritable, method); - } - - internal static string InvalidOpStreamNonReadable(string method) - { - return SR.GetString(SR.SqlMisc_InvalidOpStreamNonReadable, method); - } - - internal static string InvalidOpStreamNonSeekable(string method) - { - return SR.GetString(SR.SqlMisc_InvalidOpStreamNonSeekable, method); - } - } // SqlResource -} // namespace System |