Browse Source

Update .NET SDK to 10.0.100-alpha.1.25056.1 (#59729)

* Update .NET SDK

Update .NET SDK to version 10.0.100-alpha.1.25056.1.

---
updated-dependencies:
- dependency-name: Microsoft.NET.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Remove unused members

---------

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mackinnon Buck <[email protected]>
github-actions[bot] 1 year ago
parent
commit
95a440fb73

+ 2 - 2
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)"

+ 0 - 3
src/Components/Components/src/RouteView.cs

@@ -28,9 +28,6 @@ public class RouteView : IComponent
         }
     }
 
-    [Inject]
-    private NavigationManager NavigationManager { get; set; }
-
     /// <summary>
     /// 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.

+ 2 - 0
src/Components/Forms/src/EditContextDataAnnotationsExtensions.cs

@@ -52,10 +52,12 @@ public static class EditContextDataAnnotationsExtensions
 
     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
     {

+ 0 - 30
src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs

@@ -77,34 +77,4 @@ public sealed class ManagedAuthenticatedEncryptorConfiguration : AlgorithmConfig
         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!;
-        }
-    }
 }

+ 12 - 14
src/Http/Http.Abstractions/src/Routing/RouteValueDictionary.cs

@@ -208,7 +208,6 @@ internal class RouteValueDictionary : IDictionary<string, object?>, IReadOnlyDic
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
         }
     }
-#endif
 
     [MemberNotNull(nameof(_arrayStorage))]
     private void Initialize(IEnumerable<KeyValuePair<string, string?>> stringValueEnumerable)
@@ -221,21 +220,9 @@ internal class RouteValueDictionary : IDictionary<string, object?>, IReadOnlyDic
         }
     }
 
-    [MemberNotNull(nameof(_arrayStorage))]
-    private void Initialize(IEnumerable<KeyValuePair<string, object?>> keyValueEnumerable)
-    {
-        _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
-
-        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 @@ internal class RouteValueDictionary : IDictionary<string, object?>, IReadOnlyDic
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
             return;
         }
-#endif
 
         var count = dictionary._count;
         if (count > 0)
@@ -260,6 +246,18 @@ internal class RouteValueDictionary : IDictionary<string, object?>, IReadOnlyDic
             _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
         }
     }
+#endif
+
+    [MemberNotNull(nameof(_arrayStorage))]
+    private void Initialize(IEnumerable<KeyValuePair<string, object?>> keyValueEnumerable)
+    {
+        _arrayStorage = Array.Empty<KeyValuePair<string, object?>>();
+
+        foreach (var kvp in keyValueEnumerable)
+        {
+            Add(kvp.Key, kvp.Value);
+        }
+    }
 
     /// <inheritdoc />
     public object? this[string key]

+ 3 - 0
src/Http/startvscode.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvscode.cmd %~dp0

+ 5 - 0
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

+ 1 - 2
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<ActiveTransport> _transports = new List<ActiveTransport>();
+    private readonly List<ActiveTransport> _transports = [];
 
     private readonly List<IConnectionListenerFactory> _transportFactories;
     private readonly List<IMultiplexedConnectionListenerFactory> _multiplexedTransportFactories;
@@ -30,7 +30,6 @@ internal sealed class TransportManager
         _serviceContext = serviceContext;
     }
 
-    private ConnectionManager ConnectionManager => _serviceContext.ConnectionManager;
     private KestrelTrace Trace => _serviceContext.Log;
 
     public async Task<EndPoint> BindAsync(EndPoint endPoint, ConnectionDelegate connectionDelegate, EndpointConfig? endpointConfig, CancellationToken cancellationToken)

+ 3 - 0
src/Servers/Kestrel/startvscode.cmd

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\..\startvscode.cmd %~dp0

+ 5 - 0
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