Merge branch 'master' into halter73/mega-merge

2020-02-18 16:51:15 -08:00 · 2020-02-18 16:51:15 -08:00 · 607a6b4f8a
--- 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:
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -13,21 +13,21 @@
      <Uri>https://github.com/dotnet/blazor</Uri>
      <Sha>dd7fb4d3931d556458f62642c2edfc59f6295bfb</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.1.20114.1">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.1.20114.5">
      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
+      <Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.1.20114.1">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.1.20114.5">
      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
+      <Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.1.20114.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.1.20114.5">
      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
+      <Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.1.20114.1">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.1.20114.5">
      <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>609026ea14eeb52a068d228d84987f24f3c64136</Sha>
+      <Sha>9acda9485be8e2238067508474dfa44fcc34f81e</Sha>
    </Dependency>
    <Dependency Name="dotnet-ef" Version="5.0.0-preview.1.20113.3">
      <Uri>https://github.com/dotnet/efcore</Uri>
@ -289,10 +289,6 @@
      <Uri>https://github.com/dotnet/extensions</Uri>
      <Sha>396aff55e0b4628a7a44375e4b72e5d19a6e37ab</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.CSharp" Version="5.0.0-alpha.1.19563.6" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.1.20113.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/runtime</Uri>
      <Sha>0f3f8e1930c28b67f29990126bc2e8527e959a2e</Sha>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -65,14 +65,12 @@
    <MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20113.3</MicrosoftDotNetGenAPIPackageVersion>
    <!-- Packages from dotnet/roslyn -->
    <MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta3-20114-02</MicrosoftNetCompilersToolsetPackageVersion>
-    <!-- Packages from dotnet/core-setup -->
+    <!-- Packages from dotnet/runtime -->
    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.1.20113.7</MicrosoftExtensionsDependencyModelPackageVersion>
    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppInternalPackageVersion>
    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppRefPackageVersion>
    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.1.20113.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
    <NETStandardLibraryRefPackageVersion>2.1.0-preview.1.20113.7</NETStandardLibraryRefPackageVersion>
-    <!-- Packages from dotnet/corefx -->
-    <MicrosoftCSharpPackageVersion>5.0.0-alpha.1.19563.6</MicrosoftCSharpPackageVersion>
    <MicrosoftWin32RegistryPackageVersion>5.0.0-preview.1.20113.7</MicrosoftWin32RegistryPackageVersion>
    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.1.20113.7</MicrosoftWin32SystemEventsPackageVersion>
    <SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.1.20113.7</SystemComponentModelAnnotationsPackageVersion>
@ -167,10 +165,10 @@
    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.1.20113.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.1.20113.3</MicrosoftEntityFrameworkCorePackageVersion>
    <!-- Packages from dotnet/aspnetcore-tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.1.20114.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.1.20114.1</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.1.20114.1</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.1.20114.5</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.1.20114.5</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.1.20114.5</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.1.20114.5</MicrosoftNETSdkRazorPackageVersion>
  </PropertyGroup>
  <!--

@ -194,6 +192,7 @@
    <MicrosoftSymbolUploaderBuildTaskPackageVersion>1.0.0-beta-64023-03</MicrosoftSymbolUploaderBuildTaskPackageVersion>
    <MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
    <!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
+    <MicrosoftCSharpPackageVersion>4.7.0</MicrosoftCSharpPackageVersion>
    <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
    <SystemCodeDomPackageVersion>4.4.0</SystemCodeDomPackageVersion>
    <SystemCommandlineExperimentalPackageVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalPackageVersion>
--- a/eng/helix/helix.proj
+++ b/eng/helix/helix.proj
@ -12,7 +12,8 @@
  <Import Project="..\Build.props" />

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

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

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

  <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' != 'true' ">
    <HelixType>dev</HelixType>
-    <Creator>$(USERNAME)</Creator>
-    <Creator Condition="'$(USERNAME)' == ''">$(USER)</Creator>
+    <!-- Creator is not valid for internal queues -->
+    <Creator Condition="'$(_UseHelixOpenQueues)' == 'true'">$(USERNAME)</Creator>
+    <Creator Condition="'$(USERNAME)' == '' AND '$(_UseHelixOpenQueues)' == 'true'">$(USER)</Creator>
    <HelixBuild>$([System.DateTime]::Now.ToString('yyyyMMddHHmm'))</HelixBuild>
  </PropertyGroup>

--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@ -40,6 +40,12 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
      <_SelectedPlatforms>@(HelixProjectPlatform)</_SelectedPlatforms>
    </PropertyGroup>

+    <ItemGroup Condition="'$(_UseHelixOpenQueues)' != 'true'">
+      <_Temp Include="@(HelixAvailableTargetQueue)" />
+      <HelixAvailableTargetQueue Remove="@(HelixAvailableTargetQueue)" />
+      <HelixAvailableTargetQueue Include="@(_Temp->'%(Identity)'->Replace('.Open',''))" />
+    </ItemGroup>    
+    
    <ItemGroup>
      <!-- Include default queues based on platform -->
      <_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true'" />
--- 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;
                }
--- 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
 {
    /// <summary>
-    /// 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).
    /// </summary>
    public abstract class ConnectionHandler
    {
        /// <summary>
-        /// Called when a new connection is accepted to the endpoint
+        /// Called when a new connection is accepted to the endpoint.
        /// </summary>
        /// <param name="connection">The new <see cref="ConnectionContext"/></param>
        /// <returns>A <see cref="Task"/> that represents the connection lifetime. When the task completes, the connection is complete.</returns>
        public abstract Task OnConnectedAsync(ConnectionContext connection);
    }
-}
+}
--- 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()
        {
--- 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()
        {
--- 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)
        {
--- 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;
        }
    }
 }
--- 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("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public void OpenApi_NoProjectExists()
        {
            var app = GetApplication();
@ -40,7 +39,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
        }

        [Fact]
-        [Flaky("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public void OpenApi_ExplicitProject_Missing()
        {
            var app = GetApplication();
@ -75,7 +73,6 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
        }

        [Fact]
-        [Flaky("<No longer needed; tracked in Kusto>", 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("<No longer needed; tracked in Kusto>", 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("<No longer needed; tracked in Kusto>", 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("<No longer needed; tracked in Kusto>", 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("<No longer needed; tracked in Kusto>", 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("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public async Task OpenApi_Add_MultipleTimes_OnlyOneReference()
        {
            var project = CreateBasicProject(withOpenApi: true);
--- 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("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public async Task OpenApi_Remove_File()
        {
            var nswagJsonFile = "openapi.json";
@ -62,7 +61,6 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
        }

        [Fact]
-        [Flaky("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public async Task OpenApi_Remove_ViaUrl()
        {
            _tempDir
@ -151,7 +149,6 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
        }

        [Fact]
-        [Flaky("<No longer needed; tracked in Kusto>", FlakyOn.All)]
        public async Task OpenApi_Remove_Multiple()
        {
            var nswagJsonFile = "openapi.json";