Skip to content

Commit 625ef7c

Browse files
committed
Fixup
1 parent b540b53 commit 625ef7c

10 files changed

+24
-24
lines changed

src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public void AddContent(int sequence, string? textContent) { }
411411
public void AddContent<TValue>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<TValue>? fragment, TValue value) { }
412412
public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
413413
public void AddMarkupContent(int sequence, string? markupContent) { }
414-
public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object?>>? attributes) { }
414+
public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>? attributes) { }
415415
public void Clear() { }
416416
public void CloseComponent() { }
417417
public void CloseElement() { }

src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public void AddContent(int sequence, string? textContent) { }
410410
public void AddContent<TValue>(int sequence, Microsoft.AspNetCore.Components.RenderFragment<TValue>? fragment, TValue value) { }
411411
public void AddElementReferenceCapture(int sequence, System.Action<Microsoft.AspNetCore.Components.ElementReference> elementReferenceCaptureAction) { }
412412
public void AddMarkupContent(int sequence, string? markupContent) { }
413-
public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object?>>? attributes) { }
413+
public void AddMultipleAttributes(int sequence, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>>? attributes) { }
414414
public void Clear() { }
415415
public void CloseComponent() { }
416416
public void CloseElement() { }

src/Components/Components/src/Rendering/RenderTreeBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public void AddAttribute(int sequence, in RenderTreeFrame frame)
399399
/// </summary>
400400
/// <param name="sequence">An integer that represents the position of the instruction in the source code.</param>
401401
/// <param name="attributes">A collection of key-value pairs representing attributes.</param>
402-
public void AddMultipleAttributes(int sequence, IEnumerable<KeyValuePair<string, object?>>? attributes)
402+
public void AddMultipleAttributes(int sequence, IEnumerable<KeyValuePair<string, object>>? attributes)
403403
{
404404
// Calling this up-front just to make sure we validate before mutating anything.
405405
AssertCanAddAttribute();

src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase
2626
{
2727
public EditForm() { }
2828
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
29-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
29+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
3030
[Microsoft.AspNetCore.Components.ParameterAttribute]
3131
public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.Forms.EditContext>? ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
3232
[Microsoft.AspNetCore.Components.ParameterAttribute]
@@ -46,7 +46,7 @@ public abstract partial class InputBase<TValue> : Microsoft.AspNetCore.Component
4646
{
4747
protected InputBase() { }
4848
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
49-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
49+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
5050
protected string CssClass { get { throw null; } }
5151
[System.Diagnostics.CodeAnalysis.MaybeNullAttribute]
5252
[System.Diagnostics.CodeAnalysis.AllowNullAttribute]
@@ -92,7 +92,7 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
9292
protected override string? FormatValueAsString(TValue value) { throw null; }
9393
protected override bool TryParseValueFromString(string? value, [System.Diagnostics.CodeAnalysis.MaybeNullAttribute] out TValue result, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(false)] out string? validationErrorMessage) { throw null; }
9494
}
95-
public partial class InputSelect<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue> where TValue : notnull
95+
public partial class InputSelect<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue>
9696
{
9797
public InputSelect() { }
9898
[Microsoft.AspNetCore.Components.ParameterAttribute]
@@ -116,7 +116,7 @@ public partial class ValidationMessage<TValue> : Microsoft.AspNetCore.Components
116116
{
117117
public ValidationMessage() { }
118118
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
119-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
119+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
120120
[Microsoft.AspNetCore.Components.ParameterAttribute]
121121
public System.Linq.Expressions.Expression<System.Func<TValue>>? For { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
122122
protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
@@ -128,7 +128,7 @@ public partial class ValidationSummary : Microsoft.AspNetCore.Components.Compone
128128
{
129129
public ValidationSummary() { }
130130
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
131-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
131+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
132132
[Microsoft.AspNetCore.Components.ParameterAttribute]
133133
public object? Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
134134
protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
@@ -156,7 +156,7 @@ public NavLink() { }
156156
[Microsoft.AspNetCore.Components.ParameterAttribute]
157157
public string? ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
158158
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
159-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
159+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
160160
[Microsoft.AspNetCore.Components.ParameterAttribute]
161161
public Microsoft.AspNetCore.Components.RenderFragment? ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
162162
protected string? CssClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }

src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public partial class EditForm : Microsoft.AspNetCore.Components.ComponentBase
2626
{
2727
public EditForm() { }
2828
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
29-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
29+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
3030
[Microsoft.AspNetCore.Components.ParameterAttribute]
3131
public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.Forms.EditContext>? ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
3232
[Microsoft.AspNetCore.Components.ParameterAttribute]
@@ -46,7 +46,7 @@ public abstract partial class InputBase<TValue> : Microsoft.AspNetCore.Component
4646
{
4747
protected InputBase() { }
4848
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
49-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
49+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
5050
protected string CssClass { get { throw null; } }
5151
protected TValue CurrentValue { get { throw null; } set { } }
5252
protected string? CurrentValueAsString { get { throw null; } set { } }
@@ -88,7 +88,7 @@ protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Renderin
8888
protected override string? FormatValueAsString(TValue value) { throw null; }
8989
protected override bool TryParseValueFromString(string? value, out TValue result, out string? validationErrorMessage) { throw null; }
9090
}
91-
public partial class InputSelect<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue> where TValue : notnull
91+
public partial class InputSelect<TValue> : Microsoft.AspNetCore.Components.Forms.InputBase<TValue>
9292
{
9393
public InputSelect() { }
9494
[Microsoft.AspNetCore.Components.ParameterAttribute]
@@ -112,7 +112,7 @@ public partial class ValidationMessage<TValue> : Microsoft.AspNetCore.Components
112112
{
113113
public ValidationMessage() { }
114114
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
115-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
115+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
116116
[Microsoft.AspNetCore.Components.ParameterAttribute]
117117
public System.Linq.Expressions.Expression<System.Func<TValue>>? For { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
118118
protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
@@ -124,7 +124,7 @@ public partial class ValidationSummary : Microsoft.AspNetCore.Components.Compone
124124
{
125125
public ValidationSummary() { }
126126
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
127-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
127+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
128128
[Microsoft.AspNetCore.Components.ParameterAttribute]
129129
public object? Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
130130
protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { }
@@ -152,7 +152,7 @@ public NavLink() { }
152152
[Microsoft.AspNetCore.Components.ParameterAttribute]
153153
public string? ActiveClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
154154
[Microsoft.AspNetCore.Components.ParameterAttribute(CaptureUnmatchedValues=true)]
155-
public System.Collections.Generic.IReadOnlyDictionary<string, object?>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
155+
public System.Collections.Generic.IReadOnlyDictionary<string, object>? AdditionalAttributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
156156
[Microsoft.AspNetCore.Components.ParameterAttribute]
157157
public Microsoft.AspNetCore.Components.RenderFragment? ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
158158
protected string? CssClass { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }

src/Components/Web/src/Forms/EditForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public EditForm()
2929
/// <summary>
3030
/// Gets or sets a collection of additional attributes that will be applied to the created <c>form</c> element.
3131
/// </summary>
32-
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object?>? AdditionalAttributes { get; set; }
32+
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
3333

3434
/// <summary>
3535
/// Supplies the edit context explicitly. If using this parameter, do not

src/Components/Web/src/Forms/InputBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public abstract class InputBase<TValue> : ComponentBase, IDisposable
2727
/// <summary>
2828
/// Gets or sets a collection of additional attributes that will be applied to the created element.
2929
/// </summary>
30-
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object?>? AdditionalAttributes { get; set; }
30+
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
3131

3232
/// <summary>
3333
/// Gets or sets the value of the input. This should be used with two-way binding.
@@ -261,21 +261,21 @@ private void SetAdditionalAttributesIfValidationFailed()
261261
/// Returns a dictionary with the same values as the specified <paramref name="source"/>.
262262
/// </summary>
263263
/// <returns>true, if a new dictrionary with copied values was created. false - otherwise.</returns>
264-
private bool ConvertToDictionary(IReadOnlyDictionary<string, object?>? source, out Dictionary<string, object?> result)
264+
private bool ConvertToDictionary(IReadOnlyDictionary<string, object>? source, out Dictionary<string, object> result)
265265
{
266266
var newDictionaryCreated = true;
267267
if (source == null)
268268
{
269-
result = new Dictionary<string, object?>();
269+
result = new Dictionary<string, object>();
270270
}
271-
else if (source is Dictionary<string, object?> currentDictionary)
271+
else if (source is Dictionary<string, object> currentDictionary)
272272
{
273273
result = currentDictionary;
274274
newDictionaryCreated = false;
275275
}
276276
else
277277
{
278-
result = new Dictionary<string, object?>();
278+
result = new Dictionary<string, object>();
279279
foreach (var item in source)
280280
{
281281
result.Add(item.Key, item.Value);

src/Components/Web/src/Forms/ValidationMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ValidationMessage<TValue> : ComponentBase, IDisposable
2121
/// <summary>
2222
/// Gets or sets a collection of additional attributes that will be applied to the created <c>div</c> element.
2323
/// </summary>
24-
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object?>? AdditionalAttributes { get; set; }
24+
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
2525

2626
[CascadingParameter] EditContext CurrentEditContext { get; set; } = default!;
2727

src/Components/Web/src/Forms/ValidationSummary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ValidationSummary : ComponentBase, IDisposable
2828
/// <summary>
2929
/// Gets or sets a collection of additional attributes that will be applied to the created <c>ul</c> element.
3030
/// </summary>
31-
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object?>? AdditionalAttributes { get; set; }
31+
[Parameter(CaptureUnmatchedValues = true)] public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
3232

3333
[CascadingParameter] EditContext CurrentEditContext { get; set; } = default!;
3434

src/Components/Web/src/Routing/NavLink.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class NavLink : ComponentBase, IDisposable
3232
/// <c>a</c> element.
3333
/// </summary>
3434
[Parameter(CaptureUnmatchedValues = true)]
35-
public IReadOnlyDictionary<string, object?>? AdditionalAttributes { get; set; }
35+
public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
3636

3737
/// <summary>
3838
/// Gets or sets the computed CSS class based on whether or not the link is active.

0 commit comments

Comments
 (0)