Skip to content

Merge | SqlAppContextSwitchManager #3389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 23, 2025

Conversation

benrr101
Copy link
Contributor

@benrr101 benrr101 commented Jun 3, 2025

Description

Very simple PR, SqlAppConextSwitchManager was moved into common project, suffix changed from NetCoreApp to netcore. File was wrapped in #if NET. Required package reference was added to common project, and I took the opportunity to clean up the item groups a bit.

Issues

More work towards #1261

Testing

Just moving stuff around, CI should provide validation.

@Copilot Copilot AI review requested due to automatic review settings June 3, 2025 23:38
@benrr101 benrr101 added the Common Project 🚮 Things that relate to the common project project label Jun 3, 2025
@benrr101 benrr101 requested a review from a team as a code owner June 3, 2025 23:38
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR moves the SqlAppContextSwitchManager file into the common project, renames its suffix from "NetCoreApp" to "netcore", and wraps the file in a conditional compilation block. It also updates the project files to clean up item groups and adjust references based on the target framework.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAppContextSwitchManager.netcore.cs Added a "#if NET" wrapper around the file.
src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj Reorganized and updated references and package items for better clarity and framework separation.
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Updated compile includes to reference the newly located file and removed the old file reference.

Copy link

codecov bot commented Jun 4, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.17%. Comparing base (12f742d) to head (250c1f4).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3389      +/-   ##
==========================================
- Coverage   63.51%   62.17%   -1.34%     
==========================================
  Files         293      291       -2     
  Lines       63810    63677     -133     
==========================================
- Hits        40526    39592     -934     
- Misses      23284    24085     +801     
Flag Coverage Δ
addons 92.58% <ø> (ø)
netcore 66.90% <ø> (-0.03%) ⬇️
netfx 64.42% <ø> (-1.80%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

mdaigle
mdaigle previously approved these changes Jun 4, 2025
paulmedynski
paulmedynski previously approved these changes Jun 10, 2025
@benrr101 benrr101 dismissed stale reviews from paulmedynski and mdaigle via 4371c59 June 11, 2025 23:09
@benrr101 benrr101 force-pushed the dev/russellben/merge/appcontextswitchmanager branch from 4371c59 to 1542764 Compare June 12, 2025 04:00
paulmedynski
paulmedynski previously approved these changes Jun 12, 2025
paulmedynski
paulmedynski previously approved these changes Jun 20, 2025
paulmedynski
paulmedynski previously approved these changes Jun 20, 2025
mdaigle
mdaigle previously approved these changes Jun 20, 2025
@benrr101 benrr101 dismissed stale reviews from mdaigle and paulmedynski via 250c1f4 June 23, 2025 16:38
@benrr101 benrr101 merged commit 2b9870b into main Jun 23, 2025
251 checks passed
@benrr101 benrr101 deleted the dev/russellben/merge/appcontextswitchmanager branch June 23, 2025 21:50
@paulmedynski paulmedynski added this to the 6.1-preview2 milestone Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Common Project 🚮 Things that relate to the common project project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants