Merge pull request #46232 from dotnet/merges/release/dev16.8-preview1-to-master

Merge release/dev16.8-preview1 to master

Author: msftbot[bot]

src/Interactive/HostProcess/InteractiveHost32.csproj

@@ -31,7 +31,7 @@
         <Ngen>true</Ngen>
         <NgenPriority>3</NgenPriority>
         <NgenArchitecture>X86</NgenArchitecture>
-        <NgenApplication>/InteractiveHost/Desktop/InteractiveHost32.exe</NgenApplication>
+        <NgenApplication>[installDir]\Common7\IDE\$(CommonExtensionInstallationRoot)\$(LanguageServicesExtensionInstallationFolder)\InteractiveHost\Desktop\InteractiveHost32.exe</NgenApplication>
       </_PublishProjectOutputGroup>
       <_PublishProjectOutputGroup Include="$(TargetPath).config" TargetPath="$(TargetFileName).config"/>
     </ItemGroup>

src/Interactive/HostProcess/InteractiveHost64.csproj

@@ -41,7 +41,7 @@
         <NgenPriority>3</NgenPriority>
         <NgenArchitecture Condition="'%(Filename)' != 'InteractiveHost64'">All</NgenArchitecture>
         <NgenArchitecture Condition="'%(Filename)' == 'InteractiveHost64'">X64</NgenArchitecture>
-        <NgenApplication>/InteractiveHost/Desktop/InteractiveHost64.exe</NgenApplication>
+        <NgenApplication>[installDir]\Common7\IDE\$(CommonExtensionInstallationRoot)\$(LanguageServicesExtensionInstallationFolder)\InteractiveHost\Desktop\InteractiveHost64.exe</NgenApplication>
       </_PublishedFiles>
     </ItemGroup>
   </Target>

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>
 

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>