From fc309fc879e59f9f7f235127beb9aca39cbcfe69 Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Wed, 22 Jul 2020 09:28:20 -0700
Subject: [PATCH] Fix InteractiveHost32 build

---
 src/Interactive/HostTest/InteractiveHost.UnitTests.csproj | 5 ++++-
 src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj   | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj b/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj
index 16f16cdeda5..ff3dcc01cf3 100644
--- a/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj
+++ b/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj
@@ -24,10 +24,13 @@
     <!--
       Not using ProjectReference since it does not execute the specified targets when building in VS.
       See https://github.com/microsoft/msbuild/issues/5434.
+
+      Note: do not set TargetFramework=net472 for InteractiveHost32. The project is not multi-targeted.
+      Setting the property would create a build configuration that's different from the one the solution uses
+      and thus would result in building the project twice.
     -->
     
     <CopyPublishedOutputProjectReference Include="..\HostProcess\InteractiveHost32.csproj">
-      <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
       <OutputItemType>InteractiveHostFiles_Desktop32</OutputItemType>
     </CopyPublishedOutputProjectReference>
 
diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
index 8150f3dad13..ff33f3d4841 100644
--- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
+++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -295,8 +295,11 @@
     <ProjectReference Include="..\..\Interactive\HostProcess\InteractiveHost32.csproj">
       <Name>InteractiveHost.Desktop32</Name>
 
-      <SetTargetFramework>TargetFramework=net472</SetTargetFramework>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <!--
+        Note: do not set TargetFramework=net472 for InteractiveHost32. The project is not multi-targeted.
+        Setting the property would create a build configuration that's different from the one the solution uses
+        and thus would result in building the project twice.
+      -->
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 
       <Private>false</Private>
-- 
GitLab