Skip to content

Commit 607a6b4

Browse files
HaoKHaoK
authored
Merge branch 'master' into halter73/mega-merge
2 parents f2dd6d4 + 853d8f0 commit 607a6b4

File tree

13 files changed

+47
-44
lines changed

13 files changed

+47
-44
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ variables:
5151
# to have it in two different forms
5252
- name: _InternalRuntimeDownloadCodeSignArgs
5353
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
54+
- name: _UseHelixOpenQueues
55+
value: 'true'
5456
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
57+
- group: DotNet-HelixApi-Access
58+
- name: _UseHelixOpenQueues
59+
value: 'false'
5560
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
5661
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
5762
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
@@ -640,6 +645,7 @@ stages:
640645
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
641646
displayName: Run build.cmd helix target
642647
env:
648+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
643649
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
644650
artifacts:
645651
- name: Helix_logs
@@ -649,6 +655,7 @@ stages:
649655

650656
- template: jobs/default-build.yml
651657
parameters:
658+
condition: ne(variables['Build.Reason'], 'PullRequest')
652659
jobName: Helix_x64_daily
653660
jobDisplayName: 'Tests: Helix x64 Daily'
654661
agentOs: Windows
@@ -659,6 +666,7 @@ stages:
659666
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
660667
displayName: Run build.cmd helix target
661668
env:
669+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
662670
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
663671
artifacts:
664672
- name: Helix_logs
@@ -680,6 +688,7 @@ stages:
680688
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
681689
displayName: Run build.sh helix arm64 target
682690
env:
691+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
683692
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
684693
installNodeJs: false
685694
artifacts:

‎eng/Version.Details.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
<Uri>https://github.com/dotnet/blazor</Uri>
1414
<Sha>dd7fb4d3931d556458f62642c2edfc59f6295bfb</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.1.20114.1">
16+
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.1.20114.5">
1717
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
18-
<Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
18+
<Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.1.20114.1">
20+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.1.20114.5">
2121
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
22-
<Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
22+
<Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.1.20114.1">
24+
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.1.20114.5">
2525
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
26-
<Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
26+
<Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.1.20114.1">
28+
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.1.20114.5">
2929
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
30-
<Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
30+
<Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
3131
</Dependency>
3232
<Dependency Name="dotnet-ef" Version="5.0.0-preview.1.20113.3">
3333
<Uri>https://github.com/dotnet/efcore</Uri>
@@ -289,10 +289,6 @@
289289
<Uri>https://github.com/dotnet/extensions</Uri>
290290
<Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.CSharp" Version="5.0.0-alpha.1.19563.6" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
293-
<Uri>https://github.com/dotnet/corefx</Uri>
294-
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
295-
</Dependency>
296292
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.1.20113.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
297293
<Uri>https://github.com/dotnet/runtime</Uri>
298294
<Sha>0f3f8e1930c28b67f29990126bc2e8527e959a2e</Sha>

‎eng/Versions.props

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@
6565
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20113.3</MicrosoftDotNetGenAPIPackageVersion>
6666
<!-- Packages from dotnet/roslyn -->
6767
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta3-20114-02</MicrosoftNetCompilersToolsetPackageVersion>
68-
<!-- Packages from dotnet/core-setup -->
68+
<!-- Packages from dotnet/runtime -->
6969
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.1.20113.7</MicrosoftExtensionsDependencyModelPackageVersion>
7070
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppInternalPackageVersion>
7171
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppRefPackageVersion>
7272
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
7373
<NETStandardLibraryRefPackageVersion>2.1.0-preview.1.20113.7</NETStandardLibraryRefPackageVersion>
74-
<!-- Packages from dotnet/corefx -->
75-
<MicrosoftCSharpPackageVersion>5.0.0-alpha.1.19563.6</MicrosoftCSharpPackageVersion>
7674
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.1.20113.7</MicrosoftWin32RegistryPackageVersion>
7775
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.1.20113.7</MicrosoftWin32SystemEventsPackageVersion>
7876
<SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.1.20113.7</SystemComponentModelAnnotationsPackageVersion>
@@ -167,10 +165,10 @@
167165
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.1.20113.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
168166
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.1.20113.3</MicrosoftEntityFrameworkCorePackageVersion>
169167
<!-- Packages from dotnet/aspnetcore-tooling -->
170-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
171-
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
172-
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.1.20114.1</MicrosoftCodeAnalysisRazorPackageVersion>
173-
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.1.20114.1</MicrosoftNETSdkRazorPackageVersion>
168+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.1.20114.5</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
169+
<MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.1.20114.5</MicrosoftAspNetCoreRazorLanguagePackageVersion>
170+
<MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.1.20114.5</MicrosoftCodeAnalysisRazorPackageVersion>
171+
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.1.20114.5</MicrosoftNETSdkRazorPackageVersion>
174172
</PropertyGroup>
175173
<!--
176174
@@ -194,6 +192,7 @@
194192
<MicrosoftSymbolUploaderBuildTaskPackageVersion>1.0.0-beta-64023-03</MicrosoftSymbolUploaderBuildTaskPackageVersion>
195193
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
196194
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
195+
<MicrosoftCSharpPackageVersion>4.7.0</MicrosoftCSharpPackageVersion>
197196
<SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
198197
<SystemCodeDomPackageVersion>4.4.0</SystemCodeDomPackageVersion>
199198
<SystemCommandlineExperimentalPackageVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalPackageVersion>

‎eng/helix/helix.proj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<Import Project="..\Build.props" />
1313

1414
<ItemGroup>
15-
<HelixTargetQueue Include="@(HelixAvailableTargetQueue)" />
15+
<HelixTargetQueue Condition="'$(_UseHelixOpenQueues)' == 'true'" Include="@(HelixAvailableTargetQueue)" />
16+
<HelixTargetQueue Condition="'$(_UseHelixOpenQueues)' != 'true'" Include="@(HelixAvailableTargetQueue->'%(Identity)'->Replace('.Open',''))" />
1617
</ItemGroup>
1718

1819
<PropertyGroup>
@@ -21,11 +22,13 @@
2122
<IsExternal>true</IsExternal>
2223
<SkipInvalidConfigurations>true</SkipInvalidConfigurations>
2324
<MaxRetryCount Condition="'$(MaxRetryCount)' == ''">2</MaxRetryCount>
25+
<HelixAccessToken Condition="'$(_UseHelixOpenQueues)' != 'true'">$(HelixApiAccessToken)</HelixAccessToken>
2426
</PropertyGroup>
2527

2628
<PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
2729
<HelixType>ci</HelixType>
28-
<Creator>aspnetcore</Creator>
30+
<!-- Creator is not valid for internal queues -->
31+
<Creator Condition="'$(_UseHelixOpenQueues)' == 'true'">aspnetcore</Creator>
2932
<HelixBuild>$(BUILD_BUILDNUMBER).$(TargetArchitecture).$(SYSTEM_JOBATTEMPT)</HelixBuild>
3033
<WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
3134
<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
@@ -34,8 +37,9 @@
3437

3538
<PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' != 'true' ">
3639
<HelixType>dev</HelixType>
37-
<Creator>$(USERNAME)</Creator>
38-
<Creator Condition="'$(USERNAME)' == ''">$(USER)</Creator>
40+
<!-- Creator is not valid for internal queues -->
41+
<Creator Condition="'$(_UseHelixOpenQueues)' == 'true'">$(USERNAME)</Creator>
42+
<Creator Condition="'$(USERNAME)' == '' AND '$(_UseHelixOpenQueues)' == 'true'">$(USER)</Creator>
3943
<HelixBuild>$([System.DateTime]::Now.ToString('yyyyMMddHHmm'))</HelixBuild>
4044
</PropertyGroup>
4145

‎eng/targets/Helix.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
4040
<_SelectedPlatforms>@(HelixProjectPlatform)</_SelectedPlatforms>
4141
</PropertyGroup>
4242

43+
<ItemGroup Condition="'$(_UseHelixOpenQueues)' != 'true'">
44+
<_Temp Include="@(HelixAvailableTargetQueue)" />
45+
<HelixAvailableTargetQueue Remove="@(HelixAvailableTargetQueue)" />
46+
<HelixAvailableTargetQueue Include="@(_Temp->'%(Identity)'->Replace('.Open',''))" />
47+
</ItemGroup>
48+
4349
<ItemGroup>
4450
<!-- Include default queues based on platform -->
4551
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true'" />

‎src/Http/Http.Abstractions/src/HostString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public int? Port
9696
GetParts(_value, out var host, out var port);
9797

9898
if (!StringSegment.IsNullOrEmpty(port)
99-
&& int.TryParse(port.ToString(), NumberStyles.None, CultureInfo.InvariantCulture, out var p))
99+
&& int.TryParse(port.AsSpan(), NumberStyles.None, CultureInfo.InvariantCulture, out var p))
100100
{
101101
return p;
102102
}

‎src/Servers/Connections.Abstractions/src/ConnectionHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
namespace Microsoft.AspNetCore.Connections
77
{
88
/// <summary>
9-
/// Represents an end point that multiple connections connect to. For HTTP, endpoints are URLs, for non HTTP it can be a TCP listener (or similar)
9+
/// Represents an endpoint that multiple connections connect to. For HTTP, endpoints are URLs, for non-HTTP it can be a TCP listener (or similar).
1010
/// </summary>
1111
public abstract class ConnectionHandler
1212
{
1313
/// <summary>
14-
/// Called when a new connection is accepted to the endpoint
14+
/// Called when a new connection is accepted to the endpoint.
1515
/// </summary>
1616
/// <param name="connection">The new <see cref="ConnectionContext"/></param>
1717
/// <returns>A <see cref="Task"/> that represents the connection lifetime. When the task completes, the connection is complete.</returns>
1818
public abstract Task OnConnectedAsync(ConnectionContext connection);
1919
}
20-
}
20+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void TlsAndHttp2NotSupportedOnWin7()
8080

8181
[ConditionalFact]
8282
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
83-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
83+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
8484
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
8585
public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
8686
{
@@ -111,7 +111,7 @@ public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
111111

112112
[ConditionalFact]
113113
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
114-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
114+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
115115
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
116116
public async Task TlsAlpnHandshakeSelectsHttp2()
117117
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
2323
{
2424
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
2525
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
26-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
26+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
2727
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
2828
{
2929
private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
@@ -44,7 +44,7 @@ public ShutdownTests()
4444

4545
[CollectDump]
4646
[ConditionalFact]
47-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/9985", Queues = "Fedora.28.Amd64.Open")]
47+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/9985", Queues = "Fedora.28.Amd64;Fedora.28.Amd64.Open")]
4848
[Flaky("https://github.com/dotnet/aspnetcore/issues/9985", FlakyOn.All)]
4949
public async Task GracefulShutdownWaitsForRequestsToFinish()
5050
{

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ public void ThrowsForCertificatesMissingServerEku(string testCertName)
595595
[InlineData(HttpProtocols.Http2)]
596596
[InlineData(HttpProtocols.Http1AndHttp2)]
597597
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
598-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
598+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
599599
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
600600
public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols)
601601
{

0 commit comments

Comments
 (0)