Merging internal commits for release/6.0

NuGet.config

@@ -4,11 +4,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-80de56d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-b254074" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-b254074a/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-efcore-b254074-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-b254074a-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-efcore-5188cdc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5188cdc9/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,11 +25,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-b254074-1" value="true" />
-    <add key="darc-int-dotnet-efcore-b254074" value="true" />
+    <add key="darc-int-dotnet-efcore-5188cdc" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-dc45e96" value="true" />
+    <add key="darc-int-dotnet-runtime-80de56d" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

eng/Version.Details.xml

@@ -9,37 +9,37 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="dotnet-ef" Version="6.0.26">
+    <Dependency Name="dotnet-ef" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.26">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
+      <Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.26-servicing.23605.8">
+    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.27-servicing.24069.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
     <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -245,33 +245,33 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.26">
+    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.26">
+    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.26">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.27">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.26-servicing.23605.8">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.27-servicing.24069.12">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
+      <Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -9,7 +9,7 @@
     <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>28</AspNetCorePatchVersion>
-    <ValidateBaseline>false</ValidateBaseline>
+    <ValidateBaseline>true</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
@@ -63,12 +63,12 @@
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
     <MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCoreAppRefVersion>6.0.26</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.26</MicrosoftNETCoreAppRuntimewinx64Version>
-    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.26</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
-    <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.26</MicrosoftNETRuntimeWebAssemblySdkVersion>
-    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.26</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.26-servicing.23605.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+    <MicrosoftNETCoreAppRefVersion>6.0.27</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>6.0.27</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.27</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.27</MicrosoftNETRuntimeWebAssemblySdkVersion>
+    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.27</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.27-servicing.24069.12</MicrosoftNETCoreBrowserDebugHostTransportVersion>
     <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
     <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
     <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
     <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
     <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.26-servicing.23605.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.27-servicing.24069.12</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
     <SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -122,14 +122,14 @@
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>6.0.26</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.26</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.26</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.26</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.26</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>6.0.26</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>6.0.26</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>6.0.26</MicrosoftEntityFrameworkCoreDesignVersion>
+    <dotnetefVersion>6.0.27</dotnetefVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.27</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.27</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.27</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.27</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>6.0.27</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftEntityFrameworkCoreVersion>6.0.27</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>6.0.27</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksTemplatingVersion>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.126"
+    "version": "6.0.127"
   },
   "tools": {
-    "dotnet": "6.0.126",
+    "dotnet": "6.0.127",
     "runtimes": {
       "dotnet/x64": [
         "2.1.30",

src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs

@@ -123,7 +123,6 @@ public TimeSpan TransportSendTimeout
                 }
 
                 _transportSendTimeout = value;
-                TransportSendTimeoutTicks = value.Ticks;
             }
         }
 
@@ -136,7 +135,6 @@ public TimeSpan TransportSendTimeout
         /// </remarks>
         public bool CloseOnAuthenticationExpiration { get; set; }
 
-        internal long TransportSendTimeoutTicks { get; private set; }
         internal bool TransportSendTimeoutEnabled => _transportSendTimeout != Timeout.InfiniteTimeSpan;
 
         // We initialize these lazily based on the state of the options specified here.

src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs

@@ -48,7 +48,7 @@ internal class HttpConnectionContext : ConnectionContext,
 
         private CancellationTokenSource? _sendCts;
         private bool _activeSend;
-        private long _startedSendTime;
+        private TimeSpan _startedSendTime;
         private readonly object _sendingLock = new object();
         internal CancellationToken SendingToken { get; private set; }
 
@@ -68,7 +68,7 @@ public HttpConnectionContext(string connectionId, string connectionToken, ILogge
 
             ConnectionId = connectionId;
             ConnectionToken = connectionToken;
-            LastSeenTicks = Environment.TickCount64;
+            LastSeenTicks = TimeSpan.FromMilliseconds(Environment.TickCount64);
             _options = options;
 
             // The default behavior is that both formats are supported.
@@ -121,9 +121,9 @@ public HttpConnectionContext(string connectionId, string connectionToken, ILogge
 
         public Task? ApplicationTask { get; set; }
 
-        public long LastSeenTicks { get; set; }
+        public TimeSpan LastSeenTicks { get; set; }
 
-        public long? LastSeenTicksIfInactive
+        public TimeSpan? LastSeenTicksIfInactive
         {
             get
             {
@@ -544,7 +544,7 @@ public void MarkInactive()
                 if (Status == HttpConnectionStatus.Active)
                 {
                     Status = HttpConnectionStatus.Inactive;
-                    LastSeenTicks = Environment.TickCount64;
+                    LastSeenTicks = TimeSpan.FromMilliseconds(Environment.TickCount64);
                 }
             }
         }
@@ -576,12 +576,12 @@ internal void StartSendCancellation()
                     _sendCts = new CancellationTokenSource();
                     SendingToken = _sendCts.Token;
                 }
-                _startedSendTime = Environment.TickCount64;
+                _startedSendTime = TimeSpan.FromMilliseconds(Environment.TickCount64);
                 _activeSend = true;
             }
         }
 
-        internal void TryCancelSend(long currentTicks)
+        internal void TryCancelSend(TimeSpan currentTicks)
         {
             if (!_options.TransportSendTimeoutEnabled)
             {
@@ -592,7 +592,7 @@ internal void TryCancelSend(long currentTicks)
             {
                 if (_activeSend)
                 {
-                    if (currentTicks - _startedSendTime > _options.TransportSendTimeoutTicks)
+                    if (currentTicks - _startedSendTime > _options.TransportSendTimeout)
                     {
                         _sendCts!.Cancel();
 

src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs

@@ -24,14 +24,14 @@ internal partial class HttpConnectionManager
         private readonly PeriodicTimer _nextHeartbeat;
         private readonly ILogger<HttpConnectionManager> _logger;
         private readonly ILogger<HttpConnectionContext> _connectionLogger;
-        private readonly long _disconnectTimeoutTicks;
+        private readonly TimeSpan _disconnectTimeout;
 
         public HttpConnectionManager(ILoggerFactory loggerFactory, IHostApplicationLifetime appLifetime, IOptions<ConnectionOptions> connectionOptions)
         {
             _logger = loggerFactory.CreateLogger<HttpConnectionManager>();
             _connectionLogger = loggerFactory.CreateLogger<HttpConnectionContext>();
             _nextHeartbeat = new PeriodicTimer(_heartbeatTickRate);
-            _disconnectTimeoutTicks = (long)(connectionOptions.Value.DisconnectTimeout ?? ConnectionOptionsSetup.DefaultDisconectTimeout).TotalMilliseconds;
+            _disconnectTimeout = connectionOptions.Value.DisconnectTimeout ?? ConnectionOptionsSetup.DefaultDisconectTimeout;
 
             // Register these last as the callbacks could run immediately
             appLifetime.ApplicationStarted.Register(() => Start());
@@ -134,7 +134,7 @@ private async Task ExecuteTimerLoop()
         public void Scan()
         {
             var now = DateTimeOffset.UtcNow;
-            var ticks = Environment.TickCount64;
+            var ticks = TimeSpan.FromMilliseconds(Environment.TickCount64);
 
             // Scan the registered connections looking for ones that have timed out
             foreach (var c in _connections)
@@ -145,7 +145,7 @@ public void Scan()
 
                 // Once the decision has been made to dispose we don't check the status again
                 // But don't clean up connections while the debugger is attached.
-                if (!Debugger.IsAttached && lastSeenTick.HasValue && (ticks - lastSeenTick.Value) > _disconnectTimeoutTicks)
+                if (!Debugger.IsAttached && lastSeenTick.HasValue && (ticks - lastSeenTick.Value) > _disconnectTimeout)
                 {
                     Log.ConnectionTimedOut(_logger, connection.ConnectionId);
                     HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId);