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

[repo] Common.prod.props & csproj cleanup #4835

Merged
merged 6 commits into from
Sep 7, 2023

Conversation

CodeBlanch
Copy link
Member

Changes

  1. Some cleanup of Common.prod.props:
  • Removed duplicate GenerateDocumentationFile (it is already part of Common.props)
  • Combined some of the PropertyGroups and ItemGroups and reorganized them at the top of the file
  • Removed <NoWarn>$(NoWarn),1573,1712</NoWarn> and fixed the one warning that manifested as a result (missing XML docs for a couple parameters in DelegatingOptionsFactory.cs)
  1. Some cleanup of csproj files:
  • Made sure all linked files are going into Includes\ path
  1. Tweaked what [build] Fix more ordering issues with ExposeExperimentalFeatures compiler switch #4832 introduced as far as including shared files based on $(ExposeExperimentalFeatures):
  • The previous version ADDED shared files as part of a target (PostResolveExposeExperimentalFeatures). This worked fine more or less but the files were no longer showing in Visual Studio which could cause some confusion. The new version let's the project files add what they want and then the target doing resolution (ResolveExposeExperimentalFeatures) REMOVES them based on the final resolved $(ExposeExperimentalFeatures). This makes the csproj files more readable (debatable) but more importantly restores the files in Visual Studio. This also clears a warning that was showing up about duplicate files being added in OTLP project but I could have fixed it using the old way too.

@CodeBlanch CodeBlanch requested a review from a team September 7, 2023 01:04
build/Common.prod.props Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 7, 2023

Codecov Report

Merging #4835 (a29b4df) into main (92cdcc5) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4835      +/-   ##
==========================================
+ Coverage   83.90%   83.92%   +0.01%     
==========================================
  Files         293      293              
  Lines       12001    12001              
==========================================
+ Hits        10070    10072       +2     
+ Misses       1931     1929       -2     
Files Changed Coverage
src/Shared/Options/DelegatingOptionsFactory.cs ø

📢 Thoughts on this report? Let us know!.

@utpilla utpilla merged commit 459783f into open-telemetry:main Sep 7, 2023
26 of 27 checks passed
@CodeBlanch CodeBlanch deleted the build-cleanup branch September 7, 2023 18:23
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