Skip to content

Commit 2134081

Browse files
cheenamalhotracheenamalhotra
authored
Upgrade MSAL library version (#765)
Also removed tests that compared error messages not owned by SqlClient.
1 parent a947ded commit 2134081

File tree

3 files changed

+11
-28
lines changed

3 files changed

+11
-28
lines changed

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,7 @@ public static void ActiveDirectoryPasswordWithNoAuthType()
211211
// connection fails with expected error message.
212212
string[] AuthKey = { "Authentication" };
213213
string connStrWithNoAuthType = DataTestUtility.RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, AuthKey);
214-
SqlException e = Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStrWithNoAuthType));
215-
216-
string expectedMessage = "Cannot open server \"microsoft.com\" requested by the login. The login failed.";
217-
Assert.Contains(expectedMessage, e.Message);
214+
Assert.Throws<SqlException>(() => ConnectAndDisconnect(connStrWithNoAuthType));
218215
}
219216

220217
[ConditionalFact(nameof(IsAADConnStringsSetup))]
@@ -248,10 +245,7 @@ public static void EmptyPasswordInConnStrAADPassword()
248245
// connection fails with expected error message.
249246
string[] pwdKey = { "Password", "PWD" };
250247
string connStr = DataTestUtility.RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, pwdKey) + "Password=;";
251-
AggregateException e = Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
252-
253-
string expectedMessage = "ID3242: The security token could not be authenticated or authorized.";
254-
Assert.Contains(expectedMessage, e.InnerException.InnerException.InnerException.Message);
248+
Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
255249
}
256250

257251
[PlatformSpecific(TestPlatforms.Windows)]
@@ -261,11 +255,7 @@ public static void EmptyCredInConnStrAADPassword()
261255
// connection fails with expected error message.
262256
string[] removeKeys = { "User ID", "Password", "UID", "PWD" };
263257
string connStr = DataTestUtility.RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, removeKeys) + "User ID=; Password=;";
264-
AggregateException e = Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
265-
266-
string expectedMessage = "Failed to get user name";
267-
268-
Assert.Contains(expectedMessage, e.InnerException.InnerException.InnerException.Message);
258+
Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
269259
}
270260

271261
[PlatformSpecific(TestPlatforms.AnyUnix)]
@@ -275,11 +265,7 @@ public static void EmptyCredInConnStrAADPasswordAnyUnix()
275265
// connection fails with expected error message.
276266
string[] removeKeys = { "User ID", "Password", "UID", "PWD" };
277267
string connStr = DataTestUtility.RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, removeKeys) + "User ID=; Password=;";
278-
AggregateException e = Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
279-
280-
string expectedMessage = "cannot determine the username";
281-
282-
Assert.Contains(expectedMessage, e.InnerException.InnerException.InnerException.Message);
268+
Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
283269
}
284270

285271
[ConditionalFact(nameof(IsAADConnStringsSetup))]
@@ -288,10 +274,7 @@ public static void AADPasswordWithInvalidUser()
288274
// connection fails with expected error message.
289275
string[] removeKeys = { "User ID", "UID" };
290276
string connStr = DataTestUtility.RemoveKeysInConnStr(DataTestUtility.AADPasswordConnectionString, removeKeys) + "User [email protected]";
291-
AggregateException e = Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
292-
293-
string expectedMessage = "ID3242: The security token could not be authenticated or authorized.";
294-
Assert.Contains(expectedMessage, e.InnerException.InnerException.InnerException.Message);
277+
Assert.Throws<AggregateException>(() => ConnectAndDisconnect(connStr));
295278
}
296279

297280
[ConditionalFact(nameof(IsAADConnStringsSetup))]

‎tools/props/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919
<!-- NetFx and NetCore project dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftIdentityClientVersion>4.14.0</MicrosoftIdentityClientVersion>
21+
<MicrosoftIdentityClientVersion>4.21.1</MicrosoftIdentityClientVersion>
2222
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>5.6.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
2323
<MicrosoftIdentityModelJsonWebTokensVersion>5.6.0</MicrosoftIdentityModelJsonWebTokensVersion>
2424
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>

‎tools/specs/Microsoft.Data.SqlClient.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
2828
<dependencies>
2929
<group targetFramework="net46">
3030
<dependency id="Microsoft.Data.SqlClient.SNI" version="2.1.1" />
31-
<dependency id="Microsoft.Identity.Client" version="4.14.0" />
31+
<dependency id="Microsoft.Identity.Client" version="4.21.1" />
3232
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
3333
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
3434
</group>
@@ -40,7 +40,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4040
<dependency id="System.Diagnostics.DiagnosticSource" version="4.7.0" exclude="Compile" />
4141
<dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Compile" />
4242
<dependency id="System.Runtime.Caching" version="4.7.0" exclude="Compile" />
43-
<dependency id="Microsoft.Identity.Client" version="4.14.0" exclude="Compile"/>
43+
<dependency id="Microsoft.Identity.Client" version="4.21.1" exclude="Compile"/>
4444
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
4545
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
4646
</group>
@@ -52,7 +52,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
5252
<dependency id="System.Diagnostics.DiagnosticSource" version="4.7.0" exclude="Compile" />
5353
<dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Compile" />
5454
<dependency id="System.Runtime.Caching" version="4.7.0" exclude="Compile" />
55-
<dependency id="Microsoft.Identity.Client" version="4.14.0" exclude="Compile"/>
55+
<dependency id="Microsoft.Identity.Client" version="4.21.1" exclude="Compile"/>
5656
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
5757
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
5858
</group>
@@ -63,7 +63,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
6363
<dependency id="System.Memory" version="4.5.4" exclude="Compile" />
6464
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
6565
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
66-
<dependency id="Microsoft.Identity.Client" version="4.14.0" exclude="Compile"/>
66+
<dependency id="Microsoft.Identity.Client" version="4.21.1" exclude="Compile"/>
6767
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
6868
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
6969
</group>
@@ -74,7 +74,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
7474
<dependency id="System.Memory" version="4.5.4" exclude="Compile" />
7575
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
7676
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
77-
<dependency id="Microsoft.Identity.Client" version="4.14.0" exclude="Compile"/>
77+
<dependency id="Microsoft.Identity.Client" version="4.21.1" exclude="Compile"/>
7878
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
7979
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
8080
</group>

0 commit comments

Comments
 (0)