Skip to content

Merge | Align Type aliases between netfx and netcore #2957

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Nov 25, 2024
Merged

Merge | Align Type aliases between netfx and netcore #2957

merged 5 commits into from
Nov 25, 2024

Conversation

MichelZ
Copy link
Contributor

@MichelZ MichelZ commented Nov 2, 2024

This PR solely aligns type aliases between netfx and netcore versions so they can be merged easier later.

Part of #2953

@MichelZ MichelZ mentioned this pull request Nov 2, 2024
Open
benrr101
benrr101 approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@benrr101 benrr101 left a comment

Choose a reason for hiding this comment

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

Looks good, but going forward, I think we can combine a couple of PRs like this together. I'm starting to get fatigue from reviewing these all independently 😅

@benrr101 benrr101 added the Common Project 🚮 Things that relate to the common project project label Nov 4, 2024
@MichelZ
Copy link
Contributor Author

MichelZ commented Nov 5, 2024

Looks good, but going forward, I think we can combine a couple of PRs like this together. I'm starting to get fatigue from reviewing these all independently 😅

Apologies, I really thought it makes it easier for review to have smaller, more targeted PR's... Guess I was wrong :)
Will combine them in the future

@benrr101
Copy link
Contributor

benrr101 commented Nov 5, 2024

There's definitely a balance :) I think we'll still take stuff when it's bite-sized like this, but it just might be slow with all the overhead. On the other hand, gigantic PRs are a lot more likely to just be outright rejected

@benrr101
Copy link
Contributor

benrr101 commented Nov 5, 2024

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@codecov Codecov
Copy link

codecov bot commented Nov 6, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 86.15385% with 9 lines in your changes missing coverage. Please review.

Project coverage is 73.18%. Comparing base (2151501) to head (36fd740).
Report is 33 commits behind head on main.

Files with missing lines Patch % Lines
...nt/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs 87.50% 8 Missing ⚠️
.../netcore/src/Microsoft/Data/SqlClient/TdsParser.cs 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##             main    #2957       +/-   ##
===========================================
- Coverage   92.58%   73.18%   -19.40%     
===========================================
  Files           6      288      +282     
  Lines         310    65607    +65297     
===========================================
+ Hits          287    48014    +47727     
- Misses         23    17593    +17570
Flag Coverage Δ
addons 92.58% <ø> (ø)
netcore 75.80% <0.00%> (?)
netfx 71.31% <87.50%> (?)

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.

mdaigle
mdaigle approved these changes Nov 7, 2024
View reviewed changes
Copy link
Contributor

@mdaigle mdaigle left a comment

Choose a reason for hiding this comment

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

Looks good after merge conflicts are fixed

cheenamalhotra
cheenamalhotra previously requested changes Nov 7, 2024
View reviewed changes
@benrr101
Copy link
Contributor

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@MichelZ
Copy link
Contributor Author

MichelZ commented Nov 11, 2024

AZP needs a smack on the head

@MichelZ MichelZ force-pushed the merge-tdsparser-typealiases branch from f335f1b to 36fd740 Compare November 13, 2024 08:47
@MichelZ
Copy link
Contributor Author

MichelZ commented Nov 19, 2024

@cheenamalhotra Anything I can do to move this along? Thx

@MichelZ MichelZ changed the title Align Type aliases between netfx and netcore Merge | Align Type aliases between netfx and netcore Nov 24, 2024
@benrr101 benrr101 dismissed cheenamalhotra’s stale review November 25, 2024 22:59

Requested change has been addressed

@benrr101 benrr101 added this to the 6.0.0 milestone Nov 25, 2024
@benrr101 benrr101 merged commit 16890fb into dotnet:main Nov 25, 2024
76 checks passed
@cheenamalhotra cheenamalhotra modified the milestones: 6.0.0, 6.1-preview1 Apr 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benrr101 benrr101 benrr101 approved these changes

@mdaigle mdaigle mdaigle approved these changes

@David-Engel David-Engel David-Engel approved these changes

@cheenamalhotra cheenamalhotra Awaiting requested review from cheenamalhotra

Assignees
No one assigned
Labels
Common Project 🚮 Things that relate to the common project project
Projects
None yet
Milestone
6.1-preview1
Development

Successfully merging this pull request may close these issues.
5 participants
@MichelZ @benrr101 @mdaigle @cheenamalhotra @David-Engel
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy