Skip to content

Deployment fixes#42

Merged
slang25 merged 10 commits intoslang25/dotnet-10-upgradefrom
2026
Apr 29, 2026
Merged

Deployment fixes#42
slang25 merged 10 commits intoslang25/dotnet-10-upgradefrom
2026

Conversation

@russdaygh
Copy link
Copy Markdown
Contributor

No description provided.

russdaygh and others added 6 commits April 29, 2026 20:42
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
@slang25
Copy link
Copy Markdown
Member

slang25 commented Apr 29, 2026

@copilot resolve the merge conflicts in this pull request

Co-authored-by: slang25 <1341446+slang25@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 29, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 2ff4e8f. The conflicts were in 5 .csproj files where my branch had 10.0.0 package versions and the base branch had updated them to 10.0.7 (plus new OpenTelemetry packages and an updated Swashbuckle version). All conflicts were resolved by taking the base branch versions.

@slang25 slang25 merged commit 2506231 into slang25/dotnet-10-upgrade Apr 29, 2026
3 of 4 checks passed
@slang25 slang25 deleted the 2026 branch April 29, 2026 21:08
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