Merging internal commits for release/7.0

NuGet.config

@@ -4,8 +4,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-819a61e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-819a61e6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--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" />
@@ -24,8 +26,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-819a61e" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-567edaf" 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="7.0.15">
+    <Dependency Name="dotnet-ef" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>ec0d745b900c6007fc93d16fbc70ab59729e6b1e</Sha>
+      <Sha>819a61e6a4687309ad410167d488010192a27abc</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -177,9 +177,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.15-servicing.23572.26">
+    <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.16-servicing.24066.29">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24059.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -262,33 +262,33 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.15">
+    <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.15">
+    <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</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="7.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.15-servicing.23572.26">
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.16-servicing.24066.29">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
+      <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
       <Uri>https://github.com/dotnet/xdt</Uri>

eng/Versions.props

@@ -9,7 +9,7 @@
     <AspNetCoreMajorVersion>7</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>17</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>7.0.0</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETCoreAppRefVersion>7.0.15</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimewinx64Version>7.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
-    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.15</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
-    <MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.15</MicrosoftNETRuntimeWebAssemblySdkVersion>
-    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.15</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
-    <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.15-servicing.23572.26</MicrosoftNETCoreBrowserDebugHostTransportVersion>
+    <MicrosoftNETCoreAppRefVersion>7.0.16</MicrosoftNETCoreAppRefVersion>
+    <MicrosoftNETCoreAppRuntimewinx64Version>7.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
+    <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.16</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
+    <MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.16</MicrosoftNETRuntimeWebAssemblySdkVersion>
+    <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.16</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+    <MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.16-servicing.24066.29</MicrosoftNETCoreBrowserDebugHostTransportVersion>
     <MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
     <MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
     <MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
     <MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
     <MicrosoftExtensionsOptionsVersion>7.0.1</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
-    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.15-servicing.23572.26</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
+    <MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.16-servicing.24066.29</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
     <SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
@@ -125,14 +125,14 @@
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>7.0.15</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.15</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>7.0.15</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>7.0.15</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.15</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>7.0.15</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>7.0.15</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>7.0.15</MicrosoftEntityFrameworkCoreDesignVersion>
+    <dotnetefVersion>7.0.16</dotnetefVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.16</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>7.0.16</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>7.0.16</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.16</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>7.0.16</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftEntityFrameworkCoreVersion>7.0.16</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>7.0.16</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTemplatingVersion>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.115"
+    "version": "7.0.116"
   },
   "tools": {
-    "dotnet": "7.0.115",
+    "dotnet": "7.0.116",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

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

@@ -120,7 +120,6 @@ public TimeSpan TransportSendTimeout
             }
 
             _transportSendTimeout = value;
-            TransportSendTimeoutTicks = value.Ticks;
         }
     }
 
@@ -133,7 +132,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

@@ -45,7 +45,7 @@ internal sealed partial 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; }
 
@@ -65,7 +65,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.
@@ -118,9 +118,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
         {
@@ -541,7 +541,7 @@ public void MarkInactive()
             if (Status == HttpConnectionStatus.Active)
             {
                 Status = HttpConnectionStatus.Inactive;
-                LastSeenTicks = Environment.TickCount64;
+                LastSeenTicks = TimeSpan.FromMilliseconds(Environment.TickCount64);
             }
         }
     }
@@ -573,12 +573,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)
         {
@@ -589,7 +589,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 sealed 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);