Remove private assemblies from wix projects

setup/Common.Wix.Properties.wxs

@@ -39,7 +39,6 @@
 			<Directory Id="VS15_ROOT_FOLDER" Name="VS15_ROOT_FOLDER">
 				<Directory Id="VS15_Common7" Name="Common7">
 					<Directory Id="VS15_Common7_IDE" Name="IDE">
-						<Directory Id="VS15_Common7_IDE_PrivateAssemblies" Name="PrivateAssemblies" />
 						<Directory Id="VS15_Common7_IDE_PublicAssemblies" Name="PublicAssemblies" />
 					</Directory>
 				</Directory>

setup/FSharp.SDK/FSharp.SDK.wixproj

@@ -46,7 +46,6 @@
     <Compile Include="component-groups\Redist_ManagedFiles.wxs" />
     <Compile Include="component-groups\Compiler_SDK.wxs" />
     <Compile Include="component-groups\Compiler_OtherResources.wxs" />
-    <Compile Include="component-groups\Compiler_PrivateAssemblies.wxs" />
     <Compile Include="component-groups\Compiler_PublicAssemblies.wxs" />
     <Compile Include="component-groups\Langpack_ManagedFiles.wxs" />
   </ItemGroup>

setup/FSharp.SDK/FSharp.SDK.wxs

@@ -29,7 +29,6 @@
 
 			<ComponentGroupRef Id="Compiler_SDK" />
 			<ComponentGroupRef Id="Compiler_OtherResources" />
-			<ComponentGroupRef Id="Compiler_PrivateAssemblies" />
 			<ComponentGroupRef Id="Compiler_PublicAssemblies" />
 		</Feature>
 		

setup/FSharp.SDK/component-groups/Compiler_PrivateAssemblies.wxs

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:NetFx="http://schemas.microsoft.com/wix/NetFxExtension">
-
-	<Fragment>
-		<PropertyRef Id="VS15_ROOT_FOLDER" />
-		<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
-		
-		<ComponentGroup Id="Compiler_PrivateAssemblies">
-
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll" />
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll" />						
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll" />			
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Core.dll" />		
-
-			<?if $(var.Lang) != ENU ?>
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)" />
-			<ComponentRef Id="Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)" />
-			<?endif ?>
-
-		</ComponentGroup>
-
-		<DirectoryRef Id="VS15_Common7_IDE_PrivateAssemblies">
-
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.dll, $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_PrivateAssemblies_FSharp.Compiler.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll, $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_PrivateAssemblies_FSharp.Compiler.Interactive.Settings.Native.d" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll, $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Server.Shared.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_PrivateAssemblies_FSharp.Compiler.Server.Shared.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Core.dll" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Core.dll, $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_PrivateAssemblies_FSharp.Core.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-				<File Id="Compiler_PrivateAssemblies_FSharp.Core.sigdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
-				<File Id="Compiler_PrivateAssemblies_FSharp.Core.optdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
-			</Component>
-
-			<?if $(var.Lang) != ENU ?>
-
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang), $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Compiler.dll_$(var.Lang)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.Lang)\FSharp.Compiler.resources.dll" />
-			</Component>
-			
-			<Component Id="Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)" Guid="$(fsharp.guid(Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang), $(var.Lang)))">
-				<File Id="Compiler_PrivateAssemblies_FSharp.Core.dll_$(var.Lang)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.Lang)\FSharp.Core.resources.dll" />
-			</Component>
-
-			<?endif ?>
-			
-		</DirectoryRef>
-	</Fragment>
-</Wix>
\ No newline at end of file

vsintegration/update-vsintegration.cmd

@@ -138,15 +138,6 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     %SN64% -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a
 )
 
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies" (
-	copy /y %BINDIR%\FSharp.Compiler.Server.Shared.dll "%ProgramFiles(x86)%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Server.Shared.dll"
-	copy /y %BINDIR%\FSharp.Compiler.Interactive.Settings.dll "%ProgramFiles(x86)%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Interactive.Settings.dll"
-)
-if exist "%ProgramFiles%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies" (
-	copy /y %BINDIR%\FSharp.Compiler.Server.Shared.dll "%ProgramFiles%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Server.Shared.dll"
-	copy /y %BINDIR%\FSharp.Compiler.Interactive.Settings.dll "%ProgramFiles%\Microsoft Visual Studio %VisualStudioVersion%\Common7\IDE\PrivateAssemblies\FSharp.Compiler.Interactive.Settings.dll"
-)
-
 rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll
 
 "%NGEN32%" install "%COMPILERSDKPATH%\fsc.exe" /queue:1