[main] Source code updates from dotnet/dotnet

eng/common/core-templates/job/onelocbuild.yml

@@ -4,7 +4,7 @@ parameters:
 
   # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
   pool: ''
-    
+
   CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
   GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
 
@@ -27,7 +27,7 @@ parameters:
   is1ESPipeline: ''
 jobs:
 - job: OneLocBuild${{ parameters.JobNameSuffix }}
-  
+
   dependsOn: ${{ parameters.dependsOn }}
 
   displayName: OneLocBuild${{ parameters.JobNameSuffix }}
@@ -99,22 +99,20 @@ jobs:
           mirrorBranch: ${{ parameters.MirrorBranch }}
       condition: ${{ parameters.condition }}
 
-    - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
-      parameters:
-        is1ESPipeline: ${{ parameters.is1ESPipeline }}
-        args:
-          displayName: Publish Localization Files
-          pathToPublish: '$(Build.ArtifactStagingDirectory)/loc'
-          publishLocation: Container
-          artifactName: Loc
-          condition: ${{ parameters.condition }}
+    # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact
+    - task: CopyFiles@2
+      displayName: Copy LocProject.json
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
+        Contents: 'LocProject.json'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
+      condition: ${{ parameters.condition }}
 
-    - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
+    - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
       parameters:
         is1ESPipeline: ${{ parameters.is1ESPipeline }}
         args:
-          displayName: Publish LocProject.json
-          pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
-          publishLocation: Container
-          artifactName: Loc
+          targetPath: '$(Build.ArtifactStagingDirectory)/loc'
+          artifactName: 'Loc'
+          displayName: 'Publish Localization Files'
           condition: ${{ parameters.condition }}

eng/common/tools.ps1

@@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) {
 
 function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1'
+  $shouldDownload = $false
+
   if (!(Test-Path $installScript)) {
+    $shouldDownload = $true
+  } else {
+    # Check if the script is older than 30 days
+    $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime
+    if ($fileAge.Days -gt 30) {
+      Write-Host "Existing install script is too old, re-downloading..."
+      $shouldDownload = $true
+    }
+  }
+
+  if ($shouldDownload) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"

eng/common/tools.sh

@@ -300,8 +300,29 @@ function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
   local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local timestamp_file="$root/.dotnet-install.timestamp"
+  local should_download=false
 
   if [[ ! -a "$install_script" ]]; then
+    should_download=true
+  elif [[ -f "$timestamp_file" ]]; then
+    # Check if the script is older than 30 days using timestamp file
+    local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0")
+    local current_time=$(date +%s)
+    local age_seconds=$((current_time - download_time))
+
+    # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds
+    if [[ $age_seconds -gt 2592000 ]]; then
+      echo "Existing install script is too old, re-downloading..."
+      should_download=true
+    fi
+  else
+    # No timestamp file exists, assume script is old and re-download
+    echo "No timestamp found for existing install script, re-downloading..."
+    should_download=true
+  fi
+
+  if [[ "$should_download" == true ]]; then
     mkdir -p "$root"
 
     echo "Downloading '$install_script_url'"
@@ -328,6 +349,9 @@ function GetDotNetInstallScript {
         ExitWithExitCode $exit_code
       }
     fi
+
+    # Create timestamp file to track download time in seconds from epoch
+    date +%s > "$timestamp_file"
   fi
   # return value
   _GetDotNetInstallScript="$install_script"

eng/targets/CSharp.Common.targets

@@ -94,7 +94,12 @@
         <_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId)</_Parameter2>
       </AssemblyAttribute>
 
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
+      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(RepoOriginalSourceRevisionId)' != ''">
+        <_Parameter1>OriginalRepoCommitHash</_Parameter1>
+        <_Parameter2>$(RepoOriginalSourceRevisionId)</_Parameter2>
+      </AssemblyAttribute>
+
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
         <_Parameter1>Serviceable</_Parameter1>
         <_Parameter2>True</_Parameter2>
       </AssemblyAttribute>

eng/targets/Wix.Common.targets

@@ -22,7 +22,7 @@
     <!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
     <_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
     <_GeneratedPackageVersion
-        Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
+        Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
     <!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
     <OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
 

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.7.25322.101"
+    "version": "10.0.100-preview.7.25372.107"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.7.25322.101",
+    "dotnet": "10.0.100-preview.7.25372.107",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25409.103",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25409.103",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25409.103",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
     <StaticWebAssetBasePath>/app</StaticWebAssetBasePath>
   </PropertyGroup>
 

src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
   </PropertyGroup>
 
   <ItemGroup>

src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj

@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <StaticWebAssetBasePath>WasmMinimal</StaticWebAssetBasePath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <WasmEnableHotReload>false</WasmEnableHotReload>
   </PropertyGroup>
 
   <ItemGroup>

src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <head>
+    <base href="/subdir/" />
     <style>
         #blazor-error-ui { display: none }
     </style>

src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs

@@ -13,7 +13,6 @@ public interface IMemoryPoolFactory<T>
     /// <summary>
     /// Creates a new instance of a memory pool.
     /// </summary>
-    /// <param name="options">Options for configuring the memory pool.</param>
     /// <returns>A new memory pool instance.</returns>
-    MemoryPool<T> Create(MemoryPoolOptions? options = null);
+    MemoryPool<T> Create();
 }

src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt

@@ -1,7 +1,3 @@
 #nullable enable
 Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
-Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
-Microsoft.AspNetCore.Connections.MemoryPoolOptions
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

src/Servers/Connections.Abstractions/src/PublicAPI/net462/PublicAPI.Unshipped.txt

@@ -1,7 +1,3 @@
 #nullable enable
 Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
-Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
-Microsoft.AspNetCore.Connections.MemoryPoolOptions
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

@@ -1,7 +1,3 @@
 #nullable enable
 Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
-Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
-Microsoft.AspNetCore.Connections.MemoryPoolOptions
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

src/Servers/Connections.Abstractions/src/PublicAPI/netstandard2.1/PublicAPI.Unshipped.txt

@@ -1,7 +1,3 @@
 #nullable enable
 Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>
-Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create(Microsoft.AspNetCore.Connections.MemoryPoolOptions? options = null) -> System.Buffers.MemoryPool<T>!
-Microsoft.AspNetCore.Connections.MemoryPoolOptions
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.MemoryPoolOptions() -> void
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.get -> string?
-Microsoft.AspNetCore.Connections.MemoryPoolOptions.Owner.set -> void
+Microsoft.AspNetCore.Connections.IMemoryPoolFactory<T>.Create() -> System.Buffers.MemoryPool<T>!

src/Servers/HttpSys/src/HttpSysListener.cs

@@ -55,7 +55,7 @@ public HttpSysListener(HttpSysOptions options, IMemoryPoolFactory<byte> memoryPo
             throw new PlatformNotSupportedException();
         }
 
-        MemoryPool = memoryPoolFactory.Create(new MemoryPoolOptions { Owner = "httpsys" });
+        MemoryPool = memoryPoolFactory.Create();
 
         Options = options;
 

src/Servers/IIS/IIS/src/Core/IISHttpServer.cs

@@ -66,7 +66,7 @@ public IISHttpServer(
         ILogger<IISHttpServer> logger
         )
     {
-        _memoryPool = memoryPoolFactory.Create(new MemoryPoolOptions { Owner = "iis" });
+        _memoryPool = memoryPoolFactory.Create();
         _nativeApplication = nativeApplication;
         _applicationLifetime = applicationLifetime;
         _logger = logger;

src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs

@@ -57,7 +57,6 @@ public static IWebHostBuilder UseIIS(this IWebHostBuilder hostBuilder)
                     );
 
                     services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultMemoryPoolFactory>();
-                    services.TryAddSingleton<MemoryPoolMetrics>();
                 });
         }
 

src/Servers/Kestrel/Core/src/Internal/PinnedBlockMemoryPoolFactory.cs

@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.Collections.Concurrent;
+using System.Diagnostics.Metrics;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.Extensions.Logging;
@@ -11,22 +12,22 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 
 internal sealed class PinnedBlockMemoryPoolFactory : IMemoryPoolFactory<byte>, IHeartbeatHandler
 {
-    private readonly MemoryPoolMetrics _metrics;
+    private readonly IMeterFactory _meterFactory;
     private readonly ILogger? _logger;
     private readonly TimeProvider _timeProvider;
     // micro-optimization: Using nuint as the value type to avoid GC write barriers; could replace with ConcurrentHashSet if that becomes available
     private readonly ConcurrentDictionary<PinnedBlockMemoryPool, nuint> _pools = new();
 
-    public PinnedBlockMemoryPoolFactory(MemoryPoolMetrics metrics, TimeProvider? timeProvider = null, ILogger<PinnedBlockMemoryPoolFactory>? logger = null)
+    public PinnedBlockMemoryPoolFactory(IMeterFactory meterFactory, TimeProvider? timeProvider = null, ILogger<PinnedBlockMemoryPoolFactory>? logger = null)
     {
         _timeProvider = timeProvider ?? TimeProvider.System;
-        _metrics = metrics;
+        _meterFactory = meterFactory;
         _logger = logger;
     }
 
-    public MemoryPool<byte> Create(MemoryPoolOptions? options = null)
+    public MemoryPool<byte> Create()
     {
-        var pool = new PinnedBlockMemoryPool(options?.Owner, _metrics, _logger);
+        var pool = new PinnedBlockMemoryPool(_meterFactory, _logger);
 
         _pools.TryAdd(pool, nuint.Zero);
 

src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolFactoryTests.cs

@@ -4,7 +4,6 @@
 using System.Buffers;
 using System.Collections.Concurrent;
 using System.Reflection;
-using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.Extensions.Time.Testing;
@@ -16,26 +15,16 @@ public class PinnedBlockMemoryPoolFactoryTests
     [Fact]
     public void CreatePool()
     {
-        var factory = CreateMemoryPoolFactory();
+        var factory = new PinnedBlockMemoryPoolFactory(new TestMeterFactory());
         var pool = factory.Create();
         Assert.NotNull(pool);
         Assert.IsType<PinnedBlockMemoryPool>(pool);
-        Assert.Null(Assert.IsType<PinnedBlockMemoryPool>(pool).Owner);
-    }
-
-    [Fact]
-    public void CreatePoolWithOwner()
-    {
-        var factory = CreateMemoryPoolFactory();
-        var pool = factory.Create(new MemoryPoolOptions { Owner = "test" });
-        Assert.NotNull(pool);
-        Assert.Equal("test", Assert.IsType<PinnedBlockMemoryPool>(pool).Owner);
     }
 
     [Fact]
     public void CreateMultiplePools()
     {
-        var factory = CreateMemoryPoolFactory();
+        var factory = new PinnedBlockMemoryPoolFactory(new TestMeterFactory());
         var pool1 = factory.Create();
         var pool2 = factory.Create();
 
@@ -47,7 +36,7 @@ public void CreateMultiplePools()
     [Fact]
     public void DisposePoolRemovesFromFactory()
     {
-        var factory = CreateMemoryPoolFactory();
+        var factory = new PinnedBlockMemoryPoolFactory(new TestMeterFactory());
         var pool = factory.Create();
         Assert.NotNull(pool);
 
@@ -64,7 +53,7 @@ public void DisposePoolRemovesFromFactory()
     public async Task FactoryHeartbeatWorks()
     {
         var timeProvider = new FakeTimeProvider(DateTimeOffset.UtcNow.AddDays(1));
-        var factory = CreateMemoryPoolFactory(timeProvider);
+        var factory = new PinnedBlockMemoryPoolFactory(new TestMeterFactory(), timeProvider);
 
         // Use 2 pools to make sure they all get triggered by the heartbeat
         var pool = Assert.IsType<PinnedBlockMemoryPool>(factory.Create());
@@ -121,11 +110,4 @@ static async Task VerifyPoolEviction(PinnedBlockMemoryPool pool, int previousCou
             Assert.InRange(pool.BlockCount(), previousCount - (previousCount / 10), previousCount - (previousCount / 30));
         }
     }
-
-    private static PinnedBlockMemoryPoolFactory CreateMemoryPoolFactory(TimeProvider timeProvider = null)
-    {
-        return new PinnedBlockMemoryPoolFactory(
-            new MemoryPoolMetrics(new TestMeterFactory()),
-            timeProvider: timeProvider);
-    }
 }