From ec63b7c0a7a4382935d21e8902baef3a2b6a1277 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Jun 2022 10:02:47 -0700 Subject: [PATCH 1/3] Update branding to 6.0.7 --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ee15f638e63f..7d23a2e191c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,8 +8,8 @@ 6 0 - 6 - true + 7 + false From ed742ff86cd27ca3aba8ce4cc82107e7af361da3 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Tue, 31 May 2022 14:36:07 -0700 Subject: [PATCH 2/3] Windows.11.Amd64.ClientPre.Open is leaving in June, proactively switch test runs (#41876) - `cherry-pick` of 1ae21a7336d121176ea96934b4e169d0258aec70 --- eng/scripts/RunHelix.ps1 | 2 +- eng/targets/Helix.Common.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index e8734f7aeb6c..ebe46bd6fcef 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -16,7 +16,7 @@ OSX.1015.Amd64.Open OSX.1100.Amd64.Open Windows.10.Amd64.Server20H2.Open - Windows.11.Amd64.ClientPre.Open + Windows.11.Amd64.Client.Open Windows.Amd64.Server2022.Open .PARAMETER RunQuarantinedTests By default quarantined tests are not run. Set this to $true to run only the quarantined tests. diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index f17314b89e81..99b2ae03ea45 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -7,7 +7,7 @@ (Mariner)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620 (Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652 - + @@ -21,7 +21,7 @@ - + From 48ddd137ed3d0d0bad47f379c338744fb3a07b97 Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Tue, 31 May 2022 11:52:45 -0700 Subject: [PATCH 3/3] Skip failing template tests (#41936) - `cherry-pick` of ce0edc0612c481a98318883eeb149c4058a290cf - see #41937 --- .../SimpleWithWebApplicationBuilderTests.cs | 2 +- src/ProjectTemplates/test/IdentityUIPackageTest.cs | 1 + src/ProjectTemplates/test/MvcTemplateTest.cs | 2 ++ src/ProjectTemplates/test/RazorPagesTemplateTest.cs | 3 +++ src/ProjectTemplates/test/WebApiTemplateTest.cs | 4 ++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs b/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs index 59d507fe508f..d275e88e93c5 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs @@ -131,7 +131,7 @@ public async Task MvcControllerActionWorks() Assert.Equal("Hello human", content); } - [Fact] + [Fact(Skip = "Failing on Windows environments: https://github.com/dotnet/aspnetcore/issues/41937")] public async Task DefaultEnvironment_Is_Development() { // Arrange diff --git a/src/ProjectTemplates/test/IdentityUIPackageTest.cs b/src/ProjectTemplates/test/IdentityUIPackageTest.cs index 75b94f804a26..f12d5f1741ac 100644 --- a/src/ProjectTemplates/test/IdentityUIPackageTest.cs +++ b/src/ProjectTemplates/test/IdentityUIPackageTest.cs @@ -99,6 +99,7 @@ public ITestOutputHelper Output [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public async Task IdentityUIPackage_WorksWithDifferentOptions() { var packageOptions = new Dictionary(); diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index 8984c7bbd7bd..a87b5bd5c975 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -41,10 +41,12 @@ public ITestOutputHelper Output [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null); [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public async Task MvcTemplate_ProgramMainNoAuthCSharp() => await MvcTemplateCore(languageOverride: null, new [] { ArgConstants.UseProgramMain }); private async Task MvcTemplateCore(string languageOverride, string[] args = null) diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs index ca1affdcadf1..5ab655c3d45f 100644 --- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs @@ -36,6 +36,7 @@ public ITestOutputHelper Output [ConditionalTheory] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] [InlineData(true)] [InlineData(false)] public async Task RazorPagesTemplate_NoAuth(bool useProgramMain) @@ -111,12 +112,14 @@ public async Task RazorPagesTemplate_NoAuth(bool useProgramMain) [InlineData(true)] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX, SkipReason = "No LocalDb on non-Windows")] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task RazorPagesTemplate_IndividualAuth_LocalDb(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: true, useProgramMain); [ConditionalTheory] [InlineData(false)] [InlineData(true)] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64 + HelixConstants.DebianAmd64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task RazorPagesTemplate_IndividualAuth(bool useProgramMain) => RazorPagesTemplate_IndividualAuth_Core(useLocalDB: false, useProgramMain); private async Task RazorPagesTemplate_IndividualAuth_Core(bool useLocalDB, bool useProgramMain) diff --git a/src/ProjectTemplates/test/WebApiTemplateTest.cs b/src/ProjectTemplates/test/WebApiTemplateTest.cs index 95b483311466..1c8d316016f4 100644 --- a/src/ProjectTemplates/test/WebApiTemplateTest.cs +++ b/src/ProjectTemplates/test/WebApiTemplateTest.cs @@ -75,18 +75,22 @@ public ITestOutputHelper Output [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task WebApiTemplateCSharp() => WebApiTemplateCore(languageOverride: null); [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task WebApiTemplateProgramMainCSharp() => WebApiTemplateCore(languageOverride: null, args: new [] { ArgConstants.UseProgramMain }); [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task WebApiTemplateMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseMinimalApis }); [ConditionalFact] [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [OSSkipCondition(OperatingSystems.Windows, SkipReason = "Template tests are currently failing on Windows: https://github.com/dotnet/aspnetcore/issues/41937")] public Task WebApiTemplateProgramMainMinimalApisCSharp() => WebApiTemplateCore(languageOverride: null, args: new[] { ArgConstants.UseProgramMain, ArgConstants.UseMinimalApis }); [ConditionalTheory]