Skip to content

Target only net7.0 during source-build - Port of #75168 to main#77052

Merged
MichaelSimons merged 2 commits intodotnet:mainfrom
crummel:portNetTfmFix
Oct 26, 2022
Merged

Target only net7.0 during source-build - Port of #75168 to main#77052
MichaelSimons merged 2 commits intodotnet:mainfrom
crummel:portNetTfmFix

Conversation

@crummel
Copy link
Contributor

@crummel crummel commented Oct 14, 2022

Port of #75168 to main. These changes are also needed to support building main in source build.

  • Target net7.0 in additional projects

  • Update compatibility suppressions

  • Only target net7.0 for source-build

  • Disable package validation for source-build

  • Revert compatibility suppression changes

  • Use NetCoreAppCurrent instead of hardcoding net7.0

  • Revert mono Apple TFM change

  • Remove unnecessary LangVersion

Port of dotnet#75168 to main.

* Target net7.0 in additional projects

* Update compatibility suppressions

* Only target net7.0 for source-build

* Disable package validation for source-build

* Revert compatibility suppression changes

* Use NetCoreAppCurrent instead of hardcoding net7.0

* Revert mono Apple TFM change

* Remove unnecessary LangVersion
@ghost
Copy link

ghost commented Oct 14, 2022

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Port of #75168 to main. These changes are also needed to support building main in source build.

  • Target net7.0 in additional projects

  • Update compatibility suppressions

  • Only target net7.0 for source-build

  • Disable package validation for source-build

  • Revert compatibility suppression changes

  • Use NetCoreAppCurrent instead of hardcoding net7.0

  • Revert mono Apple TFM change

  • Remove unnecessary LangVersion

Author: crummel
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

@crummel crummel requested a review from carlossanlop October 14, 2022 16:16
@carlossanlop
Copy link
Contributor

Unlike the release/7.0 change, this commit isn't here:

Remove unnecessary LangVersion

Does that line not exist in main?

@lbussell
Copy link
Member

Unlike the release/7.0 change, this commit isn't here:

Remove unnecessary LangVersion

Does that line not exist in main?

Correct, looks like it is already removed: https://github.com/dotnet/runtime/blob/main/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj#L8

@crummel
Copy link
Contributor Author

crummel commented Oct 21, 2022

@ViktorHofer anything else that needs to happen before this is merged? Thanks!

@MichaelSimons MichaelSimons merged commit 57740e2 into dotnet:main Oct 26, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Nov 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments