[automated] Merge branch 'main' => 'vNext' #1859

dotnet-maestro-bot · 2024-01-25T22:52:14Z

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

This PR merges commits made on main by the following committers:

drewnoakes
JamesNK
adamint

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.

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 main
git pull --ff-only
git checkout vNext
git pull --ff-only
git merge --no-ff main

# 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-maestro-bot/aspire HEAD:merge/main-to-vNext

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/aspire HEAD:merge/main-to-vNext

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/main-to-vNext'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/main-to-vNext vNext
git pull https://github.com/dotnet-maestro-bot/aspire merge/main-to-vNext
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/aspire HEAD:merge/main-to-vNext

or if you are using SSH

git checkout -b merge/main-to-vNext vNext
git pull [email protected]:dotnet-maestro-bot/aspire merge/main-to-vNext
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/aspire HEAD:merge/main-to-vNext

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Microsoft Reviewers: Open in CodeFlow

Windows allows systems to exclude specific port ranges, after which attempts to bind them will fail. The ranges will vary from machine to machine, and can be viewed with the command `netsh interface ipv4 show excludedportrange protocol=tcp`. We're seeing users hitting issues with port 63824. While the excluded ranges will vary from machine to machine, it seems like these higher numbers are more likely to be excluded. This change moves the ports lower, which should help alleviate this issue.

… badge on resource name (dotnet#1788) * add details column to trace detail * Update xlfs, style button * remove error badge * Put unread error counter on name * update trace detail details column to absolute width * Remove unused resx strings, re-add titles for resource name * Make error counter badge text white in dark theme * fixed variable name --------- Co-authored-by: Adam Ratzman <[email protected]>

This code is no longer used, so remove it.

* Add Pomelo.EntityFrameworkCore.MySql component. * Add Pomelo.EntityFrameworkCore.MySql tests. * Update XML documentation. * Update XML documentation to current conventions. * Add documentation for Pomelo metrics. * Use configuration schema generator. * Allow ServerVersion setting to be optional. * Remove (now optional) ServerVersion setting from test. * Remove MySqlConnector logging categories from Pomelo section. * Add Microsoft.Extensions.Configuration.Binder. * Add basic MySQL Aspire.Hosting tests. These were modeled on AddPostgresTests and AddRedisTests. * Add Pomelo EFCore integration tests. * Incorporate project change from dff1467. * PR feedback - Add log categories to ConfigurationSchema - Check the "API" boxes for the MySql components in the Progress doc - Issue a query in the functional test. Follow the same pattern as Oracle - Set the ServerVersion explicitly in the functional test, so the connection can be retried when the MySql server isn't running. --------- Co-authored-by: Eric Erhardt <[email protected]>

) Fix dotnet#1715

…tnet#1865)

Follow up to dotnet#1870

* Fix Storage Queue README The ConnectionStrings setting had the wrong name, so it doesn't work with what is in the code section above it. Fix dotnet#1679 * Fix CosmosDB README The extension method takes 2 strings: connection name and database name. Fix dotnet#873

Co-authored-by: Adam Ratzman <[email protected]>

* add failedtostart error icon to state * add starting icon --------- Co-authored-by: Adam Ratzman <[email protected]>

…build 0.1.49+5 (dotnet#1890) Microsoft.DeveloperControlPlane.darwin-amd64 , Microsoft.DeveloperControlPlane.darwin-arm64 , Microsoft.DeveloperControlPlane.linux-amd64 , Microsoft.DeveloperControlPlane.linux-arm64 , Microsoft.DeveloperControlPlane.windows-386 , Microsoft.DeveloperControlPlane.windows-amd64 , Microsoft.DeveloperControlPlane.windows-arm64 From Version 0.1.48 -> To Version 0.1.49 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Fix inconsistent trace detail spacing * Clean up

* End to end SQL playground.

…#1901) * Fix dashboard not working with two applicationUrls specified. * PR feedback. Defensive code.

* remove unnecessary code from Orleans AppHost * format comment in Orleans AppHost

- We're no longer embedding the dashboard so this shouldn't be required.

Co-authored-by: James Newton-King <[email protected]>

…125.5 (dotnet#1947) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 8.0.0-beta.24075.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…0240126.7 (dotnet#1954) Microsoft.Extensions.Http.Resilience From Version 9.0.0-alpha.1.24076.5 -> To Version 9.0.0-preview.1.24076.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Fix dotnet watch.

* Fix precondition in DcpHostService Two lines are changed here, though it's the second (in `StopAsync`) that has a functional change. The first guard clause allows a null publisher, or a "dcp" publisher. The second clause would allow any non-null publisher, which looks like a bug to me. Specifically, the first half of the || excludes "dcp", then the second half allows it back in. This means that there's no point checking for "dcp" in the code as written. My interpretation of this code is that both clauses are intended to be the same, and this commit brings them in line with one another. * Deduplicate condition

Co-authored-by: Drew Noakes <[email protected]>

If an app host project's launch profile doesn't specify a `launchUrl` or `applicationUrl` then the running app host won't have a `ASPNETCORE_URLS` environment variable. We want to pass this variable's value to the dashboard process, and currently if it's missing we throw. The dashboard executable has a fallback value when the `ASPNETCORE_URLS` variable is not present (of `http://localhost:18888`), so it's perfectly happy to run without this variable. This change causes the app host to fall back to that same default value for the dashboard's `ASPNETCORE_URLS` variable. While we could pass no value at all, and have the dashboard choose the default, it's more helpful to the user if we log the dashboard URL. This allows the user to find the dashboard, as the IDE will not be launching it automatically when in this state.

* revert state column badge changes * Slightly darken error in dark theme * Remove spurious VS-added itemgroups * Auto-close empty element --------- Co-authored-by: Adam Ratzman <[email protected]>

…#1948) * Update OpenTelemetry packages - Update all the OpenTelemetry packages to their latest versions. - Use built-in methods to add .NET metrics. - Add suppression for new AoT warning on `AddSqlClientInstrumentation()`. * Resolve review feedback Mark as not AoT compatible due to dependency on OpenTelemetry.Instrumentation.SqlClient, which itself is not AoT compatible.

Ideally we'd make the field nullable on the proto definition, but that's a breaking change at this point. So instead, we pass an empty string. Other options are discussed in dotnet#1930.

This already happens as part of the publish step in the build. Doing this over again (especially to the same container) will overwrite the previous results in some cases, and also unnecessarily duplicate files. It also will cause the wixpacks to get picked up for signing validation.

…hat were removed in 9.0

drewnoakes and others added 5 commits January 25, 2024 20:32

Fix horizontal overflow in metrics popup (dotnet#1838)

7cbeb71

Remove unused "known property" getter methods (dotnet#1856)

3fa3dc5

This code is no longer used, so remove it.

Update dashboard README (dotnet#1854)

a4bb73a

dotnet-maestro-bot force-pushed the merge/main-to-vNext branch from 1bb197f to a4bb73a Compare January 25, 2024 22:52

ghost added the area-codeflow for labeling automated codeflow. intentionally a different color! label Jan 25, 2024

JamesNK and others added 23 commits January 26, 2024 13:08

Fix trace detail page's gap between trace ticks (dotnet#1861)

1139824

Fix SQL server resource version (dotnet#1870)

93acedc

Fix TryAddWillNotAddTheSameLifecycleHook test. (dotnet#1862)

677511a

Use the right health check properties in ServiceBus README. (dotnet#1876

cc7f801

) Fix dotnet#1715

Trace detail page - customize peer icons based on span attributes (do…

2a25291

…tnet#1865)

Update SqlServerBuilderExtensions.cs (dotnet#1883)

5043b31

Follow up to dotnet#1870

remove link in name column (dotnet#1886)

ea5b6da

Co-authored-by: Adam Ratzman <[email protected]>

Orleans: enable distributed tracing by default (dotnet#1858)

315dddc

add failedtostart error icon to state (dotnet#1887)

7e8d2c0

* add failedtostart error icon to state * add starting icon --------- Co-authored-by: Adam Ratzman <[email protected]>

Fix grid layout issue (dotnet#1889)

5fce352

Fix inconsistent trace detail spacing (dotnet#1863)

6fe5242

* Fix inconsistent trace detail spacing * Clean up

Playground app for SQL Server resources (uses EF). (dotnet#1895)

a21135c

* End to end SQL playground.

Branding changes for preview 4 (dotnet#1892)

5ba37bc

Fix dashboard not working with two applicationUrls specified. (dotnet…

de73264

…#1901) * Fix dashboard not working with two applicationUrls specified. * PR feedback. Defensive code.

Remove unnecessary code from AppHost in Orleans playground (dotnet#1904)

f954f61

* remove unnecessary code from Orleans AppHost * format comment in Orleans AppHost

Added a mongo playground project (dotnet#1921)

ada5af1

Consistent resource type summaries (dotnet#1772)

eca647c

Removed static web assets from aspire hosting (dotnet#1923)

70ea605

- We're no longer embedding the dashboard so this shouldn't be required.

Transform outgoing address to try to find a resource match (dotnet#1932)

7e4a7cc

Improve environment variable debugging in the app model (dotnet#1746)

8a50b10

JamesNK and others added 15 commits January 29, 2024 04:48

Move shared code to shared directory (dotnet#1751)

cd7c97a

Fixed build from shared code change (dotnet#1937)

85b6275

Allow collapsing operations in the trace view (dotnet#1323)

5499caf

Co-authored-by: James Newton-King <[email protected]>

Update Extensions to preview 1 versions (dotnet#1891)

87d5246

Fix dotnet watch. (dotnet#1933)

c719174

* Fix dotnet watch.

Fix histogram chart calculation (dotnet#1968)

1175a33

Co-authored-by: Drew Noakes <[email protected]>

Revert state column badge changes (dotnet#1955)

6d0ea52

* revert state column badge changes * Slightly darken error in dark theme * Remove spurious VS-added itemgroups * Auto-close empty element --------- Co-authored-by: Adam Ratzman <[email protected]>

Prevent ANE when resource state is null (dotnet#1975)

e05516d

Ideally we'd make the field nullable on the proto definition, but that's a breaking change at this point. So instead, we pass an empty string. Other options are discussed in dotnet#1930.

Merge branch 'main' into vNext

bf84ad6

joperezr self-assigned this Jan 30, 2024

joperezr added 2 commits January 30, 2024 13:21

Updating some new projects to target net9.0

548d7f4

Skip Pomelo tests failing due to Pomelo depending on EF 8.0 methods t…

9ed6566

…hat were removed in 9.0

joperezr mentioned this pull request Feb 1, 2024

Some Pomelo tests had to be disabled for in vNext branch #2033

Closed

joperezr merged commit 496f939 into dotnet:vNext Feb 1, 2024

github-actions bot locked and limited conversation to collaborators Apr 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'main' => 'vNext' #1859

[automated] Merge branch 'main' => 'vNext' #1859

Uh oh!

dotnet-maestro-bot commented Jan 25, 2024 •

edited by dotnet-policy-service bot

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

[automated] Merge branch 'main' => 'vNext' #1859

[automated] Merge branch 'main' => 'vNext' #1859

Uh oh!

Conversation

dotnet-maestro-bot commented Jan 25, 2024 • edited by dotnet-policy-service bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Microsoft Reviewers: Open in CodeFlow

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

dotnet-maestro-bot commented Jan 25, 2024 •

edited by dotnet-policy-service bot

Loading