Merging main into darc-main-420b4eff-f16f-4797-8ab3-d6db19bf7727

dotnet-maestro[bot] · dotnet-maestro[bot] · commit a7b4ba85f012 · 2025-05-09T02:03:03.000Z
diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
@@ -632,8 +632,7 @@ stages:
       platform:
         name: 'Managed'
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
-        buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-        skipPublishValidation: true
+        buildScript: './eng/build.sh $(_InternalRuntimeDownloadArgs)'
         jobProperties:
           timeoutInMinutes: 120
           variables:
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -677,8 +677,7 @@ extends:
           platform:
             name: 'Managed'
             container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-            buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-            skipPublishValidation: true
+            buildScript: './eng/build.sh $(_InternalRuntimeDownloadArgs)'
             jobProperties:
               timeoutInMinutes: 120
               variables:
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -555,7 +555,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.5
+          milestone: 9.0.6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -566,7 +566,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.16
+          milestone: 8.0.17
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@11c848003df85813f4821fec2d43290fd4ca8594 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@43abe63bfc701d34e6599490a557a74710693410 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%
diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml
@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@11c848003df85813f4821fec2d43290fd4ca8594 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@43abe63bfc701d34e6599490a557a74710693410 # 2024-06-24
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
@@ -19,19 +19,6 @@ steps:
     set -x
     df -h
 
-    # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
-    internalRestoreArgs=
-    if ! git diff --quiet; then
-      internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
-      # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
-      # This only works if there is a username/email configured, which won't be the case in most CI runs.
-      git config --get user.email
-      if [ $? -ne 0 ]; then
-        git config user.email dn-bot@microsoft.com
-        git config user.name dn-bot
-      fi
-    fi
-
     # If building on the internal project, the internal storage variable may be available (usually only if needed)
     # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
     # in the default public locations.
@@ -71,7 +58,6 @@ steps:
       --restore --build --pack -bl \
       ${{ parameters.platform.buildArguments }} \
       $internalRuntimeDownloadArgs \
-      $internalRestoreArgs \
       $targetRidArgs \
       $runtimeOsArgs \
       $baseOsArgs \
@@ -80,26 +66,12 @@ steps:
       /p:DotNetBuildRepo=true \
   displayName: Build
 
-# Upload build logs for diagnosis.
-- task: CopyFiles@2
-  displayName: Prepare BuildLogs staging directory
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)'
-    Contents: |
-      **/*.log
-      **/*.binlog
-      artifacts/sb/prebuilt-report/**
-    TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
-    CleanTargetFolder: true
-  continueOnError: true
-  condition: succeededOrFailed()
-
 - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
   parameters:
     is1ESPipeline: ${{ parameters.is1ESPipeline }}
     args:
       displayName: Publish BuildLogs
-      targetPath: '$(Build.StagingDirectory)/BuildLogs'
+      targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
       artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
       continueOnError: true
       condition: succeededOrFailed()
diff --git a/global.json b/global.json
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25252.107",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25252.107",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25252.107",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.101",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25257.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
diff --git a/src/Components/Web.JS/src/Services/WebRootComponentManager.ts b/src/Components/Web.JS/src/Services/WebRootComponentManager.ts
@@ -470,10 +470,6 @@ function isDescriptorInDocument(descriptor: ComponentDescriptor): boolean {
 }
 
 function areWebAssemblyResourcesLikelyCached(config: MonoConfig): boolean {
-  if (!config.cacheBootResources) {
-    return false;
-  }
-
   const hash = getWebAssemblyResourceHash(config);
   if (!hash) {
     return false;
diff --git a/src/Components/WebAssembly/Directory.Build.props b/src/Components/WebAssembly/Directory.Build.props
@@ -7,4 +7,7 @@
   <PropertyGroup>
     <WasmPreloadAssets>false</WasmPreloadAssets>
   </PropertyGroup>
+  <PropertyGroup>
+    <BlazorCacheBootResources>false</BlazorCacheBootResources>
+  </PropertyGroup>
 </Project>
diff --git a/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj b/src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.Endpoints" />
+    <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.AspNetCore.StaticAssets" />
     <Reference Include="Microsoft.NETCore.BrowserDebugHost.Transport" GeneratePathProperty="true" PrivateAssets="All" />
diff --git a/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs b/src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Endpoints.Infrastructure;
 using Microsoft.AspNetCore.Components.WebAssembly.Server;
+using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -24,6 +25,7 @@ public static IRazorComponentsBuilder AddInteractiveWebAssemblyComponents(this I
         ArgumentNullException.ThrowIfNull(builder, nameof(builder));
 
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<RenderModeEndpointProvider, WebAssemblyEndpointProvider>());
+        builder.Services.TryAddScoped<LazyAssemblyLoader>();
 
         return builder;
     }
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/BootResourceRequestLog.cs
@@ -9,11 +9,14 @@ public class BootResourceRequestLog
 {
     private readonly ConcurrentBag<string> _requestPaths = new ConcurrentBag<string>();
 
-    public IReadOnlyCollection<string> RequestPaths => _requestPaths;
+    public IReadOnlyCollection<string> RequestPathsWithNewContent => _requestPaths;
 
-    public void AddRequest(HttpRequest request)
+    public void AddRequest(string originalRequestPath, HttpResponse response)
     {
-        _requestPaths.Add(request.Path);
+        if (response.StatusCode != StatusCodes.Status304NotModified)
+        {
+            _requestPaths.Add(originalRequestPath);
+        }
     }
 
     public void Clear()
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs b/src/Components/WebAssembly/testassets/HostedInAspNet.Server/Startup.cs
@@ -24,17 +24,18 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, BootReso
     {
         var mapAlternativePathApp = Configuration.GetValue<bool>("UseAlternativeBasePath");
         var mapAllApps = Configuration.GetValue<bool>("MapAllApps");
-        app.Use((context, next) =>
+        app.Use(async (context, next) =>
         {
+            string originalRequestPath = context.Request.Path;
+            await next(context);
+
             // This is used by E2E tests to verify that the correct resources were fetched,
             // and that it was possible to override the loading mechanism
             if (context.Request.Query.ContainsKey("customizedbootresource")
-            || context.Request.Headers.ContainsKey("customizedbootresource")
-            || context.Request.Path.Value.EndsWith("/blazor.boot.json", StringComparison.Ordinal))
+            || context.Request.Headers.ContainsKey("customizedbootresource"))
             {
-                bootResourceRequestLog.AddRequest(context.Request);
+                bootResourceRequestLog.AddRequest(originalRequestPath, context.Response);
             }
-            return next(context);
         });
 
         if (env.IsDevelopment())
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -19,9 +19,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 public partial class BootResourceCachingTest
     : ServerTestBase<AspNetSiteServerFixture>
 {
-    // The cache name is derived from the application's base href value (in this case, '/')
-    private const string CacheName = "dotnet-resources-/";
-
     public BootResourceCachingTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
@@ -56,114 +53,13 @@ public void CachesResourcesAfterFirstLoad()
         Navigate("/");
         WaitUntilLoaded();
         var subsequentResourcesRequested = GetAndClearRequestedPaths();
-        Assert.DoesNotContain(subsequentResourcesRequested, path =>
-            path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
-            path.EndsWith(".wasm", StringComparison.Ordinal));
-        Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
-        Assert.DoesNotContain(subsequentResourcesRequested, path =>
-            !path.Contains("/dotnet.native.", StringComparison.Ordinal) &&
-            path.EndsWith(".wasm", StringComparison.Ordinal));
-    }
-
-    [Fact]
-    public async Task IncrementallyUpdatesCache()
-    {
-        // Perform a first load to populate the cache
-        Navigate("/");
-        WaitUntilLoaded();
-        var cacheEntryUrls1 = GetCacheEntryUrls();
-        var cacheEntryForComponentsDll = cacheEntryUrls1.Single(IsFingerprintedComponentsEntry);
-        var cacheEntryForDotNetWasm = cacheEntryUrls1.Single(IsFingerprintedDotNetWasmEntry);
-        var cacheEntryForDotNetWasmWithChangedHash = cacheEntryForDotNetWasm.Replace(".sha256-", ".sha256-different");
-
-        // Remove some items we do need, and add an item we don't need
-        RemoveCacheEntry(cacheEntryForComponentsDll);
-        RemoveCacheEntry(cacheEntryForDotNetWasm);
-        AddCacheEntry(cacheEntryForDotNetWasmWithChangedHash, "ignored content");
-        var cacheEntryUrls2 = GetCacheEntryUrls();
-        Assert.DoesNotContain(cacheEntryForComponentsDll, cacheEntryUrls2);
-        Assert.DoesNotContain(cacheEntryForDotNetWasm, cacheEntryUrls2);
-        Assert.Contains(cacheEntryForDotNetWasmWithChangedHash, cacheEntryUrls2);
-
-        // On the next load, we'll fetch only the items we need (not things already cached)
-        GetAndClearRequestedPaths();
-        Navigate("about:blank");
-        Browser.Equal(string.Empty, () => Browser.Title);
-        Navigate("/");
-        WaitUntilLoaded();
-        var subsequentResourcesRequested = GetAndClearRequestedPaths();
-        Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".wasm")),
-            requestedDll => Assert.True(IsFingerprintedComponentsEntry(requestedDll)),
-            requestedDll => Assert.True(IsFingerprintedDotNetWasmEntry(requestedDll)));
-
-        var cacheEntryUrls3 = GetCacheEntryUrls();
-        // wait until the cache was cleaned, max 500ms
-        for (var i = 0; i < 5; i++)
-        {
-            if (!cacheEntryUrls3.Contains(cacheEntryForDotNetWasmWithChangedHash))
-            {
-                break;
-            }
-            await Task.Delay(100); // wait for cache purge
-            cacheEntryUrls3 = GetCacheEntryUrls();
-        }
-        Assert.Contains(cacheEntryForComponentsDll, cacheEntryUrls3);
-        Assert.Contains(cacheEntryForDotNetWasm, cacheEntryUrls3);
-        Assert.DoesNotContain(cacheEntryForDotNetWasmWithChangedHash, cacheEntryUrls3);
-    }
-
-    [GeneratedRegex("/Microsoft\\.AspNetCore\\.Components\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedComponentsEntryRegex { get; }
-
-    [GeneratedRegex("/dotnet\\.native\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedDotNetWasmEntryRegex { get; }
-
-    private static bool IsFingerprintedComponentsEntry(string url)
-        => GetFingerprintedComponentsEntryRegex.IsMatch(url);
-
-    private static bool IsFingerprintedDotNetWasmEntry(string url)
-        => GetFingerprintedDotNetWasmEntryRegex.IsMatch(url);
-
-    private IReadOnlyCollection<string> GetCacheEntryUrls()
-    {
-        var js = @"
-                (async function(cacheName, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    const keys = await cache.keys();
-                    const urls = keys.map(r => r.url);
-                    completedCallback(urls);
-                }).apply(null, arguments)";
-        var jsExecutor = (IJavaScriptExecutor)Browser;
-        var result = (IEnumerable<object>)jsExecutor.ExecuteAsyncScript(js, CacheName);
-        return result.Cast<string>().ToList();
-    }
-
-    private void RemoveCacheEntry(string url)
-    {
-        var js = @"
-                (async function(cacheName, urlToRemove, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    await cache.delete(urlToRemove);
-                    completedCallback();
-                }).apply(null, arguments)";
-        ((IJavaScriptExecutor)Browser).ExecuteAsyncScript(js, CacheName, url);
-    }
-
-    private void AddCacheEntry(string url, string content)
-    {
-        var js = @"
-                (async function(cacheName, urlToAdd, contentToAdd, completedCallback) {
-                    const cache = await caches.open(cacheName);
-                    await cache.put(urlToAdd, new Response(contentToAdd));
-                    completedCallback();
-                }).apply(null, arguments)";
-        ((IJavaScriptExecutor)Browser).ExecuteAsyncScript(js, CacheName, url, content);
+        Assert.Empty(subsequentResourcesRequested);
     }
 
     private IReadOnlyCollection<string> GetAndClearRequestedPaths()
     {
         var requestLog = _serverFixture.Host.Services.GetRequiredService<BootResourceRequestLog>();
-        var result = requestLog.RequestPaths.ToList();
+        var result = requestLog.RequestPathsWithNewContent.ToList();
         requestLog.Clear();
         return result;
     }
diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props
@@ -22,4 +22,7 @@
   <PropertyGroup>
     <WasmPreloadAssets>false</WasmPreloadAssets>
   </PropertyGroup>
+  <PropertyGroup>
+    <BlazorCacheBootResources>false</BlazorCacheBootResources>
+  </PropertyGroup>
 </Project>
diff --git a/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs b/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs
diff --git a/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs b/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs
