[automated] Merge branch 'release/8.0' => 'main'

Directory.Build.targets

@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
+    <!-- Disable IsTrimmable on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1195 and NETSDK1210 errors -->
+    <IsTrimmable Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsTrimmable>
     <EnableAOTAnalyzer Condition=" '$(EnableAOTAnalyzer)' == '' ">$([MSBuild]::ValueOrDefault($(IsTrimmable),'false'))</EnableAOTAnalyzer>
     <!-- TODO: Remove when analyzer is enabled by default with AOT in SDK. See https://github.com/dotnet/sdk/issues/31284 -->
     <EnableSingleFileAnalyzer Condition=" '$(EnableSingleFileAnalyzer)' == '' ">$(EnableAOTAnalyzer)</EnableSingleFileAnalyzer>

eng/CodeGen.proj

@@ -24,10 +24,12 @@
       <_RequiresDelayedBuild Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('RequiresDelayedBuild','true')->Distinct())" />
       <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'true'))" />
       <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'false'))" />
-      <_TrimmableProject Include="@(_ProjectReferenceProvider->WithMetadataValue('IsTrimmable', 'true'))" />
       <_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp', 'true'))" />
       <_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsShippingPackage', 'true'))" />
       <_ShippingAssembly Include="@(_ShippingAssemblyWithDupes->Distinct())" />
+      <!-- _ProjectReferenceProvider is already Distinct() and does not include metadata for each target framework. -->
+      <!-- If a project is trimmable for even just one of multiple target frameworks, include it in TrimmableProjects.props. -->
+      <_TrimmableProject Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('IsTrimmable', 'true')->WithMetadataValue('IsProjectReferenceProvider','true')->Distinct())" />
     </ItemGroup>
 
     <PropertyGroup>

eng/Version.Details.xml

@@ -189,9 +189,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23418.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23429.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>8fc77fa8f591051da1120ebb76c3795b7b584495</Sha>
+      <Sha>0603839a51f5e18b89c60a3690aff5e81fa666ca</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-rc.1.23421.3">

eng/Versions.props

@@ -11,7 +11,7 @@
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
     <ValidateBaseline>true</ValidateBaseline>
-    <IdentityModelVersion>7.0.0-preview</IdentityModelVersion>
+    <IdentityModelVersion>7.0.0-preview3</IdentityModelVersion>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
@@ -162,7 +162,7 @@
     <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23425.2</MicrosoftDotNetBuildTasksTemplatingVersion>
     <MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23425.2</MicrosoftDotNetRemoteExecutorVersion>
     <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23418.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23429.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/source-build-reference-packages -->
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23424.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
     <!-- Packages from dotnet/symreader -->
@@ -304,7 +304,7 @@
     <MonoCecilVersion>0.11.2</MonoCecilVersion>
     <MonoTextTemplatingVersion>2.2.1</MonoTextTemplatingVersion>
     <NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
-    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <NSwagApiDescriptionClientVersion>13.0.4</NSwagApiDescriptionClientVersion>
     <PhotinoNETVersion>1.1.6</PhotinoNETVersion>
     <MicrosoftPlaywrightVersion>1.28.0</MicrosoftPlaywrightVersion>

eng/scripts/CodeCheck.ps1

@@ -253,7 +253,7 @@ try {
                     }
                 }
                 # Check for changes in Unshipped in servicing branches
-                if ($targetBranch -like 'release*' -and $targetBranch -notlike '*preview*' -and $file -like '*PublicAPI.Unshipped.txt') {
+                if ($targetBranch -like 'release*' -and $targetBranch -notlike '*preview*' -and $targetBranch -notlike '*rc1*' -and $targetBranch -notlike '*rc2*' -and $file -like '*PublicAPI.Unshipped.txt') {
                     $changedAPIBaselines.Add($file)
                 }
             }
@@ -263,7 +263,8 @@ try {
 
         if ($changedAPIBaselines.count -gt 0) {
             LogError ("Detected modification to baseline API files. PublicAPI.Shipped.txt files should only " +
-                "be updated after a major release. See /docs/APIBaselines.md for more information.")
+                "be updated after a major release, and PublicAPI.Unshipped.txt files should not " +
+                "be updated in release branches. See /docs/APIBaselines.md for more information.")
             LogError "Modified API baseline files:"
             foreach ($file in $changedAPIBaselines) {
                 LogError $file

eng/test-configuration.json

@@ -22,6 +22,7 @@
     {"testName": {"contains": "HEADERS_Received_SecondRequest_ConnectProtocolReset"}},
     {"testName": {"contains": "ClientUsingOldCallWithNewProtocol"}},
     {"testName": {"contains": "CertificateChangedOnDisk"}},
+    {"testName": {"contains": "CertificateChangedOnDisk_Symlink"}},
     {"testAssembly": {"contains": "IIS"}},
     {"testAssembly": {"contains": "Template"}},
     {"failureMessage": {"contains":"(Site is started but no worker process found)"}},

eng/tools/GenerateFiles/Directory.Build.props.in

@@ -8,11 +8,4 @@
     <!-- Temporarily hardcoded to true -->
     <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
   </PropertyGroup>
-
-  <!-- Ignore warning about RID resolution rules changing in .NET 8 Preview 6 -->
-  <!-- Needed until https://github.com/ericsink/SQLitePCL.raw/issues/543 is fixed -->
-  <!-- See https://github.com/dotnet/aspnetcore/pull/48908#issuecomment-1601894643 -->
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
-  </ItemGroup>
 </Project>

eng/tools/RepoTasks/RepoTasks.csproj

@@ -15,6 +15,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Explicitly reference the desired version of Newtonsoft.Json to avoid getting an older version
+         from the dependency on NuGet.Packaging which would cause a source-built prebuilt. -->
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
   </ItemGroup>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.1.23381.2"
+    "version": "8.0.100-rc.2.23422.11"
   },
   "tools": {
-    "dotnet": "8.0.100-rc.1.23381.2",
+    "dotnet": "8.0.100-rc.2.23422.11",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Components/Components/src/CascadingParameterAttribute.cs

@@ -20,5 +20,5 @@ public sealed class CascadingParameterAttribute : CascadingParameterAttributeBas
     /// <see cref="CascadingValue{T}"/>  that supplies a value with a compatible
     /// type.
     /// </summary>
-    public override string? Name { get; set; }
+    public string? Name { get; set; }
 }

src/Components/Components/src/CascadingParameterAttributeBase.cs

@@ -8,12 +8,6 @@ namespace Microsoft.AspNetCore.Components;
 /// </summary>
 public abstract class CascadingParameterAttributeBase : Attribute
 {
-    /// <summary>
-    /// Gets or sets the name for the parameter, which correlates to the name
-    /// of a cascading value.
-    /// </summary>
-    public abstract string? Name { get; set; }
-
     /// <summary>
     /// Gets a flag indicating whether the cascading parameter should
     /// be supplied only once per component.

src/Components/Components/src/CascadingValueServiceCollectionExtensions.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -16,11 +17,11 @@ public static class CascadingValueServiceCollectionExtensions
     /// </summary>
     /// <typeparam name="TValue">The value type.</typeparam>
     /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
-    /// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
+    /// <param name="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
     public static IServiceCollection AddCascadingValue<TValue>(
-        this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> valueFactory)
-        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => valueFactory(sp), isFixed: true));
+        this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> initialValueFactory)
+        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => initialValueFactory(sp), isFixed: true));
 
     /// <summary>
     /// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -29,11 +30,11 @@ public static IServiceCollection AddCascadingValue<TValue>(
     /// <typeparam name="TValue">The value type.</typeparam>
     /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
     /// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
-    /// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
+    /// <param name="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
     public static IServiceCollection AddCascadingValue<TValue>(
-        this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> valueFactory)
-        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => valueFactory(sp), isFixed: true));
+        this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> initialValueFactory)
+        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => initialValueFactory(sp), isFixed: true));
 
     /// <summary>
     /// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -50,4 +51,59 @@ public static IServiceCollection AddCascadingValue<TValue>(
     public static IServiceCollection AddCascadingValue<TValue>(
         this IServiceCollection serviceCollection, Func<IServiceProvider, CascadingValueSource<TValue>> sourceFactory)
         => serviceCollection.AddScoped<ICascadingValueSupplier>(sourceFactory);
+
+    /// <summary>
+    /// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
+    /// with the value type. This is equivalent to having a fixed <see cref="CascadingValue{TValue}"/> at
+    /// the root of the component hierarchy.
+    /// </summary>
+    /// <typeparam name="TValue">The value type.</typeparam>
+    /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static void TryAddCascadingValue<TValue>(
+        this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> valueFactory)
+    {
+        serviceCollection.TryAddEnumerable(
+            ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(
+                sp => new CascadingValueSource<TValue>(() => valueFactory(sp), isFixed: true)));
+    }
+
+    /// <summary>
+    /// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
+    /// with the value type, regardless of the <paramref name="name"/>. This is equivalent to having a fixed
+    /// <see cref="CascadingValue{TValue}"/> at the root of the component hierarchy.
+    /// </summary>
+    /// <typeparam name="TValue">The value type.</typeparam>
+    /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
+    /// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static void TryAddCascadingValue<TValue>(
+        this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> valueFactory)
+    {
+        serviceCollection.TryAddEnumerable(
+            ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(
+                sp => new CascadingValueSource<TValue>(name, () => valueFactory(sp), isFixed: true)));
+    }
+
+    /// <summary>
+    /// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
+    /// with the value type. This is equivalent to having a fixed <see cref="CascadingValue{TValue}"/> at
+    /// the root of the component hierarchy.
+    /// 
+    /// With this overload, you can supply a <see cref="CascadingValueSource{TValue}"/> which allows you
+    /// to notify about updates to the value later, causing recipients to re-render. This overload should
+    /// only be used if you plan to update the value dynamically.
+    /// </summary>
+    /// <typeparam name="TValue">The value type.</typeparam>
+    /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="sourceFactory">A callback that supplies a <see cref="CascadingValueSource{TValue}"/> within each service provider scope.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    public static void TryAddCascadingValue<TValue>(
+        this IServiceCollection serviceCollection, Func<IServiceProvider, CascadingValueSource<TValue>> sourceFactory)
+    {
+        serviceCollection.TryAddEnumerable(
+            ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(sourceFactory));
+    }
 }

src/Components/Components/src/CascadingValueSource.cs

@@ -48,20 +48,20 @@ public CascadingValueSource(string name, TValue value, bool isFixed) : this(valu
     /// <summary>
     /// Constructs an instance of <see cref="CascadingValueSource{TValue}"/>.
     /// </summary>
-    /// <param name="valueFactory">A callback that produces the initial value when first required.</param>
+    /// <param name="initialValueFactory">A callback that produces the initial value when first required.</param>
     /// <param name="isFixed">A flag to indicate whether the value is fixed. If false, all receipients will subscribe for update notifications, which you can issue by calling <see cref="NotifyChangedAsync()"/>. These subscriptions come at a performance cost, so if the value will not change, set <paramref name="isFixed"/> to true.</param>
-    public CascadingValueSource(Func<TValue> valueFactory, bool isFixed) : this(isFixed)
+    public CascadingValueSource(Func<TValue> initialValueFactory, bool isFixed) : this(isFixed)
     {
-        _initialValueFactory = valueFactory;
+        _initialValueFactory = initialValueFactory;
     }
 
     /// <summary>
     /// Constructs an instance of <see cref="CascadingValueSource{TValue}"/>.
     /// </summary>
     /// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
-    /// <param name="valueFactory">A callback that produces the initial value when first required.</param>
+    /// <param name="initialValueFactory">A callback that produces the initial value when first required.</param>
     /// <param name="isFixed">A flag to indicate whether the value is fixed. If false, all receipients will subscribe for update notifications, which you can issue by calling <see cref="NotifyChangedAsync()"/>. These subscriptions come at a performance cost, so if the value will not change, set <paramref name="isFixed"/> to true.</param>
-    public CascadingValueSource(string name, Func<TValue> valueFactory, bool isFixed) : this(valueFactory, isFixed)
+    public CascadingValueSource(string name, Func<TValue> initialValueFactory, bool isFixed) : this(initialValueFactory, isFixed)
     {
         ArgumentNullException.ThrowIfNull(name);
         _name = name;