Merge pull request #21605 from dotnet-maestro-bot/merge/release/5.0-preview4-to-master

John Luo · web-flow · commit 72bfa8fda76a · 2020-05-08T16:50:06.000-07:00
[automated] Merge branch 'release/5.0-preview4' =&gt; 'master'
diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs
@@ -157,8 +157,9 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(
         {
             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 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(
                 {
                     // 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)

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,9 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(`
`157`	`157`	`{`
`158`	`158`	`var result = EnsureCertificateResult.Succeeded;`
`159`	`159`
`160`		`- var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true).Concat(`
`161`		`- ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true, requireExportable: true));`
	`160`	`+ var currentUserCertificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true);`
	`161`	`+ var trustedCertificates = ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true, requireExportable: true);`
	`162`	`+ var certificates = currentUserCertificates.Concat(trustedCertificates);`
`162`	`163`
`163`	`164`	`var filteredCertificates = certificates.Where(c => c.Subject == Subject);`
`164`	`165`	`var excludedCertificates = certificates.Except(filteredCertificates);`
`@@ -177,7 +178,7 @@ public EnsureCertificateResult EnsureAspNetCoreHttpsDevelopmentCertificate(`
`177`	`178`	`{`
`178`	`179`	`// Skip this step if the command is not interactive,`
`179`	`180`	`// as we don't want to prompt on first run experience.`
`180`		`- foreach (var candidate in certificates)`
	`181`	`+ foreach (var candidate in currentUserCertificates)`
`181`	`182`	`{`
`182`	`183`	`var status = CheckCertificateState(candidate, true);`
`183`	`184`	`if (!status.Result)`