Skip to content

Commit 8951d73

Browse files
authored
[Infrastructure] Unblock installer (#55358)
* Fixes to analyzers and build infrastructure.
1 parent 120b944 commit 8951d73

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

eng/tools/RepoTasks/RemoveSharedFrameworkDependencies.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,17 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo
6464
var updatedGroup = new PackageDependencyGroup(group.TargetFramework, packages);
6565
foreach (var dependency in group.Packages)
6666
{
67-
if (dependencyToRemove.Contains(dependency.Id))
67+
// Hack to temporarily avoid using ISet.Contains
68+
if (!dependencyToRemove.Add(dependency.Id))
6869
{
6970
referencesFrameworkOnlyAssembly = true;
7071
Log.LogMessage($" Remove dependency on '{dependency.Id}'");
7172
continue;
7273
}
74+
else
75+
{
76+
dependencyToRemove.Remove(dependency.Id);
77+
}
7378

7479
packages.Add(dependency);
7580
}
@@ -107,4 +112,4 @@ private void FilterDependencies(string targetPath, ISet<string> dependencyToRemo
107112
}
108113
}
109114
}
110-
}
115+
}

src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -581,9 +581,9 @@ public async Task CanCreateUserAddLogin()
581581
var logins = await manager.GetLoginsAsync(user);
582582
Assert.NotNull(logins);
583583
Assert.Single(logins);
584-
Assert.Equal(provider, logins.First().LoginProvider);
585-
Assert.Equal(providerKey, logins.First().ProviderKey);
586-
Assert.Equal(display, logins.First().ProviderDisplayName);
584+
Assert.Equal(provider, logins[0].LoginProvider);
585+
Assert.Equal(providerKey, logins[0].ProviderKey);
586+
Assert.Equal(display, logins[0].ProviderDisplayName);
587587
}
588588

589589
/// <summary>
@@ -644,9 +644,9 @@ public async Task CanCreateUserAddRemoveLogin()
644644
var logins = await manager.GetLoginsAsync(user);
645645
Assert.NotNull(logins);
646646
Assert.Single(logins);
647-
Assert.Equal(login.LoginProvider, logins.Last().LoginProvider);
648-
Assert.Equal(login.ProviderKey, logins.Last().ProviderKey);
649-
Assert.Equal(login.ProviderDisplayName, logins.Last().ProviderDisplayName);
647+
Assert.Equal(login.LoginProvider, logins[^1].LoginProvider);
648+
Assert.Equal(login.ProviderKey, logins[^1].ProviderKey);
649+
Assert.Equal(login.ProviderDisplayName, logins[^1].ProviderDisplayName);
650650
var stamp = await manager.GetSecurityStampAsync(user);
651651
IdentityResultAssert.IsSuccess(await manager.RemoveLoginAsync(user, login.LoginProvider, login.ProviderKey));
652652
Assert.Null(await manager.FindByLoginAsync(login.LoginProvider, login.ProviderKey));
@@ -772,11 +772,11 @@ public async Task CanReplaceUserClaim()
772772
var userClaims = await manager.GetClaimsAsync(user);
773773
Assert.Equal(1, userClaims.Count);
774774
Claim claim = new Claim("c", "b");
775-
Claim oldClaim = userClaims.FirstOrDefault();
775+
Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
776776
IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
777777
var newUserClaims = await manager.GetClaimsAsync(user);
778778
Assert.Equal(1, newUserClaims.Count);
779-
Claim newClaim = newUserClaims.FirstOrDefault();
779+
Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
780780
Assert.Equal(claim.Type, newClaim.Type);
781781
Assert.Equal(claim.Value, newClaim.Value);
782782
}
@@ -800,16 +800,16 @@ public async Task ReplaceUserClaimOnlyAffectsUser()
800800
var userClaims2 = await manager.GetClaimsAsync(user);
801801
Assert.Equal(1, userClaims2.Count);
802802
Claim claim = new Claim("c", "b");
803-
Claim oldClaim = userClaims.FirstOrDefault();
803+
Claim oldClaim = userClaims.Count == 0 ? null : userClaims[0];
804804
IdentityResultAssert.IsSuccess(await manager.ReplaceClaimAsync(user, oldClaim, claim));
805805
var newUserClaims = await manager.GetClaimsAsync(user);
806806
Assert.Equal(1, newUserClaims.Count);
807-
Claim newClaim = newUserClaims.FirstOrDefault();
807+
Claim newClaim = newUserClaims.Count == 0 ? null : newUserClaims[0];
808808
Assert.Equal(claim.Type, newClaim.Type);
809809
Assert.Equal(claim.Value, newClaim.Value);
810810
userClaims2 = await manager.GetClaimsAsync(user2);
811811
Assert.Equal(1, userClaims2.Count);
812-
Claim oldClaim2 = userClaims2.FirstOrDefault();
812+
Claim oldClaim2 = userClaims2.Count == 0 ? null : userClaims2[0];
813813
Assert.Equal("c", oldClaim2.Type);
814814
Assert.Equal("a", oldClaim2.Value);
815815
}

src/Mvc/Mvc.Core/src/ApplicationModels/ActionAttributeRouteModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static IEnumerable<SelectorModel> FlattenSelectors(ActionModel actionMode
3131
//
3232
// This is fragile wrt application model customizing the data - but no one has
3333
// run into an issue with this and its pretty esoteric.
34-
additionalSelector = new SelectorModel(actionModel.Controller.Selectors.First());
34+
additionalSelector = new SelectorModel(actionModel.Controller.Selectors[0]);
3535
additionalSelector.AttributeRouteModel = null;
3636

3737
for (var i = additionalSelector.ActionConstraints.Count - 1; i >= 0; i--)

src/Servers/Kestrel/Core/src/KestrelServerOptions.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Diagnostics;
5-
using System.Linq;
65
using System.Net;
76
using System.Security.Cryptography.X509Certificates;
87
using System.Text;
@@ -376,9 +375,9 @@ internal void Serialize(Utf8JsonWriter writer)
376375
{
377376
try
378377
{
379-
var cert = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false)
380-
.FirstOrDefault();
378+
var certs = CertificateManager.Instance.ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: false);
381379

380+
var cert = certs.Count > 0 ? certs[0] : null;
382381
if (cert is null)
383382
{
384383
logger.UnableToLocateDevelopmentCertificate();

0 commit comments

Comments
 (0)