Skip to content

Commit ed4069c

Browse files
author
msftbot[bot]
authored
Merge pull request #26706 from dotnet-maestro-bot/merge/release/5.0-to-master
[automated] Merge branch 'release/5.0' => 'master'
2 parents a84868a + cc052d8 commit ed4069c

File tree

14 files changed

+481
-149
lines changed

14 files changed

+481
-149
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,17 @@
313313
<Uri>https://github.com/dotnet/runtime</Uri>
314314
<Sha>4fef87c65e7466000884aeb9dee6498b162fe2fa</Sha>
315315
</Dependency>
316-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20478.3">
316+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
318+
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20478.3">
320+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20506.7">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
322+
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20478.3">
324+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20506.7">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>c8a7611e15656f45b039d46ec4e09f9f2a7edf99</Sha>
326+
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
327327
</Dependency>
328328
</ToolsetDependencies>
329329
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20507.2</MicrosoftEntityFrameworkCorePackageVersion>
138138
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20507.2</MicrosoftEntityFrameworkCoreDesignPackageVersion>
139139
<!-- Packages from dotnet/arcade -->
140-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20478.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20506.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
141141
</PropertyGroup>
142142
<!--
143143

‎eng/common/templates/job/job.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204

205205
- ${{ if eq(parameters.enablePublishTestResults, 'true') }}:
206206
- task: PublishTestResults@2
207-
displayName: Publish Test Results
207+
displayName: Publish XUnit Test Results
208208
inputs:
209209
testResultsFormat: 'xUnit'
210210
testResultsFiles: '*.xml'
@@ -213,6 +213,16 @@ jobs:
213213
mergeTestResults: ${{ parameters.mergeTestResults }}
214214
continueOnError: true
215215
condition: always()
216+
- task: PublishTestResults@2
217+
displayName: Publish TRX Test Results
218+
inputs:
219+
testResultsFormat: 'VSTest'
220+
testResultsFiles: '*.trx'
221+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
222+
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
223+
mergeTestResults: ${{ parameters.mergeTestResults }}
224+
continueOnError: true
225+
condition: always()
216226

217227
- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
218228
- task: CopyFiles@2

‎eng/common/templates/steps/perf-send-to-helix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
1212
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
1313
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
14-
DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
14+
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
1515
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
1616
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
1717
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."

‎eng/common/templates/steps/send-to-helix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ parameters:
1818
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
1919
XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
2020
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
21-
DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
21+
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
2222
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
2323
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
2424
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20478.3",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20478.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20506.7",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20506.7"
3535
}
3636
}

‎src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -144,54 +144,12 @@ public void ConnectionRejected(string connectionId)
144144
public void ConnectionQueuedStart(BaseConnectionContext connection)
145145
{
146146
Interlocked.Increment(ref _connectionQueueLength);
147-
if (IsEnabled())
148-
{
149-
ConnectionQueuedStart(
150-
connection.ConnectionId,
151-
connection.LocalEndPoint?.ToString(),
152-
connection.RemoteEndPoint?.ToString());
153-
}
154-
}
155-
156-
[MethodImpl(MethodImplOptions.NoInlining)]
157-
[Event(6, Level = EventLevel.Informational)]
158-
private void ConnectionQueuedStart(string connectionId,
159-
string localEndPoint,
160-
string remoteEndPoint)
161-
{
162-
WriteEvent(
163-
6,
164-
connectionId,
165-
localEndPoint,
166-
remoteEndPoint
167-
);
168147
}
169148

170149
[NonEvent]
171150
public void ConnectionQueuedStop(BaseConnectionContext connection)
172151
{
173152
Interlocked.Decrement(ref _connectionQueueLength);
174-
if (IsEnabled())
175-
{
176-
ConnectionQueuedStop(
177-
connection.ConnectionId,
178-
connection.LocalEndPoint?.ToString(),
179-
connection.RemoteEndPoint?.ToString());
180-
}
181-
}
182-
183-
[MethodImpl(MethodImplOptions.NoInlining)]
184-
[Event(7, Level = EventLevel.Informational)]
185-
private void ConnectionQueuedStop(string connectionId,
186-
string localEndPoint,
187-
string remoteEndPoint)
188-
{
189-
WriteEvent(
190-
7,
191-
connectionId,
192-
localEndPoint,
193-
remoteEndPoint
194-
);
195153
}
196154

197155
[NonEvent]
@@ -245,70 +203,24 @@ public void TlsHandshakeFailed(string connectionId)
245203
public void RequestQueuedStart(HttpProtocol httpProtocol, string httpVersion)
246204
{
247205
Interlocked.Increment(ref _httpRequestQueueLength);
248-
// avoid allocating the trace identifier unless logging is enabled
249-
if (IsEnabled())
250-
{
251-
RequestQueuedStart(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpVersion);
252-
}
253-
}
254-
255-
[MethodImpl(MethodImplOptions.NoInlining)]
256-
[Event(11, Level = EventLevel.Informational)]
257-
private void RequestQueuedStart(string connectionId, string requestId, string httpVersion)
258-
{
259-
WriteEvent(11, connectionId, requestId, httpVersion);
260206
}
261207

262208
[NonEvent]
263209
public void RequestQueuedStop(HttpProtocol httpProtocol, string httpVersion)
264210
{
265211
Interlocked.Decrement(ref _httpRequestQueueLength);
266-
// avoid allocating the trace identifier unless logging is enabled
267-
if (IsEnabled())
268-
{
269-
RequestQueuedStop(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpVersion);
270-
}
271-
}
272-
273-
[MethodImpl(MethodImplOptions.NoInlining)]
274-
[Event(12, Level = EventLevel.Informational)]
275-
private void RequestQueuedStop(string connectionId, string requestId, string httpVersion)
276-
{
277-
WriteEvent(12, connectionId, requestId, httpVersion);
278212
}
279213

280214
[NonEvent]
281215
public void RequestUpgradedStart(HttpProtocol httpProtocol)
282216
{
283217
Interlocked.Increment(ref _currentUpgradedHttpRequests);
284-
if (IsEnabled())
285-
{
286-
RequestUpgradedStart(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpProtocol.HttpVersion, httpProtocol.Path, httpProtocol.MethodText);
287-
}
288-
}
289-
290-
[MethodImpl(MethodImplOptions.NoInlining)]
291-
[Event(13, Level = EventLevel.Informational)]
292-
private void RequestUpgradedStart(string connectionId, string requestId, string httpVersion, string path, string method)
293-
{
294-
WriteEvent(13, connectionId, requestId, httpVersion, path, method);
295218
}
296219

297220
[NonEvent]
298221
public void RequestUpgradedStop(HttpProtocol httpProtocol)
299222
{
300223
Interlocked.Decrement(ref _currentUpgradedHttpRequests);
301-
if (IsEnabled())
302-
{
303-
RequestUpgradedStop(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpProtocol.HttpVersion, httpProtocol.Path, httpProtocol.MethodText);
304-
}
305-
}
306-
307-
[MethodImpl(MethodImplOptions.NoInlining)]
308-
[Event(14, Level = EventLevel.Informational)]
309-
private void RequestUpgradedStop(string connectionId, string requestId, string httpVersion, string path, string method)
310-
{
311-
WriteEvent(14, connectionId, requestId, httpVersion, path, method);
312224
}
313225

314226
protected override void OnEventCommand(EventCommandEventArgs command)

‎src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public HandshakeTests()
3636

3737
[ConditionalFact]
3838
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.Windows)]
39-
// Mac SslStream is missing ALPN support: https://github.com/dotnet/corefx/issues/30492
39+
// Mac SslStream is missing ALPN support: https://github.com/dotnet/runtime/issues/27727
4040
public void TlsAndHttp2NotSupportedOnMac()
4141
{
4242
var ex = Assert.Throws<NotSupportedException>(() => new TestServer(context =>
@@ -79,7 +79,7 @@ public void TlsAndHttp2NotSupportedOnWin7()
7979
}
8080

8181
[ConditionalFact]
82-
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
82+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
8383
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
8484
public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
8585
{
@@ -107,7 +107,7 @@ public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
107107
}
108108

109109
[ConditionalFact]
110-
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
110+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
111111
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
112112
public async Task TlsAlpnHandshakeSelectsHttp2()
113113
{

‎src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
2323
{
24-
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
24+
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
2525
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
2626
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
2727
{

0 commit comments

Comments
 (0)