Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Sep 5, 2024

I detected changes in the release/9.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/9.0 by the following committers:

  • github-actions[bot]
  • dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0-to-main main
git pull https://github.com/dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git checkout -b merge/release/9.0-to-main main
git pull [email protected]:dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 9 commits September 3, 2024 16:59
…0240831.1 (#57668)

Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing
 From Version 9.0.0-preview.8.24425.2 -> To Version 9.0.0-preview.8.24431.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…57436)

[release/9.0] Update dependencies from dotnet/efcore, dotnet/runtime


 - Fix Azure.Identity package downgrade warning
* Update dependencies from https://github.com/dotnet/winforms build 20240824.1

System.Drawing.Common
 From Version 9.0.0-rc.1.24411.4 -> To Version 9.0.0-rc.2.24424.1

* Update dependencies from https://github.com/dotnet/winforms build 20240830.3

System.Drawing.Common
 From Version 9.0.0-rc.2.24424.1 -> To Version 9.0.0-rc.2.24430.3

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…57686)

* Update dependencies from https://github.com/dotnet/efcore build 20240903.3

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 9.0.0-rc.2.24452.5 -> To Version 9.0.0-rc.2.24453.3

* Update dependencies from https://github.com/dotnet/runtime build 20240903.5

Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 9.0.0-rc.2.24429.19 -> To Version 9.0.0-rc.2.24453.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….1 (#57691)

Microsoft.SourceBuild.Intermediate.xdt , Microsoft.Web.Xdt
 From Version 9.0.0-preview.24317.2 -> To Version 9.0.0-preview.24453.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…829.5 (#57667)

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor
 From Version 9.0.0-beta.24423.2 -> To Version 9.0.0-beta.24429.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…57528)

* Update dependencies from https://github.com/dotnet/source-build-externals build 20240821.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 9.0.0-alpha.1.24407.1 -> To Version 9.0.0-alpha.1.24421.1

* Update dependencies from https://github.com/dotnet/source-build-externals build 20240826.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 9.0.0-alpha.1.24421.1 -> To Version 9.0.0-alpha.1.24426.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…904.1 (#57697)

[release/9.0] Update dependencies from dotnet/efcore
…itialization (#57678)

Backport of #57557 to release/9.0

# [Blazor] Invoke inbound activity handlers on circuit initialization

Fixes an issue where inbound activity handlers don't get invoked on circuit initialization.

> [!NOTE]
> This bug only affects Blazor Server apps, _not_ Blazor Web apps utilizing server interactivity

## Description

Inbound activity handlers were added in .NET 8 to enable:
* Monitoring inbound circuit activity
* Enabling server-side Blazor services to be [accessed from a different DI scope](https://learn.microsoft.com/aspnet/core/blazor/fundamentals/dependency-injection?view=aspnetcore-8.0#access-server-side-blazor-services-from-a-different-di-scope)

However, prior to the fix in this PR, this feature didn't apply to the first interactive render after the initial page load. This means that when utilizing this feature to access Blazor services from a different DI scope, the service might only become accessible after subsequent renders, not the initial render.

This PR makes the following changes:
* Updated `CircuitHost` to invoke inbound activity handlers on circuit initialization
* Added an extra test to verify that inbound activity handlers work on the initial page load
* Updated existing Blazor Web tests to reuse test logic from the non-web tests
  * This helps to ensure that the feature works the same way on Blazor Server and Blazor Web

Fixes #57481

## Customer Impact

The [initial issue report](#57481) was from a customer who was impacted experiencing this problem in their app. The problem does not inherently cause an app to stop working, but if the application code has made the (rightful) assumption that the service accessor is initialized, then session may crash. The workaround is to upgrade the app to use the "Blazor Web App" pattern, although this can be a fairly large change.

## Regression?

- [ ] Yes
- [X] No

The problem has existed since the introduction of the feature in .NET 8.
## Risk

- [ ] High
- [ ] Medium
- [X] Low

The change is straightforward, and new tests have been added to ensure that it addresses the issue. Existing tests verify that a new regression is not introduced.
## Verification

- [X] Manual (required)
- [X] Automated

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [x] N/A
@github-actions github-actions bot requested review from a team, BrennanConroy and wtgodbe as code owners September 5, 2024 17:19
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 5, 2024
captainsafia and others added 3 commits September 10, 2024 10:40
## Description

Earlier in this release cycle, we removed the Swagger UI from the built-in templates and updated the launch URL on the Web API templates to point to the `/weatherforecast` endpoint.

Recently, we discovered that this default might be problematic for scenarios where the templates are instantiated with authentication configured. In this case, navigating to `/weatherforecast` on launch will result in 401 errors as the browser is unauthenticated.

This sparked conversation about whether it was meaningful to launch URL to this endpoint at all and we decided to remove it in favor of allowing editors/users to configure the launch behavior as desired by their launch configuration.

Resolve dotnet/AspNetCore-ManualTests#3002.

## Customer Impact

Prior to this PR, customers that are creating new templates with authentication enabled might see confusing behavior when launching their applications without authentication configured correctly. 

## Regression?

- [ ] Yes
- [X] No

## Risk

- [ ] High
- [ ] Medium
- [X] Low

This change only impacts the Web API templates in .NET 9 and beyond and doesn't affect the runtime behavior of the application.

## Verification

- [X] Manual (required)
- [ ] Automated

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [X] N/A
Backport of #57671 to release/9.0

/cc @javiercn

# [Static Assets] Improve development experience

Fixes an issue when running a published app on Development and provides a better error when static web assets are not enabled during development

## Description

- Addresses two issues that we found during development:
  - When the user publishes the app and runs against the `Development` environment:
    - Some logic that is pivoted on based on the Environment and is only used during development (Build as opposed to Publish) interferes with the output and causes issues on the running app.
  - When the app runs during development, but Static Web Assets are not enabled for some reason:
    - The app isn't able to find some static files and errors out.
    - The fix improves the experience by detecting this situation and logging a warning on the console with instructions on how to enable static web assets explicitly.

## Customer Impact

* Running in Docker 'Regular Mode' in Visual Studio breaks as the app runs the published output with `Development` environment.
* Running the app during development with a custom environment or without a launch profile will cause some static files to not be found.

## Regression?

- [X] Yes
- [ ] No

8.0 and earlier, the published output was runnable in `Development` environment. For example in Docker containers regular mode (how the issue was found).

## Risk

- [ ] High
- [ ] Medium
- [X] Low

The changes uses information that we produce during the build (Build and Publish) to differentiate between the two scenarios and disable the development functionality for the published output and provide a better error message when static web assets are not enabled during development.

## Verification

- [X] Manual (required)
- [ ] Automated

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [X] N/A

----

## When servicing release/2.1

- [ ] Make necessary changes in eng/PatchConfig.props
@wtgodbe wtgodbe enabled auto-merge September 10, 2024 19:31
@wtgodbe wtgodbe merged commit 7d40e5e into main Sep 10, 2024
@wtgodbe wtgodbe deleted the merge/release/9.0-to-main branch September 10, 2024 23:49
@dotnet-policy-service dotnet-policy-service bot added this to the 10.0-preview1 milestone Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants