diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs deleted file mode 100644 index acdc36caeb..0000000000 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/SQLResource.cs +++ /dev/null @@ -1,71 +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. - -using System; - -namespace Microsoft.Data.SqlTypes -{ - internal static class SQLResource - { - internal static string NullString => Strings.SqlMisc_NullString; - - internal static string MessageString => Strings.SqlMisc_MessageString; - - internal static string ArithOverflowMessage => Strings.SqlMisc_ArithOverflowMessage; - - internal static string DivideByZeroMessage => Strings.SqlMisc_DivideByZeroMessage; - - internal static string NullValueMessage => Strings.SqlMisc_NullValueMessage; - - internal static string TruncationMessage => Strings.SqlMisc_TruncationMessage; - - internal static string DateTimeOverflowMessage => Strings.SqlMisc_DateTimeOverflowMessage; - - internal static string ConcatDiffCollationMessage => Strings.SqlMisc_ConcatDiffCollationMessage; - - internal static string CompareDiffCollationMessage => Strings.SqlMisc_CompareDiffCollationMessage; - - internal static string InvalidFlagMessage => Strings.SqlMisc_InvalidFlagMessage; - - internal static string NumeToDecOverflowMessage => Strings.SqlMisc_NumeToDecOverflowMessage; - - internal static string ConversionOverflowMessage => Strings.SqlMisc_ConversionOverflowMessage; - - internal static string InvalidDateTimeMessage => Strings.SqlMisc_InvalidDateTimeMessage; - - internal static string TimeZoneSpecifiedMessage => Strings.SqlMisc_TimeZoneSpecifiedMessage; - - internal static string InvalidArraySizeMessage => Strings.SqlMisc_InvalidArraySizeMessage; - - internal static string InvalidPrecScaleMessage => Strings.SqlMisc_InvalidPrecScaleMessage; - - internal static string FormatMessage => Strings.SqlMisc_FormatMessage; - - internal static string NotFilledMessage => Strings.SqlMisc_NotFilledMessage; - - internal static string AlreadyFilledMessage => Strings.SqlMisc_AlreadyFilledMessage; - - internal static string ClosedXmlReaderMessage => Strings.SqlMisc_ClosedXmlReaderMessage; - - internal static string InvalidOpStreamClosed(string method) - { - return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamClosed, method); - } - - internal static string InvalidOpStreamNonWritable(string method) - { - return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonWritable, method); - } - - internal static string InvalidOpStreamNonReadable(string method) - { - return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonReadable, method); - } - - internal static string InvalidOpStreamNonSeekable(string method) - { - return StringsHelper.Format(Strings.SqlMisc_InvalidOpStreamNonSeekable, method); - } - } // SqlResource -} // namespace System diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 7e64b8fd9e..d76239ba2e 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -256,6 +256,9 @@ Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs + + Microsoft\Data\SQLTypes\SQLResource.cs + Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs @@ -537,9 +540,6 @@ - - Microsoft\Data\SQLTypes\SQLResource.cs - Common\CoreLib\System\Threading\Tasks\TaskToApm.cs diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj index ae61c39607..1b8756600a 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -336,6 +336,9 @@ Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs + + Microsoft\Data\SqlTypes\SQLResource.cs + Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs @@ -509,7 +512,6 @@ - diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/SQLResource.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs similarity index 100% rename from src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Common/SQLResource.cs rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SQLResource.cs