diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 432836c954..a46fd2e783 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -51,7 +51,12 @@ variables:
# to have it in two different forms
- name: _InternalRuntimeDownloadCodeSignArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
+ - name: _UseHelixOpenQueues
+ value: 'true'
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ - group: DotNet-HelixApi-Access
+ - name: _UseHelixOpenQueues
+ value: 'false'
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
@@ -640,6 +645,7 @@ stages:
- 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
displayName: Run build.cmd helix target
env:
+ HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
artifacts:
- name: Helix_logs
@@ -649,6 +655,7 @@ stages:
- template: jobs/default-build.yml
parameters:
+ condition: ne(variables['Build.Reason'], 'PullRequest')
jobName: Helix_x64_daily
jobDisplayName: 'Tests: Helix x64 Daily'
agentOs: Windows
@@ -659,6 +666,7 @@ stages:
- 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
displayName: Run build.cmd helix target
env:
+ HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
artifacts:
- name: Helix_logs
@@ -680,6 +688,7 @@ stages:
- 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
displayName: Run build.sh helix arm64 target
env:
+ HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
installNodeJs: false
artifacts:
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f608c81fd7..9034ddd9e1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,21 +13,21 @@
https://github.com/dotnet/blazor
dd7fb4d3931d556458f62642c2edfc59f6295bfb
-
+
https://github.com/dotnet/aspnetcore-tooling
- 609026ea14eeb52a068d228d84987f24f3c64136
+ 9acda9485be8e2238067508474dfa44fcc34f81e
-
+
https://github.com/dotnet/aspnetcore-tooling
- 609026ea14eeb52a068d228d84987f24f3c64136
+ 9acda9485be8e2238067508474dfa44fcc34f81e
-
+
https://github.com/dotnet/aspnetcore-tooling
- 609026ea14eeb52a068d228d84987f24f3c64136
+ 9acda9485be8e2238067508474dfa44fcc34f81e
-
+
https://github.com/dotnet/aspnetcore-tooling
- 609026ea14eeb52a068d228d84987f24f3c64136
+ 9acda9485be8e2238067508474dfa44fcc34f81e
https://github.com/dotnet/efcore
@@ -289,10 +289,6 @@
https://github.com/dotnet/extensions
396aff55e0b4628a7a44375e4b72e5d19a6e37ab
-
- https://github.com/dotnet/corefx
- 5cee7c97d602f294e27c582d4dab81ec388f1d7b
-
https://github.com/dotnet/runtime
0f3f8e1930c28b67f29990126bc2e8527e959a2e
diff --git a/eng/Versions.props b/eng/Versions.props
index 60442119d9..138de3c19f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -65,14 +65,12 @@
5.0.0-beta.20113.3
3.5.0-beta3-20114-02
-
+
5.0.0-preview.1.20113.7
5.0.0-preview.1.20113.7
5.0.0-preview.1.20113.7
5.0.0-preview.1.20113.7
2.1.0-preview.1.20113.7
-
- 5.0.0-alpha.1.19563.6
5.0.0-preview.1.20113.7
5.0.0-preview.1.20113.7
5.0.0-preview.1.20113.7
@@ -167,10 +165,10 @@
5.0.0-preview.1.20113.3
5.0.0-preview.1.20113.3
- 5.0.0-preview.1.20114.1
- 5.0.0-preview.1.20114.1
- 5.0.0-preview.1.20114.1
- 5.0.0-preview.1.20114.1
+ 5.0.0-preview.1.20114.5
+ 5.0.0-preview.1.20114.5
+ 5.0.0-preview.1.20114.5
+ 5.0.0-preview.1.20114.5
+ 4.7.0
4.5.0
4.4.0
0.3.0-alpha.19317.1
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
index 1db18afa98..b905693145 100644
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@@ -12,7 +12,8 @@
-
+
+
@@ -21,11 +22,13 @@
true
true
2
+ $(HelixApiAccessToken)
ci
- aspnetcore
+
+ aspnetcore
$(BUILD_BUILDNUMBER).$(TargetArchitecture).$(SYSTEM_JOBATTEMPT)
true
true
@@ -34,8 +37,9 @@
dev
- $(USERNAME)
- $(USER)
+
+ $(USERNAME)
+ $(USER)
$([System.DateTime]::Now.ToString('yyyyMMddHHmm'))
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index c6a20b6055..f3d1ad0f16 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -40,6 +40,12 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
<_SelectedPlatforms>@(HelixProjectPlatform)
+
+ <_Temp Include="@(HelixAvailableTargetQueue)" />
+
+
+
+
<_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true'" />
diff --git a/src/Http/Http.Abstractions/src/HostString.cs b/src/Http/Http.Abstractions/src/HostString.cs
index 0f7cbd73f6..c15d59bf56 100644
--- a/src/Http/Http.Abstractions/src/HostString.cs
+++ b/src/Http/Http.Abstractions/src/HostString.cs
@@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Http
GetParts(_value, out var host, out var port);
if (!StringSegment.IsNullOrEmpty(port)
- && int.TryParse(port.ToString(), NumberStyles.None, CultureInfo.InvariantCulture, out var p))
+ && int.TryParse(port.AsSpan(), NumberStyles.None, CultureInfo.InvariantCulture, out var p))
{
return p;
}
diff --git a/src/Servers/Connections.Abstractions/src/ConnectionHandler.cs b/src/Servers/Connections.Abstractions/src/ConnectionHandler.cs
index e9e208d61a..9bc8ab2902 100644
--- a/src/Servers/Connections.Abstractions/src/ConnectionHandler.cs
+++ b/src/Servers/Connections.Abstractions/src/ConnectionHandler.cs
@@ -6,15 +6,15 @@ using System.Threading.Tasks;
namespace Microsoft.AspNetCore.Connections
{
///
- /// 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)
+ /// Represents an endpoint that multiple connections connect to. For HTTP, endpoints are URLs, for non-HTTP it can be a TCP listener (or similar).
///
public abstract class ConnectionHandler
{
///
- /// Called when a new connection is accepted to the endpoint
+ /// Called when a new connection is accepted to the endpoint.
///
/// The new
/// A that represents the connection lifetime. When the task completes, the connection is complete.
public abstract Task OnConnectedAsync(ConnectionContext connection);
}
-}
\ No newline at end of file
+}
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
index 66a31011bb..7ffd9b2bc0 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
@@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[ConditionalFact]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [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
+ [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
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
{
@@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[ConditionalFact]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [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
+ [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
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task TlsAlpnHandshakeSelectsHttp2()
{
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
index 8d93032449..7bed5ea335 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
{
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
- [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
+ [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
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
{
private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[CollectDump]
[ConditionalFact]
- [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/9985", Queues = "Fedora.28.Amd64.Open")]
+ [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/9985", Queues = "Fedora.28.Amd64;Fedora.28.Amd64.Open")]
[Flaky("https://github.com/dotnet/aspnetcore/issues/9985", FlakyOn.All)]
public async Task GracefulShutdownWaitsForRequestsToFinish()
{
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
index b7af0267e5..80780257e4 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
@@ -595,7 +595,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
[InlineData(HttpProtocols.Http2)]
[InlineData(HttpProtocols.Http1AndHttp2)]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [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
+ [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
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols)
{
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
index 1e6fb930f8..db41d1e1b4 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
@@ -14,7 +14,7 @@ namespace Interop.FunctionalTests
// "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492"
&& new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet
// Debian 8 uses OpenSSL 1.0.1 which does not support ALPN
- && new SkipOnHelixAttribute("https://github.com/dotnet/aspnetcore/issues/10428") { Queues = "Debian.8.Amd64.Open" }.IsMet;
+ && new SkipOnHelixAttribute("https://github.com/dotnet/aspnetcore/issues/10428") { Queues = "Debian.8.Amd64;Debian.8.Amd64.Open" }.IsMet;
}
}
}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
index 8af04058c0..c277df763d 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
@@ -28,7 +28,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public void OpenApi_NoProjectExists()
{
var app = GetApplication();
@@ -40,7 +39,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public void OpenApi_ExplicitProject_Missing()
{
var app = GetApplication();
@@ -75,7 +73,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Add_ReuseItemGroup()
{
var project = CreateBasicProject(withOpenApi: true);
@@ -105,7 +102,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public void OpenApi_Add_File_EquivilentPaths()
{
var project = CreateBasicProject(withOpenApi: true);
@@ -131,7 +127,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Add_NSwagTypeScript()
{
var project = CreateBasicProject(withOpenApi: true);
@@ -152,7 +147,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Add_FromJson()
{
var project = CreateBasicProject(withOpenApi: true);
@@ -173,7 +167,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Add_File_UseProjectOption()
{
var project = CreateBasicProject(withOpenApi: true);
@@ -194,7 +187,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Add_MultipleTimes_OnlyOneReference()
{
var project = CreateBasicProject(withOpenApi: true);
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
index b48b7f688c..a8db61e99a 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
@@ -16,7 +16,6 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
public OpenApiRemoveTests(ITestOutputHelper output) : base(output) { }
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Remove_File()
{
var nswagJsonFile = "openapi.json";
@@ -62,7 +61,6 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Remove_ViaUrl()
{
_tempDir
@@ -151,7 +149,6 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
}
[Fact]
- [Flaky("", FlakyOn.All)]
public async Task OpenApi_Remove_Multiple()
{
var nswagJsonFile = "openapi.json";