Merge pull request #50406 from dotnet/mbuck/revert-release-8.0-to-main

Revert "[automated] Merge branch 'release/8.0' => 'main' (#50281)"

Author: wtgodbe

Directory.Build.targets

@@ -1,7 +1,5 @@
 <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,12 +24,10 @@
       <_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

@@ -22,7 +22,6 @@
     {"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/Versions.props

@@ -8,4 +8,11 @@
     <!-- 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/test-configuration.json

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

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

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

global.json

@@ -8,6 +8,12 @@ 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/CascadingParameterAttribute.cs

@@ -2,7 +2,6 @@
 // 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;
 
@@ -17,11 +16,11 @@ public static class CascadingValueServiceCollectionExtensions
     /// </summary>
     /// <typeparam name="TValue">The value type.</typeparam>
     /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
-    /// <param name="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</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 IServiceCollection AddCascadingValue<TValue>(
-        this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> initialValueFactory)
-        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => initialValueFactory(sp), isFixed: true));
+        this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> valueFactory)
+        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => valueFactory(sp), isFixed: true));
 
     /// <summary>
     /// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -30,11 +29,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="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</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 IServiceCollection AddCascadingValue<TValue>(
-        this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> initialValueFactory)
-        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => initialValueFactory(sp), isFixed: true));
+        this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> valueFactory)
+        => serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => valueFactory(sp), isFixed: true));
 
     /// <summary>
     /// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -51,59 +50,4 @@ 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));
-    }
 }