Merge in 'release/7.0-rc1' changes

Author: dotnet-bot

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Program.Main.cs

@@ -153,6 +153,10 @@ public static void Main(string[] args)
 
         app.UseRouting();
 
+        #if (IndividualAuth)
+        app.UseAuthorization();
+
+        #endif
         #if (OrganizationalAuth || IndividualAuth)
         app.MapControllers();
         #endif

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Program.cs

@@ -147,6 +147,10 @@
 
 app.UseRouting();
 
+#if (IndividualAuth)
+app.UseAuthorization();
+
+#endif
 #if (OrganizationalAuth || IndividualAuth)
 app.MapControllers();
 #endif

src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs

@@ -92,7 +92,7 @@ public void Abort(ConnectionAbortedException abortReason, Http3ErrorCode errorCo
                 return;
             }
 
-            Log.Http3StreamAbort(_context.ConnectionId, errorCode, abortReason);
+            Log.Http3StreamAbort(TraceIdentifier, errorCode, abortReason);
 
             _errorCodeFeature.Error = (long)errorCode;
             _frameWriter.Abort(abortReason);

src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs

@@ -651,6 +651,7 @@ private static Version GetProtocol(HttpProtocols protocol)
     }
 
     [ConditionalFact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/43374")]
     [MsQuicSupported]
     public async Task GET_ConnectionsMakingMultipleRequests_AllSuccess()
     {
@@ -659,7 +660,7 @@ public async Task GET_ConnectionsMakingMultipleRequests_AllSuccess()
 
         var builder = CreateHostBuilder(context =>
         {
-            requestCount++;
+            Interlocked.Increment(ref requestCount);
             return Task.CompletedTask;
         });
 

src/Shared/CertificateGeneration/MacOSCertificateManager.cs

@@ -375,7 +375,7 @@ protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName sto
 
     protected override void PopulateCertificatesFromStore(X509Store store, List<X509Certificate2> certificates)
     {
-        if (store.Name! == StoreName.My.ToString() && store.Location == store.Location && Directory.Exists(MacOSUserHttpsCertificateLocation))
+        if (store.Name! == StoreName.My.ToString() && store.Location == StoreLocation.CurrentUser && Directory.Exists(MacOSUserHttpsCertificateLocation))
         {
             var certsFromDisk = GetCertsFromDisk();
 
@@ -388,7 +388,10 @@ protected override void PopulateCertificatesFromStore(X509Store store, List<X509
             // Certs created (or "upgraded") by .NET 7+.
             // .NET 7+ installs the certificate on disk as well as on the user keychain (for backwards
             // compatibility with pre-.NET 7).
-            var onDiskAndKeychain = certsFromDisk.Intersect(certsFromStore, ThumbprintComparer.Instance);
+            // Note that the actual certs we populate need to be the ones from the store location, and
+            // not the version from disk, since we may do other operations with these certs later (such
+            // as exporting) which would fail with crypto errors otherwise.
+            var onDiskAndKeychain = certsFromStore.Intersect(certsFromDisk, ThumbprintComparer.Instance);
 
             // The only times we can find a certificate on the keychain and a certificate on keychain+disk
             // are when the certificate on disk and keychain has expired and a pre-.NET 7 SDK has been