Commit 9ae144b
committed
Merge remote-tracking branch 'origin/main' into features/fix-ui-project-name-and-apply-formatting
# Conflicts:
# AStar.Web.slnx
# src/aspire/AStar.Web.AppHost/AStar.Web.AppHost.csproj
# src/uis/AStar.Dev.Web/AStar.Dev.Web.csproj
# src/uis/AStar.Dev.Web/Components/App.razor
# src/uis/AStar.Dev.Web/Components/Layout/MainLayout.razor
# src/uis/AStar.Dev.Web/Components/Layout/MainLayout.razor.css
# src/uis/AStar.Dev.Web/Components/Layout/NavMenu.razor
# src/uis/AStar.Dev.Web/Components/Layout/NavMenu.razor.css
# src/uis/AStar.Dev.Web/Components/Pages/Counter.razor
# src/uis/AStar.Dev.Web/Components/Pages/Home.razor
# src/uis/AStar.Dev.Web/Components/Pages/Weather.razor
# src/uis/AStar.Dev.Web/Components/Routes.razor
# src/uis/AStar.Dev.Web/Components/_Imports.razor
# src/uis/AStar.Dev.Web/Program.cs
# src/uis/AStar.Dev.Web/appsettings.json
# src/uis/AStar.Dev.Web/published/AStar.Dev.Web.staticwebassets.endpoints.json
# src/uis/AStar.Dev.Web/published/appsettings.json
# src/uis/AStar.Dev.Web/published/web.config
# src/uis/AStar.Dev.Web/published/wwwroot/AStar.Dev.Web.styles.css
# src/uis/AStar.Dev.Web/wwwroot/app.css
# src/uis/AStar.Web/Components/Layout/NavMenu.razor.css
# src/uis/AStar.Web/appsettings.json1 file changed
+0
-0
lines changedLoading
0 commit comments