Skip to content

Merge main branch (Steeltoe 4.1) into 4x#445

Merged
bart-vmware merged 16 commits into4.xfrom
merge-main-410-into-4x
Jan 30, 2026
Merged

Merge main branch (Steeltoe 4.1) into 4x#445
bart-vmware merged 16 commits into4.xfrom
merge-main-410-into-4x

Conversation

@bart-vmware
Copy link
Member

No description provided.

bart-vmware and others added 16 commits September 22, 2025 15:08
Added searchLocations parameter for native config server.
Without the additional switch, tests fail in WSL2, because Config Server registers itself in Eureka using `host.docker.internal`, which is inaccessible when running inside WSL2/Ubuntu.
* Update target frameworks

* Update ASP.NET and EF Core versions to 10.0.*

* Update launchSettings.json to use https schema

* Update launchSettings.json: remove IIS Express

* In WebAPI projects, set launchBrowser=false and remove launchUrl swagger

* Replace Swashbuckle with ASP.NET OpenAPI

* Convert static assets handling

* Update wwwroot

* Adapt for changed path in wwwroot

* Update feature files for .NET 10

* Update markdown files for .NET 10

* Update GHA workflow for .NET 10

* Configuration: fix rendering of PATH environment variable

* Discovery: Fix README after update from #429

* FileShares: Remove unused variable

* Management: downgrade Pomelo.EntityFrameworkCore.MySql

* Management: Fix startup error: Use BaseUrl instead of BasePath to configure the absolute URL to register with

* Management: Remove obsolete .WithOpenApi()

* Management: fix inconsistent line endings

* Package updates

* Fix XSS vulnerability in PATH environment variable rendering (#432)

* Initial plan

* Fix XSS vulnerability by HTML-encoding before replacing delimiters

Co-authored-by: bart-vmware <104792814+bart-vmware@users.noreply.github.com>

* Remove unnecessary null-conditional operator after Html.Encode

Co-authored-by: bart-vmware <104792814+bart-vmware@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: bart-vmware <104792814+bart-vmware@users.noreply.github.com>

* Discovery: fix invalid executable on Windows deployment

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
It was accidentally bumped in #431, but we can't do that because the license has changed.
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.5.0 to 2.6.3.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.5.0...2.6.3)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.6.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
* Handle parameter escaping internally in cf-create-service.ps1
* Use ConvertTo-Json for robust escaping of all parameters
* PascalParams, camelVariables, enhance consistency in readme & scripts

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: TimHess <3947063+TimHess@users.noreply.github.com>
Co-authored-by: Tim Hess <tim.hess@broadcom.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Bump versions of external dependencies:
- Remove preview wildcard for Oracle MySQL EF Core package
- Update MySqlConnector to 2.5, which explicitly targets .NET 10
- Update MySql.Data to 9.6, which explicitly targets .NET 10
- Update CosmosDB and MongoDB to latest versions

The above aligns with the versions used by the latest NetCoreToolTemplates package.

* Remove redundant AllowUnsafeBlocks (health contributor has moved into Steeltoe)
@bart-vmware bart-vmware changed the base branch from main to 4.x January 30, 2026 14:30
@bart-vmware bart-vmware marked this pull request as ready for review January 30, 2026 14:53
@bart-vmware bart-vmware requested a review from TimHess January 30, 2026 14:53
Copy link
Member

@TimHess TimHess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title should say 4.1.0 or 4.1, otherwise lgtm

@bart-vmware bart-vmware changed the title Merge main branch (Steeltoe 4.10) into 4x Merge main branch (Steeltoe 4.1) into 4x Jan 30, 2026
@bart-vmware bart-vmware merged commit f079922 into 4.x Jan 30, 2026
20 checks passed
@bart-vmware bart-vmware deleted the merge-main-410-into-4x branch January 30, 2026 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants