Skip to content

Commit af88c03

Browse files
wtgodbewtgodbe
authored
Merge pull request #50406 from dotnet/mbuck/revert-release-8.0-to-main
Revert "[automated] Merge branch 'release/8.0' => 'main' (#50281)"
2 parents 9402bfa + 9fff892 commit af88c03

File tree

131 files changed

+1534
-2688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1534
-2688
lines changed

‎Directory.Build.targets

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<!-- Disable IsTrimmable on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1195 and NETSDK1210 errors -->
4-
<IsTrimmable Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsTrimmable>
53
<EnableAOTAnalyzer Condition=" '$(EnableAOTAnalyzer)' == '' ">$([MSBuild]::ValueOrDefault($(IsTrimmable),'false'))</EnableAOTAnalyzer>
64
<!-- TODO: Remove when analyzer is enabled by default with AOT in SDK. See https://github.com/dotnet/sdk/issues/31284 -->
75
<EnableSingleFileAnalyzer Condition=" '$(EnableSingleFileAnalyzer)' == '' ">$(EnableAOTAnalyzer)</EnableSingleFileAnalyzer>

‎eng/CodeGen.proj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
<_RequiresDelayedBuild Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('RequiresDelayedBuild','true')->Distinct())" />
2525
<_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'true'))" />
2626
<_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'false'))" />
27+
<_TrimmableProject Include="@(_ProjectReferenceProvider->WithMetadataValue('IsTrimmable', 'true'))" />
2728
<_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp', 'true'))" />
2829
<_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsShippingPackage', 'true'))" />
2930
<_ShippingAssembly Include="@(_ShippingAssemblyWithDupes->Distinct())" />
30-
<!-- _ProjectReferenceProvider is already Distinct() and does not include metadata for each target framework. -->
31-
<!-- If a project is trimmable for even just one of multiple target frameworks, include it in TrimmableProjects.props. -->
32-
<_TrimmableProject Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('IsTrimmable', 'true')->WithMetadataValue('IsProjectReferenceProvider','true')->Distinct())" />
3331
</ItemGroup>
3432

3533
<PropertyGroup>

‎eng/Version.Details.xml

Lines changed: 142 additions & 142 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎eng/test-configuration.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
{"testName": {"contains": "HEADERS_Received_SecondRequest_ConnectProtocolReset"}},
2323
{"testName": {"contains": "ClientUsingOldCallWithNewProtocol"}},
2424
{"testName": {"contains": "CertificateChangedOnDisk"}},
25-
{"testName": {"contains": "CertificateChangedOnDisk_Symlink"}},
2625
{"testAssembly": {"contains": "IIS"}},
2726
{"testAssembly": {"contains": "Template"}},
2827
{"failureMessage": {"contains":"(Site is started but no worker process found)"}},

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,11 @@
88
<!-- Temporarily hardcoded to true -->
99
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
1010
</PropertyGroup>
11+
12+
<!-- Ignore warning about RID resolution rules changing in .NET 8 Preview 6 -->
13+
<!-- Needed until https://github.com/ericsink/SQLitePCL.raw/issues/543 is fixed -->
14+
<!-- See https://github.com/dotnet/aspnetcore/pull/48908#issuecomment-1601894643 -->
15+
<ItemGroup>
16+
<RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
17+
</ItemGroup>
1118
</Project>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-rc.2.23422.11"
3+
"version": "8.0.100-rc.1.23381.2"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-rc.2.23422.11",
6+
"dotnet": "8.0.100-rc.1.23381.2",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

‎src/Components/Components/src/CascadingParameterAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ public sealed class CascadingParameterAttribute : CascadingParameterAttributeBas
2020
/// <see cref="CascadingValue{T}"/> that supplies a value with a compatible
2121
/// type.
2222
/// </summary>
23-
public string? Name { get; set; }
23+
public override string? Name { get; set; }
2424
}

‎src/Components/Components/src/CascadingParameterAttributeBase.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ namespace Microsoft.AspNetCore.Components;
88
/// </summary>
99
public abstract class CascadingParameterAttributeBase : Attribute
1010
{
11+
/// <summary>
12+
/// Gets or sets the name for the parameter, which correlates to the name
13+
/// of a cascading value.
14+
/// </summary>
15+
public abstract string? Name { get; set; }
16+
1117
/// <summary>
1218
/// Gets a flag indicating whether the cascading parameter should
1319
/// be supplied only once per component.

‎src/Components/Components/src/CascadingValueServiceCollectionExtensions.cs

Lines changed: 6 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.AspNetCore.Components;
5-
using Microsoft.Extensions.DependencyInjection.Extensions;
65

76
namespace Microsoft.Extensions.DependencyInjection;
87

@@ -17,11 +16,11 @@ public static class CascadingValueServiceCollectionExtensions
1716
/// </summary>
1817
/// <typeparam name="TValue">The value type.</typeparam>
1918
/// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
20-
/// <param name="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</param>
19+
/// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
2120
/// <returns>The <see cref="IServiceCollection"/>.</returns>
2221
public static IServiceCollection AddCascadingValue<TValue>(
23-
this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> initialValueFactory)
24-
=> serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => initialValueFactory(sp), isFixed: true));
22+
this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> valueFactory)
23+
=> serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(() => valueFactory(sp), isFixed: true));
2524

2625
/// <summary>
2726
/// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -30,11 +29,11 @@ public static IServiceCollection AddCascadingValue<TValue>(
3029
/// <typeparam name="TValue">The value type.</typeparam>
3130
/// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
3231
/// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
33-
/// <param name="initialValueFactory">A callback that supplies a fixed value within each service provider scope.</param>
32+
/// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
3433
/// <returns>The <see cref="IServiceCollection"/>.</returns>
3534
public static IServiceCollection AddCascadingValue<TValue>(
36-
this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> initialValueFactory)
37-
=> serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => initialValueFactory(sp), isFixed: true));
35+
this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> valueFactory)
36+
=> serviceCollection.AddScoped<ICascadingValueSupplier>(sp => new CascadingValueSource<TValue>(name, () => valueFactory(sp), isFixed: true));
3837

3938
/// <summary>
4039
/// Adds a cascading value to the <paramref name="serviceCollection"/>. This is equivalent to having
@@ -51,59 +50,4 @@ public static IServiceCollection AddCascadingValue<TValue>(
5150
public static IServiceCollection AddCascadingValue<TValue>(
5251
this IServiceCollection serviceCollection, Func<IServiceProvider, CascadingValueSource<TValue>> sourceFactory)
5352
=> serviceCollection.AddScoped<ICascadingValueSupplier>(sourceFactory);
54-
55-
/// <summary>
56-
/// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
57-
/// with the value type. This is equivalent to having a fixed <see cref="CascadingValue{TValue}"/> at
58-
/// the root of the component hierarchy.
59-
/// </summary>
60-
/// <typeparam name="TValue">The value type.</typeparam>
61-
/// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
62-
/// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
63-
/// <returns>The <see cref="IServiceCollection"/>.</returns>
64-
public static void TryAddCascadingValue<TValue>(
65-
this IServiceCollection serviceCollection, Func<IServiceProvider, TValue> valueFactory)
66-
{
67-
serviceCollection.TryAddEnumerable(
68-
ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(
69-
sp => new CascadingValueSource<TValue>(() => valueFactory(sp), isFixed: true)));
70-
}
71-
72-
/// <summary>
73-
/// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
74-
/// with the value type, regardless of the <paramref name="name"/>. This is equivalent to having a fixed
75-
/// <see cref="CascadingValue{TValue}"/> at the root of the component hierarchy.
76-
/// </summary>
77-
/// <typeparam name="TValue">The value type.</typeparam>
78-
/// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
79-
/// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
80-
/// <param name="valueFactory">A callback that supplies a fixed value within each service provider scope.</param>
81-
/// <returns>The <see cref="IServiceCollection"/>.</returns>
82-
public static void TryAddCascadingValue<TValue>(
83-
this IServiceCollection serviceCollection, string name, Func<IServiceProvider, TValue> valueFactory)
84-
{
85-
serviceCollection.TryAddEnumerable(
86-
ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(
87-
sp => new CascadingValueSource<TValue>(name, () => valueFactory(sp), isFixed: true)));
88-
}
89-
90-
/// <summary>
91-
/// Adds a cascading value to the <paramref name="serviceCollection"/>, if none is already registered
92-
/// with the value type. This is equivalent to having a fixed <see cref="CascadingValue{TValue}"/> at
93-
/// the root of the component hierarchy.
94-
///
95-
/// With this overload, you can supply a <see cref="CascadingValueSource{TValue}"/> which allows you
96-
/// to notify about updates to the value later, causing recipients to re-render. This overload should
97-
/// only be used if you plan to update the value dynamically.
98-
/// </summary>
99-
/// <typeparam name="TValue">The value type.</typeparam>
100-
/// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
101-
/// <param name="sourceFactory">A callback that supplies a <see cref="CascadingValueSource{TValue}"/> within each service provider scope.</param>
102-
/// <returns>The <see cref="IServiceCollection"/>.</returns>
103-
public static void TryAddCascadingValue<TValue>(
104-
this IServiceCollection serviceCollection, Func<IServiceProvider, CascadingValueSource<TValue>> sourceFactory)
105-
{
106-
serviceCollection.TryAddEnumerable(
107-
ServiceDescriptor.Scoped<ICascadingValueSupplier, CascadingValueSource<TValue>>(sourceFactory));
108-
}
10953
}

‎src/Components/Components/src/CascadingValueSource.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ public CascadingValueSource(string name, TValue value, bool isFixed) : this(valu
4848
/// <summary>
4949
/// Constructs an instance of <see cref="CascadingValueSource{TValue}"/>.
5050
/// </summary>
51-
/// <param name="initialValueFactory">A callback that produces the initial value when first required.</param>
51+
/// <param name="valueFactory">A callback that produces the initial value when first required.</param>
5252
/// <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>
53-
public CascadingValueSource(Func<TValue> initialValueFactory, bool isFixed) : this(isFixed)
53+
public CascadingValueSource(Func<TValue> valueFactory, bool isFixed) : this(isFixed)
5454
{
55-
_initialValueFactory = initialValueFactory;
55+
_initialValueFactory = valueFactory;
5656
}
5757

5858
/// <summary>
5959
/// Constructs an instance of <see cref="CascadingValueSource{TValue}"/>.
6060
/// </summary>
6161
/// <param name="name">A name for the cascading value. If set, <see cref="CascadingParameterAttribute"/> can be configured to match based on this name.</param>
62-
/// <param name="initialValueFactory">A callback that produces the initial value when first required.</param>
62+
/// <param name="valueFactory">A callback that produces the initial value when first required.</param>
6363
/// <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>
64-
public CascadingValueSource(string name, Func<TValue> initialValueFactory, bool isFixed) : this(initialValueFactory, isFixed)
64+
public CascadingValueSource(string name, Func<TValue> valueFactory, bool isFixed) : this(valueFactory, isFixed)
6565
{
6666
ArgumentNullException.ThrowIfNull(name);
6767
_name = name;

0 commit comments

Comments
 (0)