Move property unsetting to Directory.Build.props so it works in repo …

…source-build
dotnet · Mar 26, 2023 · 76779f9 · 76779f9
1 parent f0b0b79
commit 76779f9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -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>

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
@@ -43,8 +43,6 @@
       <InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS)</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono</InnerBuildArgs>
-      <!-- Unset NetFrameworkMinimum property, to disable netfx projects. -->
-      <InnerBuildArgs>$(InnerBuildArgs) /p:NetFrameworkMinimum=</InnerBuildArgs>
     </PropertyGroup>
   </Target>