diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
index 47c806d387..c34dcddab7 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
@@ -619,8 +619,6 @@ public sealed partial class SqlConnection : System.Data.Common.DbConnection, Sys
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
public override string ServerVersion { get { throw null; } }
- ///
- public int ServerProcessId { get { throw null; } }
///
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
index 438423fa71..aa3f051d37 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
@@ -2499,15 +2499,6 @@ internal class Strings {
}
}
- ///
- /// Looks up a localized string similar to Cannot use 'Authentication=Active Directory Device Code Flow' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords..
- ///
- internal static string SQL_DeviceFlowWithUsernamePassword {
- get {
- return ResourceManager.GetString("SQL_DeviceFlowWithUsernamePassword", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to The duration spent while attempting to connect to this server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; .
///
@@ -2661,6 +2652,15 @@ internal class Strings {
}
}
+ ///
+ /// Looks up a localized string similar to Cannot use 'Authentication=Active Directory Device Code Flow' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords..
+ ///
+ internal static string SQL_DeviceFlowWithUsernamePassword {
+ get {
+ return ResourceManager.GetString("SQL_DeviceFlowWithUsernamePassword", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Internal Error.
///
@@ -3048,15 +3048,6 @@ internal class Strings {
}
}
- ///
- /// Looks up a localized string similar to Cannot set the Credential property if 'Authentication=Active Directory Device Code Flow' has been specified in the connection string..
- ///
- internal static string SQL_SettingCredentialWithDeviceFlow {
- get {
- return ResourceManager.GetString("SQL_SettingCredentialWithDeviceFlow", resourceCulture);
- }
- }
-
///
/// Looks up a localized string similar to Cannot set the Credential property if 'Authentication=Active Directory Integrated' has been specified in the connection string..
///
@@ -3076,11 +3067,11 @@ internal class Strings {
}
///
- /// Looks up a localized string similar to Cannot use 'Authentication=Active Directory Device Code Flow', if the Credential property has been set..
+ /// Looks up a localized string similar to Cannot set the Credential property if 'Authentication=Active Directory Device Code Flow' has been specified in the connection string..
///
- internal static string SQL_SettingDeviceFlowWithCredential {
+ internal static string SQL_SettingCredentialWithDeviceFlow {
get {
- return ResourceManager.GetString("SQL_SettingDeviceFlowWithCredential", resourceCulture);
+ return ResourceManager.GetString("SQL_SettingCredentialWithDeviceFlow", resourceCulture);
}
}
@@ -3102,6 +3093,15 @@ internal class Strings {
}
}
+ ///
+ /// Looks up a localized string similar to Cannot use 'Authentication=Active Directory Device Code Flow', if the Credential property has been set..
+ ///
+ internal static string SQL_SettingDeviceFlowWithCredential {
+ get {
+ return ResourceManager.GetString("SQL_SettingDeviceFlowWithCredential", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to A severe error occurred on the current command. The results, if any, should be discarded..
///
@@ -3229,20 +3229,20 @@ internal class Strings {
}
///
- /// Looks up a localized string similar to Active Directory Device Code Flow authentication timed out. The user took too long to respond to the authentication request..
+ /// Looks up a localized string similar to Active Directory Interactive authentication timed out. The user took too long to respond to the authentication request..
///
- internal static string SQL_Timeout_Active_Directory_DeviceFlow_Authentication {
+ internal static string SQL_Timeout_Active_Directory_Interactive_Authentication {
get {
- return ResourceManager.GetString("SQL_Timeout_Active_Directory_DeviceFlow_Authentication", resourceCulture);
+ return ResourceManager.GetString("SQL_Timeout_Active_Directory_Interactive_Authentication", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Active Directory Interactive authentication timed out. The user took too long to respond to the authentication request..
+ /// Looks up a localized string similar to Active Directory Device Code Flow authentication timed out. The user took too long to respond to the authentication request..
///
- internal static string SQL_Timeout_Active_Directory_Interactive_Authentication {
+ internal static string SQL_Timeout_Active_Directory_DeviceFlow_Authentication {
get {
- return ResourceManager.GetString("SQL_Timeout_Active_Directory_Interactive_Authentication", resourceCulture);
+ return ResourceManager.GetString("SQL_Timeout_Active_Directory_DeviceFlow_Authentication", resourceCulture);
}
}
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
index 1fe8a00ea2..76d4f44fbb 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
@@ -775,8 +775,6 @@ public sealed partial class SqlConnection : System.Data.Common.DbConnection, Sys
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
public override string ServerVersion { get { throw null; } }
- ///
- public int ServerProcessId { get { throw null; } }
///
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index f812a47cd0..cbaa4a9520 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -94,6 +94,5 @@
-
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 34ccbbaf0a..16c550dfd6 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -12,7 +12,7 @@
- 2.1.0
+ 2.0.0
4.3.1
4.3.0
@@ -27,7 +27,7 @@
4.7.0
- 2.1.0
+ 2.0.0
4.7.0
4.7.0
4.7.0
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 4bed4c4330..362ffdd7c8 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -27,13 +27,13 @@ When using NuGet 3.x this package requires at least version 3.4.
sqlclient microsoft.data.sqlclient
-
+
-
+
@@ -45,7 +45,7 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+
@@ -57,7 +57,7 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+