diff --git a/global.json b/global.json index 1b175fca51f6..1fb85e996c08 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-alpha.1.24616.1" + "version": "10.0.100-alpha.1.25056.1" }, "tools": { - "dotnet": "10.0.100-alpha.1.24616.1", + "dotnet": "10.0.100-alpha.1.25056.1", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" diff --git a/src/Components/Components/src/RouteView.cs b/src/Components/Components/src/RouteView.cs index e5c0a5e2916c..46cda45a0fed 100644 --- a/src/Components/Components/src/RouteView.cs +++ b/src/Components/Components/src/RouteView.cs @@ -28,9 +28,6 @@ static RouteView() } } - [Inject] - private NavigationManager NavigationManager { get; set; } - /// /// Gets or sets the route data. This determines the page that will be /// displayed and the parameter values that will be supplied to the page. diff --git a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs index 2fb2a68b6d0d..e15b90c0e42d 100644 --- a/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs +++ b/src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs @@ -52,10 +52,12 @@ public static IDisposable EnableDataAnnotationsValidation(this EditContext editC private static event Action? OnClearCache; +#pragma warning disable IDE0051 // Remove unused private members private static void ClearCache(Type[]? _) { OnClearCache?.Invoke(); } +#pragma warning restore IDE0051 // Remove unused private members private sealed class DataAnnotationsEventSubscriptions : IDisposable { diff --git a/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs index 9ee20854dae7..844042cf14d9 100644 --- a/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs +++ b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs @@ -77,34 +77,4 @@ void IInternalAlgorithmConfiguration.Validate() using var encryptor = factory.CreateAuthenticatedEncryptorInstance(secret, this); encryptor.PerformSelfTest(); } - - // Any changes to this method should also be be reflected - // in ManagedAuthenticatedEncryptorDescriptorDeserializer.FriendlyNameToType. - private static string TypeToFriendlyName(Type type) - { - if (type == typeof(Aes)) - { - return nameof(Aes); - } - else if (type == typeof(HMACSHA1)) - { - return nameof(HMACSHA1); - } - else if (type == typeof(HMACSHA256)) - { - return nameof(HMACSHA256); - } - else if (type == typeof(HMACSHA384)) - { - return nameof(HMACSHA384); - } - else if (type == typeof(HMACSHA512)) - { - return nameof(HMACSHA512); - } - else - { - return type.AssemblyQualifiedName!; - } - } } diff --git a/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs b/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs index 4d6948ff9e3c..3e2cccbb422c 100644 --- a/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs +++ b/src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs @@ -208,7 +208,6 @@ public RouteValueDictionary(RouteValueDictionary? dictionary) _arrayStorage = Array.Empty>(); } } -#endif [MemberNotNull(nameof(_arrayStorage))] private void Initialize(IEnumerable> stringValueEnumerable) @@ -221,21 +220,9 @@ private void Initialize(IEnumerable> stringValueEn } } - [MemberNotNull(nameof(_arrayStorage))] - private void Initialize(IEnumerable> keyValueEnumerable) - { - _arrayStorage = Array.Empty>(); - - foreach (var kvp in keyValueEnumerable) - { - Add(kvp.Key, kvp.Value); - } - } - [MemberNotNull(nameof(_arrayStorage))] private void Initialize(RouteValueDictionary dictionary) { -#if !COMPONENTS if (dictionary._propertyStorage != null) { // PropertyStorage is immutable so we can just copy it. @@ -244,7 +231,6 @@ private void Initialize(RouteValueDictionary dictionary) _arrayStorage = Array.Empty>(); return; } -#endif var count = dictionary._count; if (count > 0) @@ -260,6 +246,18 @@ private void Initialize(RouteValueDictionary dictionary) _arrayStorage = Array.Empty>(); } } +#endif + + [MemberNotNull(nameof(_arrayStorage))] + private void Initialize(IEnumerable> keyValueEnumerable) + { + _arrayStorage = Array.Empty>(); + + foreach (var kvp in keyValueEnumerable) + { + Add(kvp.Key, kvp.Value); + } + } /// public object? this[string key] diff --git a/src/Http/startvscode.cmd b/src/Http/startvscode.cmd new file mode 100644 index 000000000000..d403f3028231 --- /dev/null +++ b/src/Http/startvscode.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\startvscode.cmd %~dp0 diff --git a/src/Http/startvscode.sh b/src/Http/startvscode.sh new file mode 100644 index 000000000000..346f74c01e76 --- /dev/null +++ b/src/Http/startvscode.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +repo_root="$DIR/../.." +"$repo_root/startvscode.sh" $DIR diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs index c5651c50d2fa..8e2585e75d74 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/TransportManager.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; internal sealed class TransportManager { - private readonly List _transports = new List(); + private readonly List _transports = []; private readonly List _transportFactories; private readonly List _multiplexedTransportFactories; @@ -30,7 +30,6 @@ public TransportManager( _serviceContext = serviceContext; } - private ConnectionManager ConnectionManager => _serviceContext.ConnectionManager; private KestrelTrace Trace => _serviceContext.Log; public async Task BindAsync(EndPoint endPoint, ConnectionDelegate connectionDelegate, EndpointConfig? endpointConfig, CancellationToken cancellationToken) diff --git a/src/Servers/Kestrel/startvscode.cmd b/src/Servers/Kestrel/startvscode.cmd new file mode 100644 index 000000000000..1f6448bbdff9 --- /dev/null +++ b/src/Servers/Kestrel/startvscode.cmd @@ -0,0 +1,3 @@ +@ECHO OFF + +%~dp0..\..\..\startvscode.cmd %~dp0 diff --git a/src/Servers/Kestrel/startvscode.sh b/src/Servers/Kestrel/startvscode.sh new file mode 100644 index 000000000000..9e44ad5032a9 --- /dev/null +++ b/src/Servers/Kestrel/startvscode.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +repo_root="$DIR/../../.." +"$repo_root/startvscode.sh" $DIR