Skip to content

Commit e422fd3

Browse files
authored
Bump dotnet to pickup hosted publish fixes (#48075)
* Bump dotnet to pickup hosted publish fixes * remove uneeded double lookuo using ContainsKey
1 parent 2df5115 commit e422fd3

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.5.23228.7"
3+
"version": "8.0.100-preview.5.23254.16"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-preview.5.23228.7",
6+
"dotnet": "8.0.100-preview.5.23254.16",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Identity/Extensions.Core/src/UserManager.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,12 +1548,12 @@ public virtual async Task<bool> VerifyUserTokenAsync(TUser user, string tokenPro
15481548
ArgumentNullThrowHelper.ThrowIfNull(user);
15491549
ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
15501550

1551-
if (!_tokenProviders.ContainsKey(tokenProvider))
1551+
if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
15521552
{
15531553
throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
15541554
}
15551555
// Make sure the token is valid
1556-
var result = await _tokenProviders[tokenProvider].ValidateAsync(purpose, token, this, user).ConfigureAwait(false);
1556+
var result = await provider.ValidateAsync(purpose, token, this, user).ConfigureAwait(false);
15571557

15581558
if (!result && Logger.IsEnabled(LogLevel.Debug))
15591559
{
@@ -1577,12 +1577,13 @@ public virtual Task<string> GenerateUserTokenAsync(TUser user, string tokenProvi
15771577
ThrowIfDisposed();
15781578
ArgumentNullThrowHelper.ThrowIfNull(user);
15791579
ArgumentNullThrowHelper.ThrowIfNull(tokenProvider);
1580-
if (!_tokenProviders.ContainsKey(tokenProvider))
1580+
1581+
if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
15811582
{
15821583
throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
15831584
}
15841585

1585-
return _tokenProviders[tokenProvider].GenerateAsync(purpose, this, user);
1586+
return provider.GenerateAsync(purpose, this, user);
15861587
}
15871588

15881589
/// <summary>
@@ -1635,13 +1636,13 @@ public virtual async Task<bool> VerifyTwoFactorTokenAsync(TUser user, string tok
16351636
{
16361637
ThrowIfDisposed();
16371638
ArgumentNullThrowHelper.ThrowIfNull(user);
1638-
if (!_tokenProviders.ContainsKey(tokenProvider))
1639+
if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
16391640
{
16401641
throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
16411642
}
16421643

16431644
// Make sure the token is valid
1644-
var result = await _tokenProviders[tokenProvider].ValidateAsync("TwoFactor", token, this, user).ConfigureAwait(false);
1645+
var result = await provider.ValidateAsync("TwoFactor", token, this, user).ConfigureAwait(false);
16451646
if (!result)
16461647
{
16471648
Logger.LogDebug(LoggerEventIds.VerifyTwoFactorTokenFailed, $"{nameof(VerifyTwoFactorTokenAsync)}() failed for user.");
@@ -1662,12 +1663,12 @@ public virtual Task<string> GenerateTwoFactorTokenAsync(TUser user, string token
16621663
{
16631664
ThrowIfDisposed();
16641665
ArgumentNullThrowHelper.ThrowIfNull(user);
1665-
if (!_tokenProviders.ContainsKey(tokenProvider))
1666+
if (!_tokenProviders.TryGetValue(tokenProvider, out var provider))
16661667
{
16671668
throw new NotSupportedException(Resources.FormatNoTokenProvider(nameof(TUser), tokenProvider));
16681669
}
16691670

1670-
return _tokenProviders[tokenProvider].GenerateAsync("TwoFactor", this, user);
1671+
return provider.GenerateAsync("TwoFactor", this, user);
16711672
}
16721673

16731674
/// <summary>

src/Mvc/Mvc.Core/src/ModelBinding/Binders/HeaderModelBinder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ private static HeaderValueProvider GetHeaderValueProvider(string headerName, Mod
104104
// Prevent breaking existing users in scenarios where they are binding to a 'string' property
105105
// and expect the whole comma separated string, if any, as a single string and not as a string array.
106106
var values = Array.Empty<string>();
107-
if (request.Headers.ContainsKey(headerName))
107+
if (request.Headers.TryGetValue(headerName, out var header))
108108
{
109109
if (bindingContext.ModelMetadata.IsEnumerableType)
110110
{
111111
values = request.Headers.GetCommaSeparatedValues(headerName);
112112
}
113113
else
114114
{
115-
values = new[] { request.Headers[headerName].ToString() };
115+
values = new[] { header.ToString() };
116116
}
117117
}
118118

src/Mvc/Mvc.ViewFeatures/src/HtmlHelper.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,12 +1390,13 @@ protected virtual IEnumerable<SelectListItem> GetEnumSelectList(ModelMetadata me
13901390

13911391
if (!string.IsNullOrEmpty(keyValuePair.Key.Group))
13921392
{
1393-
if (!groupList.ContainsKey(keyValuePair.Key.Group))
1393+
if (!groupList.TryGetValue(keyValuePair.Key.Group, out var group))
13941394
{
1395-
groupList[keyValuePair.Key.Group] = new SelectListGroup() { Name = keyValuePair.Key.Group };
1395+
group = new SelectListGroup() { Name = keyValuePair.Key.Group };
1396+
groupList[keyValuePair.Key.Group] = group;
13961397
}
13971398

1398-
selectListItem.Group = groupList[keyValuePair.Key.Group];
1399+
selectListItem.Group = group;
13991400
}
14001401

14011402
selectList.Add(selectListItem);

src/Tools/dotnet-user-jwts/src/Commands/RemoveCommand.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ private static int Execute(IReporter reporter, string projectPath, string id)
3737
}
3838
var jwtStore = new JwtStore(userSecretsId);
3939

40-
if (!jwtStore.Jwts.ContainsKey(id))
40+
if (!jwtStore.Jwts.TryGetValue(id, out var jwt))
4141
{
4242
reporter.Error(Resources.FormatRemoveCommand_NoJwtFound(id));
4343
return 1;
4444
}
4545

46-
var jwt = jwtStore.Jwts[id];
4746
var appsettingsFilePath = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json");
4847
JwtAuthenticationSchemeSettings.RemoveScheme(appsettingsFilePath, jwt.Scheme);
4948
jwtStore.Jwts.Remove(id);

0 commit comments

Comments
 (0)