From cdfa43bbe0ecc13757cc6517c9a253de77c3ec56 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Fri, 8 May 2020 03:41:52 +0200 Subject: Avoid trying to fix the trusted root certificates (#21599) --- src/Shared/CertificateGeneration/CertificateManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 5fc4cd6b57..5c0d853976 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -157,8 +157,9 @@ namespace Microsoft.AspNetCore.Certificates.Generation { var result = EnsureCertificateResult.Succeeded; - var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true).Concat( - ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true, requireExportable: true)); + var currentUserCertificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true); + var trustedCertificates = ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true, requireExportable: true); + var certificates = currentUserCertificates.Concat(trustedCertificates); var filteredCertificates = certificates.Where(c => c.Subject == Subject); var excludedCertificates = certificates.Except(filteredCertificates); @@ -177,7 +178,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation { // Skip this step if the command is not interactive, // as we don't want to prompt on first run experience. - foreach (var candidate in certificates) + foreach (var candidate in currentUserCertificates) { var status = CheckCertificateState(candidate, true); if (!status.Result) -- cgit v1.2.3