Skip to content
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

Changes to enable building msbuild with Unified Build #9685

Merged
merged 5 commits into from
Jan 31, 2024

Conversation

mmitche
Copy link
Member

@mmitche mmitche commented Jan 26, 2024

This enables building msbuild from within the VMR in non source-only modes.

  • Disable building type libraries when building on Core, and looking to package them up.
  • Bootstrap build should look for DotNetRoot, not RepoRoot. This will correctly pick up the global SDK from the VMR.
  • Exclude a couple projects that are VS specific and cause issues (typically packaging TLBs)
  • Don't look to copy net3.5 targeted PDBs when building on Core.

This enables building msbuild from within the VMR in non source-only modes.
- Split dependency properties for net framework targets to maintain VS compat.
- Disable building type libraries when building on Core, and looking to package them up.
- Bootstrap build should look for DotNetRoot, not RepoRoot. This will correctly pick up the global SDK from the VMR.
- Exclude a couple projects that are VS specific and cause issues (typically packaging TLBs)
- Don't look to copy net3.5 targeted PDBs when building on Core.
@mmitche mmitche requested a review from a team as a code owner January 26, 2024 21:19
eng/Versions.props Outdated Show resolved Hide resolved
Don't attempt to copy the PDBs at all when building on core on non-windows platforms.
@mmitche
Copy link
Member Author

mmitche commented Jan 26, 2024

Confirmed on Linux and Windows,

Copy link
Member

@JanKrivanek JanKrivanek left a comment

Choose a reason for hiding this comment

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

Overall looks good - I'm just confused with conditions for type libs creation

src/Directory.Build.targets Outdated Show resolved Hide resolved
eng/Packages.props Outdated Show resolved Hide resolved
eng/SourceBuild.props Outdated Show resolved Hide resolved
@mmitche
Copy link
Member Author

mmitche commented Jan 30, 2024

@JanKrivanek @ViktorHofer I've changed the logic to not override the TFMs in normal UB modes.

src/Directory.Build.targets Show resolved Hide resolved
eng/SourceBuild.props Outdated Show resolved Hide resolved
@mmitche mmitche enabled auto-merge (squash) January 31, 2024 16:36
@mmitche mmitche merged commit 0868f37 into dotnet:main Jan 31, 2024
8 checks passed
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.

4 participants