Update starter template from .NET 9 app template updates #6124

DamianEdwards · 2024-10-05T00:48:05Z

This updates the starter template with changes from the relevant ASP.NET Core 9 templates.

net8 version gets just a Bootstrap update & some accessibility fixes
net9 version gets all changes

Contributes to #6076

Microsoft Reviewers: Open in CodeFlow

- net8 version gets just a Bootstrap update - net9 version gets all changes

eng/Versions.props

eerhardt · 2024-10-07T16:51:01Z

            Endpoints: ["http://localhost:\\d+", "https://localhost:\\d+"]),

Why are we changing this test? Shouldn't we still be hitting this endpoint?

Refers to: tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs:122 in f3d49cf. [](commit_id = f3d49cf, deletion_comment = False)

DamianEdwards · 2024-10-07T16:54:38Z

Why are we changing this test? Shouldn't we still be hitting this endpoint?

Because the launchUrl was changed and the test was failing as it was attempting to verify the endpoints showed up in the dashboard.

eerhardt · 2024-10-07T17:04:27Z

Why are we changing this test? Shouldn't we still be hitting this endpoint?

Because the launchUrl was changed and the test was failing as it was attempting to verify the endpoints showed up in the dashboard.

@radical - should the test be hitting this endpoint and ensure it "works" (returns a success status code)? Or does that happen elsewhere?

radical · 2024-10-07T17:17:39Z

Why are we changing this test? Shouldn't we still be hitting this endpoint?

Because the launchUrl was changed and the test was failing as it was attempting to verify the endpoints showed up in the dashboard.

@radical - should the test be hitting this endpoint and ensure it "works" (returns a success status code)? Or does that happen elsewhere?

The endpoint tried is what it finds on the dashboard, and checks that it is the weather page. For the redis cache case, this method checks the returned results too.

aspire/tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs

Lines 52 to 111 in 3a341a2

    
           public static async Task CheckWebFrontendWorksAsync(IBrowserContext context, string url, ITestOutputHelper testOutput, string logPath, bool hasRedisCache = false) 
        
           { 
        
               var page = await context.NewPageWithLoggingAsync(testOutput); 
        
               try 
        
               { 
        
                   // Enabling routing disables the http cache 
        
                   await page.RouteAsync("**", async route => await route.ContinueAsync()); 
        
                   await page.GotoAsync(url); 
        
                   await page.GetByRole(AriaRole.Link, new PageGetByRoleOptions { Name = "Weather" }).ClickAsync(); 
        
                   var tableLoc = page.Locator("//table[//thead/tr/th/text()='Date']"); 
        
                   await Expect(tableLoc).ToBeVisibleAsync(); 
        
                   if (hasRedisCache) 
        
                   { 
        
                       // Compare weather data after refreshes 
        
                       var firstLoadText = string.Join(',', (await GetAndValidateCellTexts(tableLoc)).SelectMany(r => r)); 
        
                       await Task.Delay(10_000); 
        
                       await page.ReloadAsync(new PageReloadOptions { WaitUntil = WaitUntilState.Load }); 
        
                       var secondLoadText = string.Join(',', (await GetAndValidateCellTexts(tableLoc)).SelectMany(r => r)); 
        
                       Assert.NotEqual(firstLoadText, secondLoadText); 
        
                   } 
        
               } 
        
               catch (Exception ex) 
        
               { 
        
                   testOutput.WriteLine($"Error: {ex}"); 
        
                   string screenshotPath = Path.Combine(logPath, "webfrontend-fail.png"); 
        
                   await page.ScreenshotAsync(new PageScreenshotOptions { Path = screenshotPath }); 
        
                   throw; 
        
               } 
        
               static async Task<List<string[]>> GetAndValidateCellTexts(ILocator tableLoc) 
        
               { 
        
                   List<string[]> cellTexts = []; 
        
                   var rowsLoc = tableLoc.Locator("//tbody/tr"); 
        
                   foreach (var row in await rowsLoc.AllAsync()) 
        
                   { 
        
                       var texts = (await row.Locator("//td").AllAsync()) 
        
                           .Select(cell => cell.InnerHTMLAsync()) 
        
                           .Select(t => t.Result) 
        
                           .ToArray(); 
        
                       cellTexts.Add(texts); 
        
                   } 
        
                   foreach (var row in cellTexts) 
        
                   { 
        
                       Assert.Collection(row, 
        
                           r => Assert.True(DateTime.TryParse(r, out _)), 
        
                           r => Assert.True(int.TryParse(r, out var actualTempC) && actualTempC >= -20 && actualTempC <= 55), 
        
                           r => Assert.True(int.TryParse(r, out var actualTempF) && actualTempF >= -5 && actualTempF <= 133), 
        
                           r => Assert.Contains(r, new HashSet<string>{"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"})); 
        
                   } 
        
                   return cellTexts; 
        
               } 
        
           }

radical · 2024-10-07T17:18:18Z

We'll need to add a check for the /weatherforecast endpoint explicitly.

radical · 2024-10-07T17:44:37Z

I think we should test the 8.0 starter template too, so it doesn't regress.

DamianEdwards · 2024-10-07T18:49:20Z

We'll need to add a check for the /weatherforecast endpoint explicitly.

@radical OK. Where would that go? Another test method on StarterTemplateRunTestsBase<T> ?

radical · 2024-10-07T19:02:20Z

We'll need to add a check for the /weatherforecast endpoint explicitly.

@radical OK. Where would that go? Another test method on StarterTemplateRunTestsBase<T> ?

Since this would be just checking that the endpoint exists, I would add it to AssertStarterTemplateRunAsync in WorkloadTestsBase.

DamianEdwards · 2024-10-07T19:05:15Z

Since this would be just checking that the endpoint exists

@radical not quite following. Wouldn't we want it to send a request and verify the result? What do you mean by "checking the endpoint exists"?

radical · 2024-10-07T19:06:53Z

Since this would be just checking that the endpoint exists

@radical not quite following. Wouldn't we want it to send a request and verify the result? What do you mean by "checking the endpoint exists"?

Sure, that makes sense. You can add a method to that class, and call from AssertStarterTemplateRunAsync so it gets used by any test checking the starter template.

tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs

radical · 2024-10-07T19:09:37Z

I think we should test the 8.0 starter template too, so it doesn't regress.

Using the DefaultTargetFramework thing that I mentioned in the other comment, you can skip this part, as it will get covered in running all the tests with tfm=net8.0 .

tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs

… changed

…default

radical · 2024-10-07T20:55:59Z

I have added tfm=net8.0 variants of the starter template tests. I think the templates that explicitly differ should get checked on the PRs to, so I added them here, instead of depending on an OOB test run.

…able or not

radical · 2024-10-10T18:45:22Z

/azp run

azure-pipelines · 2024-10-10T18:45:37Z

Azure Pipelines successfully started running 1 pipeline(s).

DamianEdwards · 2024-10-11T00:33:15Z

@radical yay this is passing! Now we can focus on the content getting approved 😄

eng/Versions.props

...es/aspire-starter-net8/Aspire-StarterApplication.1.ApiService/Properties/launchSettings.json

...re-starter/Aspire-StarterApplication.1.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css

joperezr

Changes look good, other than the two comments I left. Other than that this seems like good to go, thanks @DamianEdwards

DamianEdwards · 2024-10-17T21:01:34Z

Looks like a Helix timeout for the Linux leg 😞

eerhardt · 2024-10-17T21:18:42Z

eng/Versions.props

    <NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>8.0.8</NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
    <!-- for templates -->
    <MicrosoftExtensionsHttpResiliencePackageVersionForNet8>$(MicrosoftExtensionsHttpResiliencePackageVersion)</MicrosoftExtensionsHttpResiliencePackageVersionForNet8>
    <MicrosoftExtensionsHttpResiliencePackageVersionForNet9>$(MicrosoftExtensionsHttpResiliencePackageVersion)</MicrosoftExtensionsHttpResiliencePackageVersionForNet9>


What's the story with MicrosoftExtensionsHttpResiliencePackageVersionForNet9? It has the same version as "ForNet8". Shouldn't these 2 versions be separate, so when I get a .NET 9 app, I get the 9.0 Resilience package?

Yep, it's listed in #6076 as a TODO

I'm going to address the remaining content items in #6076 as part of the next PR which refactors the templates down to a single template you can select TFM and Aspire version from.

Update starter template from .NET 9 app template updates

b08f053

- net8 version gets just a Bootstrap update - net9 version gets all changes

DamianEdwards requested review from radical and joperezr October 5, 2024 00:48

DamianEdwards added 5 commits October 4, 2024 17:54

Add missing package ref for Microsoft.AspNetCore.OpenApi

6ed469a

Add min-height fix

b70f3ed

Accessibility fix for net8 weather page

bcabecf

Forms accessibility fix & array line breaks

a3abaa7

Fix test for template change

48dc878

DamianEdwards requested a review from eerhardt as a code owner October 5, 2024 22:09

DamianEdwards added 2 commits October 7, 2024 09:32

Merge branch 'main' into damianedwards/update-starter-web-net9

cfb2859

Merge branch 'main' into damianedwards/update-starter-web-net9

200c313

eerhardt reviewed Oct 7, 2024

View reviewed changes

eng/Versions.props Outdated Show resolved Hide resolved

DamianEdwards marked this pull request as draft October 7, 2024 16:41

Move files

f3d49cf

DamianEdwards marked this pull request as ready for review October 7, 2024 16:44

radical reviewed Oct 7, 2024

View reviewed changes

tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs Outdated Show resolved Hide resolved

Update tests

a82d009

radical reviewed Oct 7, 2024

View reviewed changes

tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs Show resolved Hide resolved

radical reviewed Oct 7, 2024

View reviewed changes

tests/Aspire.Workload.Tests/StarterTemplateRunTestsBase.cs Outdated Show resolved Hide resolved

DamianEdwards and others added 5 commits October 7, 2024 12:37

Update StarterTemplateRunTestsBase.cs

a7e2ec9

Fix clearing template installation for local runs, when packages have…

7fa152c

… changed

Plumb support for custom tfm in AspireProject, and use net9.0 as the …

61576b1

…default

BuildEnvironment: fix enum to make Current the default, when unset

93d4eed

Add starter template tests for tfm=net8.0

11c7d7a

build-analysis bot mentioned this pull request Oct 7, 2024

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

3 tasks

condition the new ApiServiceWorks test on whether playwright is avail…

5061667

…able or not

Merge branch 'main' into damianedwards/update-starter-web-net9

da08297

DamianEdwards mentioned this pull request Oct 12, 2024

Templates 9.0 follow up work #6076

Closed

9 tasks

joperezr reviewed Oct 17, 2024

View reviewed changes

eng/Versions.props Show resolved Hide resolved

joperezr reviewed Oct 17, 2024

View reviewed changes

...es/aspire-starter-net8/Aspire-StarterApplication.1.ApiService/Properties/launchSettings.json Show resolved Hide resolved

joperezr reviewed Oct 17, 2024

View reviewed changes

...re-starter/Aspire-StarterApplication.1.Web/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css Show resolved Hide resolved

joperezr approved these changes Oct 17, 2024

View reviewed changes

DamianEdwards added 2 commits October 17, 2024 10:34

Remove unused files

4db5074

Add missing files

fbca952

eerhardt reviewed Oct 17, 2024

View reviewed changes

DamianEdwards merged commit 269864e into main Oct 17, 2024
9 checks passed

DamianEdwards deleted the damianedwards/update-starter-web-net9 branch October 17, 2024 22:33

github-actions bot locked and limited conversation to collaborators Dec 13, 2024

github-actions bot added the area-templates label Mar 10, 2025

Update starter template from .NET 9 app template updates #6124

Update starter template from .NET 9 app template updates #6124

Uh oh!

Conversation

DamianEdwards commented Oct 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Microsoft Reviewers: Open in CodeFlow

Uh oh!

Uh oh!

eerhardt commented Oct 7, 2024

Uh oh!

DamianEdwards commented Oct 7, 2024

Uh oh!

eerhardt commented Oct 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

radical commented Oct 7, 2024

Uh oh!

radical commented Oct 7, 2024

Uh oh!

radical commented Oct 7, 2024

Uh oh!

DamianEdwards commented Oct 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

radical commented Oct 7, 2024

Uh oh!

DamianEdwards commented Oct 7, 2024

Uh oh!

radical commented Oct 7, 2024

Uh oh!

Uh oh!

radical commented Oct 7, 2024

Uh oh!

Uh oh!

Uh oh!

radical commented Oct 7, 2024

Uh oh!

radical commented Oct 10, 2024

Uh oh!

azure-pipelines bot commented Oct 10, 2024

Uh oh!

DamianEdwards commented Oct 11, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

joperezr left a comment

Choose a reason for hiding this comment

Uh oh!

DamianEdwards commented Oct 17, 2024

Uh oh!

eerhardt Oct 17, 2024

Choose a reason for hiding this comment

Uh oh!

DamianEdwards Oct 17, 2024

Choose a reason for hiding this comment

Uh oh!

DamianEdwards Oct 17, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DamianEdwards commented Oct 5, 2024 •

edited

Loading

eerhardt commented Oct 7, 2024 •

edited

Loading

DamianEdwards commented Oct 7, 2024 •

edited

Loading