From ceed7cab75236a0f435b27dd435dd1658cb50a1a Mon Sep 17 00:00:00 2001 From: Chris Rummel <crummel@microsoft.com> Date: Wed, 20 Oct 2021 15:19:29 -0500 Subject: [PATCH] Restore building all TFMs for source-build Required for omnisharp, nuget-client, templating, sdk Background Issue: https://github.com/dotnet/source-build/issues/2542 Patch removal issue: https://github.com/dotnet/source-build/issues/2556 --- src/Build/Microsoft.Build.csproj | 3 +-- src/Directory.Build.props | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index cd99bc84721..9ca480eceb8 100644 --- a/src/Build/Microsoft.Build.csproj +++ b/src/Build/Microsoft.Build.csproj @@ -4,8 +4,7 @@ <Import Project="..\Shared\DebuggingSources.proj" /> <PropertyGroup> - <TargetFrameworks>net6.0</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);net6.0</TargetFrameworks> + <TargetFrameworks>$(FullFrameworkTFM);net6.0</TargetFrameworks> <TargetFrameworks Condition="'$(MonoBuild)'=='true'">$(RuntimeOutputTargetFrameworks)</TargetFrameworks> <RootNamespace>Microsoft.Build</RootNamespace> <AssemblyName>Microsoft.Build</AssemblyName> diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a96fe427c62..6ff47771a4f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -28,13 +28,12 @@ <!-- Defaults for target frameworks and architecture --> <LibraryTargetFrameworks>$(FullFrameworkTFM);netstandard2.0</LibraryTargetFrameworks> - <LibraryTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netstandard2.0</LibraryTargetFrameworks> <LibraryTargetFrameworks Condition="'$(MonoBuild)'=='true'">$(FullFrameworkTFM)</LibraryTargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) --> <RuntimeOutputTargetFrameworks>net6.0</RuntimeOutputTargetFrameworks> - <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(DotNetBuildFromSource)' != 'true'">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks> + <RuntimeOutputTargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(FullFrameworkTFM);$(RuntimeOutputTargetFrameworks)</RuntimeOutputTargetFrameworks> <RuntimeOutputTargetFrameworks Condition="'$(MonoBuild)' == 'true'">$(FullFrameworkTFM)</RuntimeOutputTargetFrameworks> <!-- Don't automatically append target framework to output path, since we want to put the Platform Target beforehand, if it's not AnyCPU -->