Skip to content

Commit a1e9070

Browse files
wtgodbewtgodbe
authored
Merge pull request #54009 from vseanreesermsft/internal-merge-6.0-2024-02-13-1015
Merging internal commits for release/6.0
2 parents 86f7f37 + a18c4f2 commit a1e9070

File tree

10 files changed

+421
-401
lines changed

10 files changed

+421
-401
lines changed

‎NuGet.config

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<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" />
7+
<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" />
88
<!-- End: Package sources from dotnet-runtime -->
99
<!-- Begin: Package sources from dotnet-efcore -->
10-
<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" />
11-
<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" />
10+
<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" />
1211
<!-- End: Package sources from dotnet-efcore -->
1312
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1413
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,11 +25,10 @@
2625
<clear />
2726
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2827
<!-- Begin: Package sources from dotnet-efcore -->
29-
<add key="darc-int-dotnet-efcore-b254074-1" value="true" />
30-
<add key="darc-int-dotnet-efcore-b254074" value="true" />
28+
<add key="darc-int-dotnet-efcore-5188cdc" value="true" />
3129
<!-- End: Package sources from dotnet-efcore -->
3230
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-dc45e96" value="true" />
31+
<add key="darc-int-dotnet-runtime-80de56d" value="true" />
3432
<!-- End: Package sources from dotnet-runtime -->
3533
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3634
</disabledPackageSources>

‎eng/Baseline.Designer.props

Lines changed: 222 additions & 222 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.26">
12+
<Dependency Name="dotnet-ef" Version="6.0.27">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
14+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.26">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.27">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
18+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.26">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.27">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
22+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.26">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.27">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
26+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.27">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
30+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.26">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.27">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
34+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.26">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.27">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
38+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.26">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.27">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>b254074a09b0021d472383ea15b3bb703eae3ee3</Sha>
42+
<Sha>5188cdc92961de14d564a9cb54e79cfde137e1e2</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.26-servicing.23605.8">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.27-servicing.24069.12">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
182+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -245,33 +245,33 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.27">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
250+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.26">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.27">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
254+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.26">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.27">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
258+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.27">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
266+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.26">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.27">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
270+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.26-servicing.23605.8">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.27-servicing.24069.12">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
274+
<Sha>80de56dadb3864aec7e8edd3ae32a23aeda08285</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>28</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>6.0.26</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.26</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.26</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.26</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.26</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.26-servicing.23605.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.27</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.27</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.27</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.27</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.27</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.27-servicing.24069.12</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.26-servicing.23605.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.27-servicing.24069.12</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -122,14 +122,14 @@
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.26</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.26</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.26</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.26</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.26</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.26</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.26</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.26</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.27</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.27</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.27</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.27</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.27</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.27</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.27</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.27</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksTemplatingVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.126"
3+
"version": "6.0.127"
44
},
55
"tools": {
6-
"dotnet": "6.0.126",
6+
"dotnet": "6.0.127",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public TimeSpan TransportSendTimeout
123123
}
124124

125125
_transportSendTimeout = value;
126-
TransportSendTimeoutTicks = value.Ticks;
127126
}
128127
}
129128

@@ -136,7 +135,6 @@ public TimeSpan TransportSendTimeout
136135
/// </remarks>
137136
public bool CloseOnAuthenticationExpiration { get; set; }
138137

139-
internal long TransportSendTimeoutTicks { get; private set; }
140138
internal bool TransportSendTimeoutEnabled => _transportSendTimeout != Timeout.InfiniteTimeSpan;
141139

142140
// We initialize these lazily based on the state of the options specified here.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ internal class HttpConnectionContext : ConnectionContext,
4848

4949
private CancellationTokenSource? _sendCts;
5050
private bool _activeSend;
51-
private long _startedSendTime;
51+
private TimeSpan _startedSendTime;
5252
private readonly object _sendingLock = new object();
5353
internal CancellationToken SendingToken { get; private set; }
5454

@@ -68,7 +68,7 @@ public HttpConnectionContext(string connectionId, string connectionToken, ILogge
6868

6969
ConnectionId = connectionId;
7070
ConnectionToken = connectionToken;
71-
LastSeenTicks = Environment.TickCount64;
71+
LastSeenTicks = TimeSpan.FromMilliseconds(Environment.TickCount64);
7272
_options = options;
7373

7474
// The default behavior is that both formats are supported.
@@ -121,9 +121,9 @@ public HttpConnectionContext(string connectionId, string connectionToken, ILogge
121121

122122
public Task? ApplicationTask { get; set; }
123123

124-
public long LastSeenTicks { get; set; }
124+
public TimeSpan LastSeenTicks { get; set; }
125125

126-
public long? LastSeenTicksIfInactive
126+
public TimeSpan? LastSeenTicksIfInactive
127127
{
128128
get
129129
{
@@ -544,7 +544,7 @@ public void MarkInactive()
544544
if (Status == HttpConnectionStatus.Active)
545545
{
546546
Status = HttpConnectionStatus.Inactive;
547-
LastSeenTicks = Environment.TickCount64;
547+
LastSeenTicks = TimeSpan.FromMilliseconds(Environment.TickCount64);
548548
}
549549
}
550550
}
@@ -576,12 +576,12 @@ internal void StartSendCancellation()
576576
_sendCts = new CancellationTokenSource();
577577
SendingToken = _sendCts.Token;
578578
}
579-
_startedSendTime = Environment.TickCount64;
579+
_startedSendTime = TimeSpan.FromMilliseconds(Environment.TickCount64);
580580
_activeSend = true;
581581
}
582582
}
583583

584-
internal void TryCancelSend(long currentTicks)
584+
internal void TryCancelSend(TimeSpan currentTicks)
585585
{
586586
if (!_options.TransportSendTimeoutEnabled)
587587
{
@@ -592,7 +592,7 @@ internal void TryCancelSend(long currentTicks)
592592
{
593593
if (_activeSend)
594594
{
595-
if (currentTicks - _startedSendTime > _options.TransportSendTimeoutTicks)
595+
if (currentTicks - _startedSendTime > _options.TransportSendTimeout)
596596
{
597597
_sendCts!.Cancel();
598598

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ internal partial class HttpConnectionManager
2424
private readonly PeriodicTimer _nextHeartbeat;
2525
private readonly ILogger<HttpConnectionManager> _logger;
2626
private readonly ILogger<HttpConnectionContext> _connectionLogger;
27-
private readonly long _disconnectTimeoutTicks;
27+
private readonly TimeSpan _disconnectTimeout;
2828

2929
public HttpConnectionManager(ILoggerFactory loggerFactory, IHostApplicationLifetime appLifetime, IOptions<ConnectionOptions> connectionOptions)
3030
{
3131
_logger = loggerFactory.CreateLogger<HttpConnectionManager>();
3232
_connectionLogger = loggerFactory.CreateLogger<HttpConnectionContext>();
3333
_nextHeartbeat = new PeriodicTimer(_heartbeatTickRate);
34-
_disconnectTimeoutTicks = (long)(connectionOptions.Value.DisconnectTimeout ?? ConnectionOptionsSetup.DefaultDisconectTimeout).TotalMilliseconds;
34+
_disconnectTimeout = connectionOptions.Value.DisconnectTimeout ?? ConnectionOptionsSetup.DefaultDisconectTimeout;
3535

3636
// Register these last as the callbacks could run immediately
3737
appLifetime.ApplicationStarted.Register(() => Start());
@@ -134,7 +134,7 @@ private async Task ExecuteTimerLoop()
134134
public void Scan()
135135
{
136136
var now = DateTimeOffset.UtcNow;
137-
var ticks = Environment.TickCount64;
137+
var ticks = TimeSpan.FromMilliseconds(Environment.TickCount64);
138138

139139
// Scan the registered connections looking for ones that have timed out
140140
foreach (var c in _connections)
@@ -145,7 +145,7 @@ public void Scan()
145145

146146
// Once the decision has been made to dispose we don't check the status again
147147
// But don't clean up connections while the debugger is attached.
148-
if (!Debugger.IsAttached && lastSeenTick.HasValue && (ticks - lastSeenTick.Value) > _disconnectTimeoutTicks)
148+
if (!Debugger.IsAttached && lastSeenTick.HasValue && (ticks - lastSeenTick.Value) > _disconnectTimeout)
149149
{
150150
Log.ConnectionTimedOut(_logger, connection.ConnectionId);
151151
HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId);

0 commit comments

Comments
 (0)