Skip to content

Trim away netframework targets in source-build #83899

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

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Trim away netframework targets in source-build #83899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0b0b79
Trim away netframework targets in source-build
NikolaMilosavljevic Mar 24, 2023
76779f9
Move property unsetting to Directory.Build.props so it works in repo …
NikolaMilosavljevic Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
<NetFrameworkToolCurrent>net472</NetFrameworkToolCurrent>
<!-- Don't build for NETFramework during source-build. -->
<NetFrameworkMinimum Condition="'$(DotNetBuildFromSource)' == 'true'" />
<NetFrameworkToolCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
Expand Down
6 changes: 3 additions & 3 deletions eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
Condition="'$(IncludeDesignerMarker)' != 'false'" />
</ItemGroup>

<ItemGroup Condition="'$(AddNETFrameworkAssemblyReferenceToPackage)' == 'true'">
<ItemGroup Condition="'$(AddNETFrameworkAssemblyReferenceToPackage)' == 'true' and '$(NetFrameworkMinimum)' != ''">
<_FrameworkAssemblyReferences Include="$(MSBuildProjectName)"
TargetFramework="$(NetFrameworkMinimum)" />
</ItemGroup>
Expand All @@ -80,7 +80,7 @@
<None Include="$(PlaceholderFile)"
Pack="true"
PackagePath="$(BuildOutputTargetFolder)\$(NetFrameworkMinimum)\"
Condition="'$(AddNETFrameworkPlaceholderFileToPackage)' == 'true'" />
Condition="'$(AddNETFrameworkPlaceholderFileToPackage)' == 'true' and '$(NetFrameworkMinimum)' != ''" />
<None Include="$(PlaceholderFile)"
Pack="true"
PackagePath="$(BuildOutputTargetFolder)\MonoAndroid10\;
Expand All @@ -104,7 +104,7 @@
($(TargetFrameworks.Contains('$(NetCoreAppMinimum)')) or $(TargetFrameworks.Contains('$(NetCoreAppPrevious)')) or $(TargetFrameworks.Contains('$(NetCoreAppCurrent)')))" />
<NETStandardCompatError Include="net461"
Supported="$(NetFrameworkMinimum)"
Condition="$(TargetFrameworks.Contains('netstandard2.0')) and
Condition="'$(NetFrameworkMinimum)' != '' and $(TargetFrameworks.Contains('netstandard2.0')) and
($(TargetFrameworks.Contains('$(NetFrameworkMinimum)')) or $(TargetFrameworks.Contains('net47')) or $(TargetFrameworks.Contains('net48')))" />
</ItemGroup>

Expand Down