feat: add StringSyntaxAttribute for guid and timespan args

NuGet.config

@@ -5,6 +5,7 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <!-- Used for the SiteExtension bits that are included in the 8.0 build -->

eng/Dependencies.props

@@ -40,6 +40,8 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <LatestPackageReference Include="Microsoft.Extensions.DependencyModel" />
     <LatestPackageReference Include="Microsoft.Extensions.DiagnosticAdapter" />
+    <LatestPackageReference Include="Microsoft.Extensions.Diagnostics.Abstractions" />
+    <LatestPackageReference Include="Microsoft.Extensions.Diagnostics" />
     <LatestPackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <LatestPackageReference Include="Microsoft.Extensions.FileProviders.Composite" />
     <LatestPackageReference Include="Microsoft.Extensions.FileProviders.Physical" />

eng/SharedFramework.External.props

@@ -21,6 +21,8 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Configuration"                           Version="$(MicrosoftExtensionsConfigurationVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"        Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.DependencyInjection"                     Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics.Abstractions"                Version="$(MicrosoftExtensionsDiagnosticsVersion)" />
+    <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Diagnostics"                             Version="$(MicrosoftExtensionsDiagnosticsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Abstractions"              Version="$(MicrosoftExtensionsFileProvidersAbstractionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Composite"                 Version="$(MicrosoftExtensionsFileProvidersCompositeVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.FileProviders.Physical"                  Version="$(MicrosoftExtensionsFileProvidersPhysicalVersion)" />

eng/test-configuration.json

@@ -17,6 +17,7 @@
     {"testName": {"contains": "POST_ServerAbort_ClientReceivesAbort"}},
     {"testName": {"contains": "POST_ServerAbortAfterWrite_ClientReceivesAbort"}},
     {"testName": {"contains": "ServerReset_BeforeRequestBody_ClientBodyThrows"}},
+    {"testName": {"contains": "InjectedStartup_DefaultApplicationNameIsEntryAssembly"}},
     {"testAssembly": {"contains": "IIS"}},
     {"testAssembly": {"contains": "Template"}},
     {"failureMessage": {"contains":"(Site is started but no worker process found)"}},

eng/testing/linker/SupportFiles/Directory.Build.props

@@ -5,7 +5,7 @@
 
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>
-    <PublishSelfContained>true</PublishSelfContained>
+    <SelfContained>true</SelfContained>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <!-- Enable NuGet static graph evaluation to optimize incremental restore -->
     <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>

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

@@ -139,7 +139,7 @@
           BeforeTargets="ProcessFrameworkReferences">
     <ItemGroup>
       <KnownILLinkPack Include="@(KnownILLinkPack)"
-                       Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'"
+                       Condition="'%(TargetFramework)' == 'net7.0'"
                        TargetFramework="netstandard2.1"
                        ILLinkPackVersion="%(KnownILLinkPack.ILLinkPackVersion)" />
     </ItemGroup>

global.json

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

src/Components/Authorization/test/AuthorizeRouteViewTest.cs

@@ -1,8 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Binding;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
@@ -32,6 +34,7 @@ public AuthorizeRouteViewTest()
         serviceCollection.AddSingleton<IAuthorizationPolicyProvider, TestAuthorizationPolicyProvider>();
         serviceCollection.AddSingleton<IAuthorizationService>(_testAuthorizationService);
         serviceCollection.AddSingleton<NavigationManager, TestNavigationManager>();
+        serviceCollection.AddSingleton<IFormValueSupplier, TestFormValueSupplier>();
 
         var services = serviceCollection.BuildServiceProvider();
         _renderer = new TestRenderer(services);
@@ -467,4 +470,23 @@ public TestNavigationManager()
             Initialize("https://localhost:85/subdir/", "https://localhost:85/subdir/path?query=value#hash");
         }
     }
+
+    private class TestFormValueSupplier : IFormValueSupplier
+    {
+        public bool CanBind(string formName, Type valueType)
+        {
+            return false;
+        }
+
+        public bool CanConvertSingleValue(Type type)
+        {
+            return false;
+        }
+
+        public bool TryBind(string formName, Type valueType, [NotNullWhen(true)] out object boundValue)
+        {
+            boundValue = null;
+            return false;
+        }
+    }
 }

src/Components/Components/src/BindConverter.cs

@@ -1223,7 +1223,7 @@ private static bool ConvertToDateTimeCore(object? obj, CultureInfo? culture, out
         return ConvertToDateTimeCore(obj, culture, format: null, out value);
     }
 
-    private static bool ConvertToDateTimeCore(object? obj, CultureInfo? culture, string? format, out DateTime value)
+    private static bool ConvertToDateTimeCore(object? obj, CultureInfo? culture, [StringSyntax(StringSyntaxAttribute.TimeSpanFormat)] string? format, out DateTime value)
     {
         var text = (string?)obj;
         if (string.IsNullOrEmpty(text))
@@ -1252,7 +1252,7 @@ private static bool ConvertToNullableDateTimeCore(object? obj, CultureInfo? cult
         return ConvertToNullableDateTimeCore(obj, culture, format: null, out value);
     }
 
-    private static bool ConvertToNullableDateTimeCore(object? obj, CultureInfo? culture, string? format, out DateTime? value)
+    private static bool ConvertToNullableDateTimeCore(object? obj, CultureInfo? culture,  [StringSyntax(StringSyntaxAttribute.DateTimeFormat)] string? format, out DateTime? value)
     {
         var text = (string?)obj;
         if (string.IsNullOrEmpty(text))
@@ -1336,7 +1336,7 @@ private static bool ConvertToDateTimeOffsetCore(object? obj, CultureInfo? cultur
         return ConvertToDateTimeOffsetCore(obj, culture, format: null, out value);
     }
 
-    private static bool ConvertToDateTimeOffsetCore(object? obj, CultureInfo? culture, string? format, out DateTimeOffset value)
+    private static bool ConvertToDateTimeOffsetCore(object? obj, CultureInfo? culture, [StringSyntax(StringSyntaxAttribute.DateTimeFormat)] string? format, out DateTimeOffset value)
     {
         var text = (string?)obj;
         if (string.IsNullOrEmpty(text))
@@ -1365,7 +1365,7 @@ private static bool ConvertToNullableDateTimeOffsetCore(object? obj, CultureInfo
         return ConvertToNullableDateTimeOffsetCore(obj, culture, format: null, out value);
     }
 
-    private static bool ConvertToNullableDateTimeOffsetCore(object? obj, CultureInfo? culture, string? format, out DateTimeOffset? value)
+    private static bool ConvertToNullableDateTimeOffsetCore(object? obj, CultureInfo? culture, [StringSyntax(StringSyntaxAttribute.DateTimeFormat)] string? format, out DateTimeOffset? value)
     {
         var text = (string?)obj;
         if (string.IsNullOrEmpty(text))

src/Components/Components/src/Binding/CascadingModelBinder.cs

@@ -2,18 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Reflection.Metadata;
+using Microsoft.AspNetCore.Components.Binding;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Routing;
 
 namespace Microsoft.AspNetCore.Components;
 
 /// <summary>
 /// Defines the binding context for data bound from external sources.
 /// </summary>
-public sealed class CascadingModelBinder : IComponent, IDisposable
+public sealed class CascadingModelBinder : IComponent, ICascadingValueComponent, IDisposable
 {
     private RenderHandle _handle;
     private ModelBindingContext? _bindingContext;
     private bool _hasPendingQueuedRender;
+    private BindingInfo? _bindingInfo;
 
     /// <summary>
     /// The binding context name.
@@ -35,7 +38,9 @@ public sealed class CascadingModelBinder : IComponent, IDisposable
 
     [CascadingParameter] ModelBindingContext? ParentContext { get; set; }
 
-    [Inject] private NavigationManager Navigation { get; set; } = null!;
+    [Inject] internal NavigationManager Navigation { get; set; } = null!;
+
+    [Inject] internal IFormValueSupplier FormValueSupplier { get; set; } = null!;
 
     void IComponent.Attach(RenderHandle renderHandle)
     {
@@ -87,7 +92,7 @@ private void HandleLocationChanged(object? sender, LocationChangedEventArgs e)
         Render();
     }
 
-    private void UpdateBindingInformation(string url)
+    internal void UpdateBindingInformation(string url)
     {
         // BindingContextId: action parameter used to define the handler
         // Name: form name and context used to bind
@@ -103,13 +108,13 @@ private void UpdateBindingInformation(string url)
         // 3) Parent has a name "parent-name"
         // Name = "parent-name.my-handler";
         // BindingContextId = <<base-relative-uri>>((<<existing-query>>&)|?)handler=my-handler
-        var name = string.IsNullOrEmpty(ParentContext?.Name) ? Name : $"{ParentContext.Name}.{Name}";
+        var name = ModelBindingContext.Combine(ParentContext, Name);
         var bindingId = string.IsNullOrEmpty(name) ? "" : GenerateBindingContextId(name);
 
         var bindingContext = _bindingContext != null &&
-            string.Equals(_bindingContext.Name, Name, StringComparison.Ordinal) &&
+            string.Equals(_bindingContext.Name, name, StringComparison.Ordinal) &&
             string.Equals(_bindingContext.BindingContextId, bindingId, StringComparison.Ordinal) ?
-            _bindingContext : new ModelBindingContext(name, bindingId);
+            _bindingContext : new ModelBindingContext(name, bindingId, FormValueSupplier.CanConvertSingleValue);
 
         // It doesn't matter that we don't check IsFixed, since the CascadingValue we are setting up will throw if the app changes.
         if (IsFixed && _bindingContext != null && _bindingContext != bindingContext)
@@ -136,4 +141,54 @@ void IDisposable.Dispose()
     {
         Navigation.LocationChanged -= HandleLocationChanged;
     }
+
+    bool ICascadingValueComponent.CanSupplyValue(Type valueType, string? valueName)
+    {
+        var formName = string.IsNullOrEmpty(valueName) ?
+            (_bindingContext?.Name) :
+            ModelBindingContext.Combine(_bindingContext, valueName);
+
+        if (_bindingInfo != null &&
+            string.Equals(_bindingInfo.FormName, formName, StringComparison.Ordinal) &&
+            _bindingInfo.ValueType.Equals(valueType))
+        {
+            // We already bound the value, but some component might have been destroyed and
+            // re-created. If the type and name of the value that we bound are the same,
+            // we can provide the value that we bound.
+            return true;
+        }
+
+        // Can't supply the value if this context is for a form with a different name.
+        if (FormValueSupplier.CanBind(formName!, valueType))
+        {
+            var bindingSucceeded = FormValueSupplier.TryBind(formName!, valueType, out var boundValue);
+            _bindingInfo = new BindingInfo(formName, valueType, bindingSucceeded, boundValue);
+            if (!bindingSucceeded)
+            {
+                // Report errors
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    void ICascadingValueComponent.Subscribe(ComponentState subscriber)
+    {
+        throw new InvalidOperationException("Form values are always fixed.");
+    }
+
+    void ICascadingValueComponent.Unsubscribe(ComponentState subscriber)
+    {
+        throw new InvalidOperationException("Form values are always fixed.");
+    }
+
+    object? ICascadingValueComponent.CurrentValue => _bindingInfo == null ?
+        throw new InvalidOperationException("Tried to access form value before it was bound.") :
+        _bindingInfo.BoundValue;
+
+    bool ICascadingValueComponent.CurrentValueIsFixed => true;
+
+    private record BindingInfo(string? FormName, Type ValueType, bool BindingResult, object? BoundValue);
 }

src/Components/Components/src/Binding/IFormValueSupplier.cs

@@ -0,0 +1,37 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.AspNetCore.Components.Binding;
+
+/// <summary>
+/// Binds form data valuesto a model.
+/// </summary>
+public interface IFormValueSupplier
+{
+    /// <summary>
+    /// Determines whether the specified value type can be bound.
+    /// </summary>
+    /// <param name="formName">The form name to bind data from.</param>
+    /// <param name="valueType">The <see cref="Type"/> for the value to bind.</param>
+    /// <returns><c>true</c> if the value type can be bound; otherwise, <c>false</c>.</returns>
+    bool CanBind(string formName, Type valueType);
+
+    /// <summary>
+    /// Determines whether a given <see cref="Type"/> can be converted from a single string value.
+    /// For example, strings, numbers, boolean values, enums, guids, etc. fall in this category.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/> to check.</param>
+    /// <returns><c>true</c> if the type can be converted from a single string value; otherwise, <c>false</c>.</returns>
+    bool CanConvertSingleValue(Type type);
+
+    /// <summary>
+    /// Tries to bind the form with the specified name to a value of the specified type.
+    /// </summary>
+    /// <param name="formName">The form name to bind data from.</param>
+    /// <param name="valueType">The <see cref="Type"/> for the value to bind.</param>
+    /// <param name="boundValue">The bound value if succeeded.</param>
+    /// <returns><c>true</c> if the form was bound successfully; otherwise, <c>false</c>.</returns>
+    bool TryBind(string formName, Type valueType, [NotNullWhen(true)] out object? boundValue);
+}

src/Components/Components/src/Binding/ModelBindingContext.cs

@@ -8,10 +8,13 @@ namespace Microsoft.AspNetCore.Components;
 /// </summary>
 public sealed class ModelBindingContext
 {
-    internal ModelBindingContext(string name, string bindingContextId)
+    private readonly Predicate<Type> _canBind;
+
+    internal ModelBindingContext(string name, string bindingContextId, Predicate<Type> canBind)
     {
         ArgumentNullException.ThrowIfNull(name);
         ArgumentNullException.ThrowIfNull(bindingContextId);
+        ArgumentNullException.ThrowIfNull(canBind);
         // We are initializing the root context, that can be a "named" root context, or the default context.
         // A named root context only provides a name, and that acts as the BindingId
         // A "default" root context does not provide a name, and instead it provides an explicit Binding ID.
@@ -23,6 +26,7 @@ internal ModelBindingContext(string name, string bindingContextId)
 
         Name = name;
         BindingContextId = bindingContextId ?? name;
+        _canBind = canBind;
     }
 
     /// <summary>
@@ -34,4 +38,12 @@ internal ModelBindingContext(string name, string bindingContextId)
     /// The computed identifier used to determine what parts of the app can bind data.
     /// </summary>
     public string BindingContextId { get; }
+
+    internal static string Combine(ModelBindingContext? parentContext, string name) =>
+        string.IsNullOrEmpty(parentContext?.Name) ? name : $"{parentContext.Name}.{name}";
+
+    internal bool CanConvert(Type type)
+    {
+        return _canBind(type);
+    }
 }

src/Components/Components/src/CascadingParameterState.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Components.Reflection;
 using Microsoft.AspNetCore.Components.Rendering;
@@ -45,11 +46,8 @@ public static IReadOnlyList<CascadingParameterState> FindCascadingParameters(Com
             var supplier = GetMatchingCascadingValueSupplier(info, componentState);
             if (supplier != null)
             {
-                if (resultStates == null)
-                {
-                    // Although not all parameters might be matched, we know the maximum number
-                    resultStates = new List<CascadingParameterState>(infos.Length - infoIndex);
-                }
+                // Although not all parameters might be matched, we know the maximum number
+                resultStates ??= new List<CascadingParameterState>(infos.Length - infoIndex);
 
                 resultStates.Add(new CascadingParameterState(info.ConsumerValueName, supplier));
             }
@@ -98,16 +96,25 @@ private static ReflectedCascadingParameterInfo[] CreateReflectedCascadingParamet
             var attribute = prop.GetCustomAttribute<CascadingParameterAttribute>();
             if (attribute != null)
             {
-                if (result == null)
-                {
-                    result = new List<ReflectedCascadingParameterInfo>();
-                }
+                result ??= new List<ReflectedCascadingParameterInfo>();
 
                 result.Add(new ReflectedCascadingParameterInfo(
                     prop.Name,
                     prop.PropertyType,
                     attribute.Name));
             }
+
+            var hostParameterAttribute = prop.GetCustomAttributes()
+                .OfType<IHostEnvironmentCascadingParameter>().SingleOrDefault();
+            if (hostParameterAttribute != null)
+            {
+                result ??= new List<ReflectedCascadingParameterInfo>();
+
+                result.Add(new ReflectedCascadingParameterInfo(
+                    prop.Name,
+                    prop.PropertyType,
+                    hostParameterAttribute.Name));
+            }
         }
 
         return result?.ToArray() ?? Array.Empty<ReflectedCascadingParameterInfo>();

src/Components/Components/src/ComponentBase.cs

@@ -327,7 +327,7 @@ Task IHandleEvent.HandleEventAsync(EventCallbackWorkItem callback, object? arg)
     Task IHandleAfterRender.OnAfterRenderAsync()
     {
         var firstRender = !_hasCalledOnAfterRender;
-        _hasCalledOnAfterRender |= true;
+        _hasCalledOnAfterRender = true;
 
         OnAfterRender(firstRender);