Skip to content

Commit

Permalink
Target only net7.0 during source-build - Port of #75168 to main (#77052)
Browse files Browse the repository at this point in the history
* Target only net7.0 during source-build
Port of #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

* Address code review comments.

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
  • Loading branch information
crummel and lbussell authored Oct 26, 2022
1 parent aec781d commit 57740e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
<NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>

<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
Expand Down
1 change: 1 addition & 0 deletions eng/SourceBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
</PropertyGroup>
</Target>

Expand Down

0 comments on commit 57740e2

Please sign in to comment.