Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename netcore string resource file and helpers #671

Merged
merged 2 commits into from
Aug 7, 2020
Merged

Rename netcore string resource file and helpers #671

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8eacae
rename string resource file and helpers
Wraith2 Jul 29, 2020
93eaa15
fixup SqlUtil
Wraith2 Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup SqlUtil
  • Loading branch information
@Wraith2
Wraith2 committed Jul 29, 2020
commit 93eaa15596359d7f899db9272306b479a08c66ff
10 changes: 5 additions & 5 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ internal static Exception InteractiveWithPassword()
}
internal static Exception DeviceFlowWithUsernamePassword()
{
return ADP.Argument(System.SRHelper.GetString(SR.SQL_DeviceFlowWithUsernamePassword));
return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_DeviceFlowWithUsernamePassword));
}
static internal Exception SettingIntegratedWithCredential()
{
Expand All @@ -291,7 +291,7 @@ static internal Exception SettingInteractiveWithCredential()
}
static internal Exception SettingDeviceFlowWithCredential()
{
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_SettingDeviceFlowWithCredential));
return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingDeviceFlowWithCredential));
}
static internal Exception SettingCredentialWithIntegratedArgument()
{
Expand All @@ -303,7 +303,7 @@ static internal Exception SettingCredentialWithInteractiveArgument()
}
static internal Exception SettingCredentialWithDeviceFlowArgument()
{
return ADP.Argument(System.SRHelper.GetString(SR.SQL_SettingCredentialWithDeviceFlow));
return ADP.Argument(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow));
}
static internal Exception SettingCredentialWithIntegratedInvalid()
{
Expand All @@ -315,7 +315,7 @@ static internal Exception SettingCredentialWithInteractiveInvalid()
}
static internal Exception SettingCredentialWithDeviceFlowInvalid()
{
return ADP.InvalidOperation(System.SRHelper.GetString(SR.SQL_SettingCredentialWithDeviceFlow));
return ADP.InvalidOperation(System.StringsHelper.GetString(Strings.SQL_SettingCredentialWithDeviceFlow));
}
internal static Exception NullEmptyTransactionName()
{
Expand Down Expand Up @@ -465,7 +465,7 @@ internal static Exception ActiveDirectoryInteractiveTimeout()

internal static Exception ActiveDirectoryDeviceFlowTimeout()
{
return ADP.TimeoutException(SR.SQL_Timeout_Active_Directory_DeviceFlow_Authentication);
return ADP.TimeoutException(Strings.SQL_Timeout_Active_Directory_DeviceFlow_Authentication);
}


Expand Down