Skip to content

Merge samples from main (targeting Steeltoe 4.2.0) into 4.x#469

Merged
bart-vmware merged 19 commits into
4.xfrom
merge-main-420-into-4x
May 28, 2026
Merged

Merge samples from main (targeting Steeltoe 4.2.0) into 4.x#469
bart-vmware merged 19 commits into
4.xfrom
merge-main-420-into-4x

Conversation

@bart-vmware
Copy link
Copy Markdown
Member

No description provided.

bart-vmware and others added 19 commits February 12, 2026 14:49
* Update instructions to use --wait

* Fix order of NuGet references
Bumps [requests](https://github.com/psf/requests) from 2.32.4 to 2.33.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.4...v2.33.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.33.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [pygments](https://github.com/pygments/pygments) from 2.19.2 to 2.20.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.19.2...2.20.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-version: 2.20.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
* Convert to .slnx format

* Run sync-DotSettings.ps1

* Fix R# warnings

* Add CommonTasks.md to solution items
- Split Linux/Windows jobs by integration environment and decouple from each other
- Add service plan alternatives and fix auto-generated space cleanup
- Use unique service instance names per sample
- Capture recent CF logs on app crash or task failure
- Add warning logging
- Increase Windows container memory
- Support additional wait-for or failed states
- Use windows2022 stack
- Use a GHA var instead of the repo name to determine if tests actually run
- Only write non-empty vars to user.ini
Bumps [lxml](https://github.com/lxml/lxml) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-6.0.0...lxml-6.1.0)

---
updated-dependencies:
- dependency-name: lxml
  dependency-version: 6.1.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.6.3 to 2.7.0.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.6.3...2.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [idna](https://github.com/kjd/idna) from 3.11 to 3.15.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.md)
- [Commits](kjd/idna@v3.11...v3.15)

---
updated-dependencies:
- dependency-name: idna
  dependency-version: '3.15'
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
- only shared python files should trigger all workflows to run
@bart-vmware bart-vmware marked this pull request as ready for review May 28, 2026 16:56
@bart-vmware bart-vmware requested a review from TimHess May 28, 2026 16:56
Copy link
Copy Markdown
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.

LGTM

@bart-vmware bart-vmware merged commit 93def36 into 4.x May 28, 2026
20 checks passed
@bart-vmware bart-vmware deleted the merge-main-420-into-4x branch May 28, 2026 17:10
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.

2 participants