diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyStringComparisonTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyStringComparisonTest.cs index 61eb71c618ce..9a3826840345 100644 --- a/src/Components/test/E2ETest/Tests/WebAssemblyStringComparisonTest.cs +++ b/src/Components/test/E2ETest/Tests/WebAssemblyStringComparisonTest.cs @@ -21,7 +21,7 @@ public class WebAssemblyStringComparisonTest : ServerTestBase base.JsonInputFormatter_RoundtripsRecordType(); diff --git a/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeIntegrationTestBase.cs b/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeIntegrationTestBase.cs index b2ffbcc4c4e2..a6285e76e9b4 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeIntegrationTestBase.cs +++ b/src/Mvc/test/Mvc.IntegrationTests/ComplexTypeIntegrationTestBase.cs @@ -1852,7 +1852,7 @@ public async Task ComplexBinder_BindsKeyValuePairProperty_EmptyPrefix_Success() Assert.Equal("10", entry.RawValue); } - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/11813")] + [Fact] public async Task ComplexBinder_BindsKeyValuePairProperty_NoCollectionData() { // Arrange @@ -1901,7 +1901,7 @@ public async Task ComplexBinder_BindsKeyValuePairProperty_NoCollectionData() Assert.Single(entry.Errors); } - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/11813")] + [Fact] public async Task ComplexBinder_BindsKeyValuePairProperty_NoData() { // Arrange @@ -3768,7 +3768,7 @@ private ModelMetadata GetMetadata(ModelBindingTestContext context, ParameterDesc protected virtual ModelBindingTestContext GetTestContext( Action updateRequest = null, Action updateOptions = null, - IModelMetadataProvider metadataProvider = null) + IModelMetadataProvider metadataProvider = null) => ModelBindingTestHelper.GetTestContext(updateRequest, updateOptions, actionDescriptor: null, metadataProvider); } } diff --git a/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs index f8da065e39ba..974cce8bf0f6 100644 --- a/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs +++ b/src/Mvc/test/Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs @@ -311,7 +311,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_EmptyPre Assert.Equal("10", entry.RawValue); } - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/11813")] + [Fact] public async Task KeyValuePairModelBinder_BindsKeyValuePairOfSimpleType_NoData() { // Arrange @@ -476,7 +476,7 @@ public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_EmptyPr Assert.Equal("10", entry.RawValue); } - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/11813")] + [Fact] public async Task KeyValuePairModelBinder_BindsKeyValuePairOfComplexType_NoData() { // Arrange diff --git a/src/ProjectTemplates/test/EmptyWebTemplateTest.cs b/src/ProjectTemplates/test/EmptyWebTemplateTest.cs index a448f039a4d9..4042b916312e 100644 --- a/src/ProjectTemplates/test/EmptyWebTemplateTest.cs +++ b/src/ProjectTemplates/test/EmptyWebTemplateTest.cs @@ -30,7 +30,8 @@ public async Task EmptyWebTemplateCSharp() await EmtpyTemplateCore(languageOverride: null); } - [Fact] + [ConditionalFact] + [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public async Task EmptyWebTemplateFSharp() { await EmtpyTemplateCore("F#"); @@ -43,12 +44,6 @@ private async Task EmtpyTemplateCore(string languageOverride) var createResult = await Project.RunDotNetNewAsync("web", language: languageOverride); Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); - // Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022 - if (languageOverride != null) - { - return; - } - var publishResult = await Project.RunDotNetPublishAsync(); Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult)); diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index e3fdf66b3aab..febfb230103f 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -26,7 +26,8 @@ public MvcTemplateTest(ProjectFactoryFixture projectFactory, ITestOutputHelper o public ProjectFactoryFixture ProjectFactory { get; } public ITestOutputHelper Output { get; } - [Fact] + [ConditionalFact] + [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#"); [ConditionalFact] @@ -48,12 +49,6 @@ private async Task MvcTemplateCore(string languageOverride) Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents); Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents); - // Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022 - if (languageOverride != null) - { - return; - } - var publishResult = await Project.RunDotNetPublishAsync(); Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult)); diff --git a/src/ProjectTemplates/test/WebApiTemplateTest.cs b/src/ProjectTemplates/test/WebApiTemplateTest.cs index 3ed7ed94f4e5..fb66d3403a47 100644 --- a/src/ProjectTemplates/test/WebApiTemplateTest.cs +++ b/src/ProjectTemplates/test/WebApiTemplateTest.cs @@ -32,7 +32,8 @@ public WebApiTemplateTest(ProjectFactoryFixture factoryFixture, ITestOutputHelpe [InlineData("SingleOrg", new string[] { "--calls-graph" })] public Task WebApiTemplateCSharp_IdentityWeb_BuildsAndPublishes(string auth, string[] args) => PublishAndBuildWebApiTemplate(languageOverride: null, auth: auth, args: args); - [Fact] + [ConditionalFact] + [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")] public Task WebApiTemplateFSharp() => WebApiTemplateCore(languageOverride: "F#"); [ConditionalFact] @@ -66,12 +67,6 @@ private async Task PublishAndBuildWebApiTemplate(string languageOverride, string var createResult = await Project.RunDotNetNewAsync("webapi", language: languageOverride, auth: auth, args: args); Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); - // Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022 - if (languageOverride != null) - { - return; - } - var publishResult = await Project.RunDotNetPublishAsync(); Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult)); @@ -87,12 +82,6 @@ private async Task WebApiTemplateCore(string languageOverride) { await PublishAndBuildWebApiTemplate(languageOverride, null, null); - // Avoid the F# compiler. See https://github.com/dotnet/aspnetcore/issues/14022 - if (languageOverride != null) - { - return; - } - using (var aspNetProcess = Project.StartBuiltProjectAsync()) { Assert.False( diff --git a/src/ProjectTemplates/test/WorkerTemplateTest.cs b/src/ProjectTemplates/test/WorkerTemplateTest.cs index 1656ebb0896b..f488b7597676 100644 --- a/src/ProjectTemplates/test/WorkerTemplateTest.cs +++ b/src/ProjectTemplates/test/WorkerTemplateTest.cs @@ -5,7 +5,6 @@ using Templates.Test.Helpers; using Xunit; using Xunit.Abstractions; -using Microsoft.AspNetCore.Testing; namespace Templates.Test { @@ -21,8 +20,7 @@ public WorkerTemplateTest(ProjectFactoryFixture projectFactory, ITestOutputHelpe public ProjectFactoryFixture ProjectFactory { get; } public ITestOutputHelper Output { get; } - [ConditionalTheory] - [OSSkipCondition(OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/sdk/issues/12831")] + [Theory] [InlineData("C#")] [InlineData("F#")] public async Task WorkerTemplateAsync(string language) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/ApplicationPartDiscoveryIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/ApplicationPartDiscoveryIntegrationTest.cs index 32f91bbdd228..f258b6eaa109 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/ApplicationPartDiscoveryIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/ApplicationPartDiscoveryIntegrationTest.cs @@ -20,7 +20,7 @@ public ApplicationPartDiscoveryIntegrationTest(BuildServerTestFixture buildServe public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDotnetMsbuild() => Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute(MSBuildProcessKind.Dotnet); - [ConditionalFact(Skip = "net5.0 TFM is not recognized on Desktop MSBuild. A VS update will be needed.")] + [ConditionalFact] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InitializeTestProject("AppWithP2PReference", additionalProjects: "ClassLibrary")] public Task Build_ProjectWithDependencyThatReferencesMvc_AddsAttribute_WhenBuildingUsingDesktopMsbuild() diff --git a/src/Security/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs b/src/Security/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs index e216b7d19b96..e91874ac061a 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs +++ b/src/Security/test/AuthSamples.FunctionalTests/IdentityExternalClaimsTests.cs @@ -29,7 +29,7 @@ public async Task DefaultReturns200() Assert.Equal(HttpStatusCode.OK, response.StatusCode); } - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/8387")] + [Fact] public async Task MyClaimsRedirectsToLoginPageWhenNotLoggedIn() { // Arrange & Act diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs index 89c44e719f4b..4e1e83c4b42e 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs @@ -77,7 +77,7 @@ public async Task AppOfflineDroppedWhileSiteFailedToStartInShim_AppOfflineServed DeletePublishOutput(deploymentResult); } - [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/3835")] + [ConditionalFact] public async Task AppOfflineDroppedWhileSiteFailedToStartInRequestHandler_SiteStops_InProcess() { var deploymentResult = await DeployApp(HostingModel.InProcess); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs index f057f153a8f9..4026166b593d 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs @@ -66,7 +66,7 @@ public async Task RequestAbortedTokenFires() await _fixture.Client.RetryRequestAsync("/WaitingRequestCount", async message => await message.Content.ReadAsStringAsync() == "0"); } - [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24695")] + [ConditionalFact] public async Task ClientDisconnectCallbackStress() { // Fixture initialization fails if inside of the Task.Run, so send an diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs index 4e940a66bc09..70ceb83c116c 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs @@ -63,7 +63,7 @@ private void InitializeArgs() }; } - [ConditionalTheory(Skip = "Disabling while debugging. https://github.com/dotnet/aspnetcore-internal/issues/1363")] + [ConditionalTheory] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")] [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support")] [InlineData("", "Interop HTTP/2 GET")]