From 7a1db949eb85ef6e78ae44ae965106fb298537bc Mon Sep 17 00:00:00 2001
From: KevinRansom <codecutter@hotmail.com>
Date: Tue, 23 Aug 2016 12:37:09 -0700
Subject: [PATCH 1/3] Add fsc.exe.config/fsi.exe.config and fsiAnyCpu.config to
 setup.  And turn tabs to two whitespace.

---
 setup/FSharp.SDK/FSharp.SDK.wixproj           |  20 +-
 setup/FSharp.SDK/FSharp.SDK.wxs               |  64 ++--
 .../component-groups/Compiler_LangPack.wxs    |  70 ++--
 .../component-groups/Compiler_Redist.wxs      | 313 ++++++++---------
 .../component-groups/Runtime_LangPack.wxs     | 321 +++++++++---------
 5 files changed, 392 insertions(+), 396 deletions(-)

diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj
index 3814288bc8..04e76713f4 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wixproj
+++ b/setup/FSharp.SDK/FSharp.SDK.wixproj
@@ -5,10 +5,10 @@
     <FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
     <SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
   </PropertyGroup>
-  
+
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <Import Project="$(SetupRootFolder)\FSharp.Setup.props" />
-  
+
   <PropertyGroup>
     <OutputName>Microsoft.FSharp.SDK</OutputName>
     <ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
@@ -19,7 +19,7 @@
     <ServiceByMajorUpgrade>true</ServiceByMajorUpgrade>
     <DefineSolutionProperties>false</DefineSolutionProperties>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
     <DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
@@ -30,7 +30,7 @@
     <DefineConstants>$(DefineConstants);FSharpTreeRoot=$(FSharpTreeRoot)</DefineConstants>
     <DefineConstants>$(DefineConstants);NugetPackagesDir=$(NugetPackagesDir)</DefineConstants>
   </PropertyGroup>
-    
+
   <ItemGroup>
     <WixExtension Include="WixNetFxExtension">
         <Name>WixNetFxExtension</Name>
@@ -40,28 +40,28 @@
       <HintPath>$(BinariesDir)\setup\FSharp.Wix.Extensions.dll</HintPath>
     </WixExtension>
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Include="Common.Wix.Properties.wxs" />
-    
+
     <Compile Include="FSharp.SDK.wxs" />
     
     <Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Compiler_Redist.wxs" />
     <Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Compiler_LangPack.wxs" />
-    
+
     <Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Runtime_Redist.wxs" />
     <Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Runtime_LangPack.wxs" />
   </ItemGroup>
-  
+
   <ItemGroup>
       <FilesToSign Include="$(OutDir)$(OutputName).msi">
          <Authenticode>Microsoft400</Authenticode>
       </FilesToSign>
   </ItemGroup>
-  
+
   <Import Project="$(WixInstallPath)\wix.targets" />
   <Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
-  
+
   <Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
     <Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
     <Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
diff --git a/setup/FSharp.SDK/FSharp.SDK.wxs b/setup/FSharp.SDK/FSharp.SDK.wxs
index ca798e15ff..5422fc0db3 100644
--- a/setup/FSharp.SDK/FSharp.SDK.wxs
+++ b/setup/FSharp.SDK/FSharp.SDK.wxs
@@ -2,40 +2,40 @@
 <!-- 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">
 
-	<?define ProductVersion = "4.1"?>
-	<?define ProductPlatform = "x86"?>
-	<?define ProductManufacturer = "Microsoft Corporation"?>
-	<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
-	<?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
+  <?define ProductVersion = "4.1"?>
+  <?define ProductPlatform = "x86"?>
+  <?define ProductManufacturer = "Microsoft Corporation"?>
+  <?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
+  <?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
 
-	<Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">	
+  <Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">	
 
-		<Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
-		<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
-		<MediaTemplate EmbedCab="yes" />
+    <Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
+    <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
+    <MediaTemplate EmbedCab="yes" />
 
-		<Feature Id="Compiler_Feature"
-				 AllowAdvertise="no"
-				 Description="Installs the Visual F# programming language and all associated components."
-				 Title="Visual F#">
+    <Feature Id="Compiler_Feature"
+       AllowAdvertise="no"
+       Description="Installs the Visual F# programming language and all associated components."
+       Title="Visual F#">
 
-            <?if $(var.IsLangPack) = true ?>
-			<ComponentGroupRef Id="Compiler_LangPack" />
-            <?else ?>
-			<ComponentGroupRef Id="Compiler_Redist" />
-            <?endif ?>
-		</Feature>
-		
-        <Feature Id="Runtime_Feature"
-				 Title="Microsoft Visual F# Runtime for .NET"
-				 Description="Runtime components for F# compiled binaries."
-				 Display="hidden">
-				 
-            <?if $(var.IsLangPack) = true ?>
-            <ComponentGroupRef Id="Runtime_LangPack"   />
-            <?else ?>
-            <ComponentGroupRef Id="Runtime_Redist"   />
-            <?endif ?>
-        </Feature>
-	</Product>
+      <?if $(var.IsLangPack) = true ?>
+      <ComponentGroupRef Id="Compiler_LangPack" />
+      <?else ?>
+      <ComponentGroupRef Id="Compiler_Redist" />
+      <?endif ?>
+    </Feature>
+
+    <Feature Id="Runtime_Feature"
+       Title="Microsoft Visual F# Runtime for .NET"
+       Description="Runtime components for F# compiled binaries."
+       Display="hidden">
+
+      <?if $(var.IsLangPack) = true ?>
+      <ComponentGroupRef Id="Runtime_LangPack"   />
+      <?else ?>
+      <ComponentGroupRef Id="Runtime_Redist"   />
+      <?endif ?>
+    </Feature>
+  </Product>
 </Wix>
\ No newline at end of file
diff --git a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
index 82e467a8dc..7c6d57a461 100644
--- a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
@@ -2,44 +2,40 @@
 <!-- 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>
-		<ComponentGroup Id="Compiler_LangPack">
+  <Fragment>
+    <ComponentGroup Id="Compiler_LangPack">
+      <ComponentRef Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
+      <ComponentRef Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
+    </ComponentGroup>
 
-			<ComponentRef Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
-			<ComponentRef Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
-			<ComponentRef Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" />
-			<ComponentRef Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
-			<ComponentRef Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
-			<ComponentRef Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
-			
-		</ComponentGroup>
+    <DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
+      <Component Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+      </Component>
 
-		<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
+      <Component Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll" KeyPath="yes" />
+      </Component>
 
-            <Component Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-            </Component>
-            
-            <Component Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll" KeyPath="yes" />
-            </Component>
-            
-            <Component Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll" KeyPath="yes" />
-            </Component>
-            
-            <Component Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsc.resources.dll" KeyPath="yes" />
-            </Component>
-            
-            <Component Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsi.exe_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsi.resources.dll" KeyPath="yes"/>
-            </Component>
-            
-            <Component Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode), $(var.LocaleCode)))">
-                <File Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsiAnyCPU.resources.dll" KeyPath="yes" />
-            </Component>
-            
-		</DirectoryRef>
-	</Fragment>
+      <Component Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll" KeyPath="yes" />
+      </Component>
+
+      <Component Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsc.resources.dll" KeyPath="yes" />
+      </Component>
+
+      <Component Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsi.exe_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsi.resources.dll" KeyPath="yes"/>
+      </Component>
+
+      <Component Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode), $(var.LocaleCode)))">
+        <File Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsiAnyCPU.resources.dll" KeyPath="yes" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
index df3f51a355..672d1f387e 100644
--- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
@@ -2,160 +2,161 @@
 <!-- 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>
-		<ComponentGroup Id="Compiler_Redist">
-        
-			<ComponentRef Id="Compiler_Redist_FSharp.Core.dll" />
-			<ComponentRef Id="Compiler_Redist_FSharp.Build.dll" />
-			<ComponentRef Id="Compiler_Redist_FSharp.Compiler.dll" />
-			<ComponentRef Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" />			
-			<ComponentRef Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" />			
-			<ComponentRef Id="Compiler_Redist_fsc.exe" />
-			<ComponentRef Id="Compiler_Redist_fsi.exe" />
-			<ComponentRef Id="Compiler_Redist_fsiAnyCPU.exe" />
-			<ComponentRef Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.FSharp.targets" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" />
-			<ComponentRef Id="Compiler_Redist_SupportedRuntimes.xml" />
-			<ComponentRef Id="Compiler_Redist_RegistryKeys_CompilerLocation" />
-            
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.Engine.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.Framework.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" />
-			<ComponentRef Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" />
-			
-			<ComponentRef Id="Compiler_Redist_OtherResources_Redist.txt" />
-			<ComponentRef Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" />
-			<ComponentRef Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" />
-			
-		</ComponentGroup>
-
-		<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0">
-
-			<Component Id="Compiler_Redist_FSharp.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Core.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Core.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-				<File Id="FSharp_Core_Sigdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
-				<File Id="FSharp_Core_Optdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
-			</Component>
-
-			<Component Id="Compiler_Redist_FSharp.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Build.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Build.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Build.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Build.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_FSharp.Compiler.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Compiler.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Data.TypeProviders.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Type.Providers.Redist.1.0.0\content\4.3.0.0\FSharp.Data.TypeProviders.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Data.TypeProviders.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_fsc.exe" Guid="$(fsharp.guid(Compiler_Redist_fsc.exe, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_fsc.exe" Source="$(var.BinariesDir)\net40\bin\fsc.exe" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_fsc.Native.exe" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_fsi.exe" Guid="$(fsharp.guid(Compiler_Redist_fsi.exe, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_fsi.exe" Source="$(var.BinariesDir)\net40\bin\fsi.exe" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_fsi.Native.exe" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_fsiAnyCPU.exe" Guid="$(fsharp.guid(Compiler_Redist_fsiAnyCPU.exe, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_fsiAnyCPU.exe" Source="$(var.BinariesDir)\net40\bin\fsiAnyCPU.exe" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_fsiAnyCPU.Native.exe" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>
-
-			<Component Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Server.Shared.dll, $(var.LocaleCode)))">
-				<File Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Server.Shared.dll" KeyPath="yes">
-					<NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Server.Shared.Native.dll" Priority="0" Dependencies="no" Platform="all" />
-				</File>
-			</Component>			
-
-            <Component Id="Compiler_Redist_Microsoft.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.targets, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.targets" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Portable.FSharp.targets, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.targets" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_SupportedRuntimes.xml" Guid="$(fsharp.guid(Compiler_Redist_SupportedRuntimes.xml, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_SupportedRuntimes.xml" Source="$(var.FSharpTreeRoot)\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" />
-            </Component>
-			
-			<Component Id="Compiler_Redist_RegistryKeys_CompilerLocation" Guid="$(fsharp.guid(Compiler_Redist_RegistryKeys_CompilerLocation, $(var.LocaleCode)))">
-				<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.1\Runtime\v4.0" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Type="string" />
-				</RegistryKey>
-				<RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\MSBuild\SafeImports" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Name="Microsoft.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.FSharp.Targets" Type="string" />
-					<RegistryValue Name="Microsoft.Portable.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.Portable.FSharp.Targets" Type="string" />
-				</RegistryKey>
-				<RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\Setup\F#" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Type="string" />
-				</RegistryKey>
-			</Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Conversion.Core.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Conversion.Core.dll" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.Engine.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Engine.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.Engine.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Engine.dll" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.Framework.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Framework.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.Framework.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Tasks.Core.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll" />
-            </Component>
-			
-            <Component Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Utilities.Core.dll, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll" />
-            </Component>
-		</DirectoryRef>
-        
-        <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
-            <Component Id="Compiler_Redist_OtherResources_Redist.txt" Guid="$(fsharp.guid(Compiler_OtherResources_Redist.txt, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_OtherResources_Redist.txt" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\Redist.txt" />
-            </Component>
-        </DirectoryRef>
-		
-        <DirectoryRef Id="MicrosoftSDKs_FS_Licenses">
-			<Component Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" Guid="$(fsharp.guid(Compiler_OtherResources_ThirdPartyNotices.txt, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" Source="$(var.BinariesDir)\setup\resources\ThirdPartyNotices.txt" />
-            </Component>
-        </DirectoryRef>
-		
-        <DirectoryRef Id="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)">
-            <Component Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" Guid="$(fsharp.guid(Compiler_OtherResources_FSharp_eula.$(var.LocaleCode).rtf, $(var.LocaleCode)))">
-                <File Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" Source="$(var.BinariesDir)\setup\resources\eula\VF_EULA.$(var.LocaleCode).rtf" />
-            </Component>
-        </DirectoryRef>
-	</Fragment>
+  <Fragment>
+    <ComponentGroup Id="Compiler_Redist">
+      <ComponentRef Id="Compiler_Redist_FSharp.Core.dll" />
+      <ComponentRef Id="Compiler_Redist_FSharp.Build.dll" />
+      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.dll" />
+      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" />      
+      <ComponentRef Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" />      
+      <ComponentRef Id="Compiler_Redist_fsc.exe" />
+      <ComponentRef Id="Compiler_Redist_fsi.exe" />
+      <ComponentRef Id="Compiler_Redist_fsiAnyCPU.exe" />
+      <ComponentRef Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.FSharp.targets" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" />
+      <ComponentRef Id="Compiler_Redist_SupportedRuntimes.xml" />
+      <ComponentRef Id="Compiler_Redist_RegistryKeys_CompilerLocation" />
+
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.Engine.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.Framework.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" />
+      <ComponentRef Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" />
+
+      <ComponentRef Id="Compiler_Redist_OtherResources_Redist.txt" />
+      <ComponentRef Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" />
+      <ComponentRef Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" />
+
+    </ComponentGroup>
+
+    <DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0">
+
+      <Component Id="Compiler_Redist_FSharp.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Core.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Core.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+        <File Id="FSharp_Core_Sigdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
+        <File Id="FSharp_Core_Optdata_File" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
+      </Component>
+
+      <Component Id="Compiler_Redist_FSharp.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Build.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Build.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Build.dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Build.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+      </Component>
+
+      <Component Id="Compiler_Redist_FSharp.Compiler.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Compiler.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+      </Component>
+
+      <Component Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" KeyPath="yes">
+           <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Interactive.Settings.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+      </Component>
+
+      <Component Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Data.TypeProviders.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Type.Providers.Redist.1.0.0\content\4.3.0.0\FSharp.Data.TypeProviders.dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Data.TypeProviders.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+      </Component>
+
+      <Component Id="Compiler_Redist_fsc.exe" Guid="$(fsharp.guid(Compiler_Redist_fsc.exe, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_fsc.exe" Source="$(var.BinariesDir)\net40\bin\fsc.exe" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_fsc.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+        <File Id="Compiler_Redist_fsc.exe.config" Source="$(var.BinariesDir)\net40\bin\fsc.exe.config" />
+      </Component>
+
+      <Component Id="Compiler_Redist_fsi.exe" Guid="$(fsharp.guid(Compiler_Redist_fsi.exe, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_fsi.exe.config" Source="$(var.BinariesDir)\net40\bin\fsi.exe" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_fsi.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+        <File Id="Compiler_Redist_fsi.exe.config" Source="$(var.BinariesDir)\net40\bin\fsi.exe.config" />
+      </Component>
+
+      <Component Id="Compiler_Redist_fsiAnyCPU.exe" Guid="$(fsharp.guid(Compiler_Redist_fsiAnyCPU.exe, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_fsiAnyCPU.exe" Source="$(var.BinariesDir)\net40\bin\fsiAnyCPU.exe" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_fsiAnyCPU.Native.exe" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+        <File Id="Compiler_Redist_fsianycpu.exe.config" Source="$(var.BinariesDir)\net40\bin\fsiAnyCPU.exe.config" />
+      </Component>
+
+      <Component Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Compiler.Server.Shared.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_FSharp.Compiler.Server.Shared.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Compiler.Server.Shared.dll" KeyPath="yes">
+          <NetFx:NativeImage Id="Compiler_Redist_FSharp.Compiler.Server.Shared.Native.dll" Priority="0" Dependencies="no" Platform="all" />
+        </File>
+      </Component>      
+
+      <Component Id="Compiler_Redist_Microsoft.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.targets, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.targets" />
+      </Component>
+      <Component Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Portable.FSharp.targets, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.targets" />
+      </Component>
+
+      <Component Id="Compiler_Redist_SupportedRuntimes.xml" Guid="$(fsharp.guid(Compiler_Redist_SupportedRuntimes.xml, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_SupportedRuntimes.xml" Source="$(var.FSharpTreeRoot)\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" />
+      </Component>
+
+      <Component Id="Compiler_Redist_RegistryKeys_CompilerLocation" Guid="$(fsharp.guid(Compiler_Redist_RegistryKeys_CompilerLocation, $(var.LocaleCode)))">
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.1\Runtime\v4.0" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+          <RegistryValue Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Type="string" />
+        </RegistryKey>
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\MSBuild\SafeImports" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+         <RegistryValue Name="Microsoft.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.FSharp.Targets" Type="string" />
+          <RegistryValue Name="Microsoft.Portable.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.Portable.FSharp.Targets" Type="string" />
+        </RegistryKey>
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\Setup\F#" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+          <RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Type="string" />
+        </RegistryKey>
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Conversion.Core.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Conversion.Core.dll" />
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll" />
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.Engine.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Engine.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.Engine.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Engine.dll" />
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.Framework.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Framework.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.Framework.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll" />
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Tasks.Core.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll" />
+      </Component>
+
+      <Component Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Utilities.Core.dll, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
+      <Component Id="Compiler_Redist_OtherResources_Redist.txt" Guid="$(fsharp.guid(Compiler_OtherResources_Redist.txt, $(var.LocaleCode)))">
+          <File Id="Compiler_Redist_OtherResources_Redist.txt" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\Redist.txt" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="MicrosoftSDKs_FS_Licenses">
+      <Component Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" Guid="$(fsharp.guid(Compiler_OtherResources_ThirdPartyNotices.txt, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" Source="$(var.BinariesDir)\setup\resources\ThirdPartyNotices.txt" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)">
+      <Component Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" Guid="$(fsharp.guid(Compiler_OtherResources_FSharp_eula.$(var.LocaleCode).rtf, $(var.LocaleCode)))">
+        <File Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" Source="$(var.BinariesDir)\setup\resources\eula\VF_EULA.$(var.LocaleCode).rtf" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
index 8dc3c0d6bc..acd7f104fc 100644
--- a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
+++ b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
@@ -2,165 +2,164 @@
 <!-- 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">
 
-	<Fragment>
-		<?define LangLCID = $(var.LocaleId) ?>
-		<?define LangCulture = $(var.LocaleRegion) ?>
-		
-		<ComponentGroup Id="Runtime_LangPack">
-        
-			<!-- F# 4.1 -->
-
-			<ComponentRef Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack" />
-
-			<!-- F# 4.0 -->
-
-			<ComponentRef Id="Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack" />
-
-			<!-- F# 3.1 -->
-
-			<ComponentRef Id="Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack" />
-
-			<!-- F# 3.0 -->
-
-			<ComponentRef Id="Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack" />
-			<ComponentRef Id="Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack" />		
-
-			<!-- Registery Keys -->
-			
-			<ComponentRef Id="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)" />
-            
-		</ComponentGroup>
-	
-		<!-- F# 4.1 -->
-
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.47.41._FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable47\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.7.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable7\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.78.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable78\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.259.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable259\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-			</Component>
-		</DirectoryRef>
-
-		<!-- F# 4.0 -->
-
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-
-		<!-- F# 3.1 -->
-
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-
-		<!-- F# 3.0 -->
-
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)">
-			<Component Id="Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
-				<File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
-				<File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
-			</Component>
-		</DirectoryRef>
-		
-		<!-- Registry Keys -->
-			
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
-			<Component Id="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode), $(var.LocaleCode)))">
-				<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.1\Runtime\v4.0_$(var.LocaleId)\Install" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Name="InstallSuccess" Value="4.4.1.0" Type="string" />
-				</RegistryKey>
-			</Component>
-		</DirectoryRef>
-        
-	</Fragment>
+  <Fragment>
+    <?define LangLCID = $(var.LocaleId) ?>
+    <?define LangCulture = $(var.LocaleRegion) ?>
+
+    <ComponentGroup Id="Runtime_LangPack">
+
+      <!-- F# 4.1 -->
+
+      <ComponentRef Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack" />
+
+      <!-- F# 4.0 -->
+
+      <ComponentRef Id="Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack" />
+
+      <!-- F# 3.1 -->
+
+      <ComponentRef Id="Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack" />
+
+      <!-- F# 3.0 -->
+
+      <ComponentRef Id="Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack" />
+      <ComponentRef Id="Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack" />		
+
+      <!-- Registery Keys -->
+
+      <ComponentRef Id="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)" />
+
+    </ComponentGroup>
+
+      <!-- F# 4.1 -->
+
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+        <File Id="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.47.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.47.41._FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable47\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.7.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.7.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable7\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.78.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable78\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.41.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.259.41.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\portable259\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+
+      <!-- F# 4.0 -->
+
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.0.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+        <File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.47.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.7.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.4.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+
+      <!-- F# 3.1 -->
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.3.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_2.3.5.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.3.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.78.3.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_3.259.3.1_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+
+      <!-- F# 3.0 -->
+
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.3.0.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)">
+        <Component Id="Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_2.3.5.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
+          <File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.resources.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
+          <File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
+        </Component>
+      </DirectoryRef>
+
+      <!-- Registry Keys -->
+
+      <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
+        <Component Id="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode), $(var.LocaleCode)))">
+          <RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.1\Runtime\v4.0_$(var.LocaleId)\Install" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+            <RegistryValue Name="InstallSuccess" Value="4.4.1.0" Type="string" />
+          </RegistryKey>
+        </Component>
+      </DirectoryRef>
+
+  </Fragment>
 </Wix>
\ No newline at end of file

From 8a033894f8231079229dfa86144c88f11f1a1eda Mon Sep 17 00:00:00 2001
From: KevinRansom <codecutter@hotmail.com>
Date: Tue, 23 Aug 2016 12:47:48 -0700
Subject: [PATCH 2/3] setup/FSharp.SDK/component-groups/Runtime_Redist.wxs

---
 .../component-groups/Runtime_Redist.wxs       | 330 +++++++++---------
 1 file changed, 165 insertions(+), 165 deletions(-)

diff --git a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
index 89d5a7fdc8..ad3d364088 100644
--- a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
@@ -2,182 +2,182 @@
 <!-- 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">
 
-	<Fragment>
-		<ComponentGroup Id="Runtime_Redist">
+  <Fragment>
+    <ComponentGroup Id="Runtime_Redist">
 
-			<!-- F# 4.1 -->
-			<ComponentRef Id="Runtime_Redist_4.4.1.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.47.41.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.7.41.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.78.41.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.259.41.0_FSharp.Core" />
+      <!-- F# 4.1 -->
+      <ComponentRef Id="Runtime_Redist_4.4.1.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.47.41.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.7.41.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.78.41.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.259.41.0_FSharp.Core" />
 
-			<!-- F# 4.0 -->
-			<ComponentRef Id="Runtime_Redist_4.4.0.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.47.4.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.7.4.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.78.4.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.259.4.0_FSharp.Core" />
+      <!-- F# 4.0 -->
+      <ComponentRef Id="Runtime_Redist_4.4.0.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.47.4.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.7.4.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.78.4.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.259.4.0_FSharp.Core" />
 
-			<!-- F# 3.1 -->
-			<ComponentRef Id="Runtime_Redist_4.3.1.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_2.3.5.1_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.3.1.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.78.3.1_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_3.259.3.1_FSharp.Core" />
+      <!-- F# 3.1 -->
+      <ComponentRef Id="Runtime_Redist_4.3.1.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_2.3.5.1_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.3.1.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.78.3.1_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_3.259.3.1_FSharp.Core" />
 
-			<!-- F# 3.0 -->
-			<ComponentRef Id="Runtime_Redist_4.3.0.0_FSharp.Core" />
-			<ComponentRef Id="Runtime_Redist_2.3.5.0_FSharp.Core" />		
+      <!-- F# 3.0 -->
+      <ComponentRef Id="Runtime_Redist_4.3.0.0_FSharp.Core" />
+      <ComponentRef Id="Runtime_Redist_2.3.5.0_FSharp.Core" />    
 
-		</ComponentGroup>
+    </ComponentGroup>
 
-		<!-- F# 4.1 -->
+    <!-- F# 4.1 -->
 
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0">
-			<Component Id="Runtime_Redist_4.4.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.1.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.xml" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0">
-			<Component Id="Runtime_Redist_3.47.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.47.41.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.47.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.47.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.47.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.47.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0">
-			<Component Id="Runtime_Redist_3.7.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.7.41.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.7.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.7.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.7.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.7.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0">
-			<Component Id="Runtime_Redist_3.78.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.41.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.78.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.78.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.78.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.78.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0">
-			<Component Id="Runtime_Redist_3.259.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.41.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.259.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.259.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.259.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.259.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0">
+      <Component Id="Runtime_Redist_4.4.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.1.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_4.4.1.0_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_4.4.1.0_FSharp.Core.xml" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_4.4.1.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_4.4.1.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0">
+      <Component Id="Runtime_Redist_3.47.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.47.41.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.47.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable47\bin\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0">
+      <Component Id="Runtime_Redist_3.7.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.7.41.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.7.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable7\bin\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0">
+      <Component Id="Runtime_Redist_3.78.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.41.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.78.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable78\bin\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0">
+      <Component Id="Runtime_Redist_3.259.41.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.41.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.dll" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.xml" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.259.41.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\portable259\bin\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
 
-		<!-- F# 4.0 -->
+    <!-- F# 4.0 -->
 
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0">
-			<Component Id="Runtime_Redist_4.4.0.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.0.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_4.4.0.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_4.4.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_4.4.0.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_4.4.0.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0">
-			<Component Id="Runtime_Redist_3.47.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.47.4.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.47.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.47.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.47.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.47.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0">
-			<Component Id="Runtime_Redist_3.7.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.7.4.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.7.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.7.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.7.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.7.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0">
-			<Component Id="Runtime_Redist_3.78.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.4.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.78.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.78.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.78.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.78.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0">
-			<Component Id="Runtime_Redist_3.259.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.4.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.259.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.259.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.259.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.259.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0">
+      <Component Id="Runtime_Redist_4.4.0.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.0.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_4.4.0.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_4.4.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_4.4.0.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_4.4.0.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0">
+      <Component Id="Runtime_Redist_3.47.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.47.4.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.47.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.47.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.47.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.47.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0">
+      <Component Id="Runtime_Redist_3.7.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.7.4.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.7.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.7.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.7.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.7.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0">
+      <Component Id="Runtime_Redist_3.78.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.4.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.78.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.78.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.78.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.78.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0">
+      <Component Id="Runtime_Redist_3.259.4.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.4.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.259.4.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.259.4.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.259.4.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.259.4.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
 
-		<!-- F# 3.1 -->
+    <!-- F# 3.1 -->
 
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0">
-			<Component Id="Runtime_Redist_4.3.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.3.1.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_4.3.1.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_4.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_4.3.1.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_4.3.1.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1">
-			<Component Id="Runtime_Redist_2.3.5.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_2.3.5.1_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_2.3.5.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_2.3.5.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_2.3.5.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_2.3.5.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0">
-			<Component Id="Runtime_Redist_3.3.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.3.1.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.3.1.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.3.1.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.3.1.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1">
-			<Component Id="Runtime_Redist_3.78.3.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.3.1_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.78.3.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.78.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.78.3.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.78.3.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1">
-			<Component Id="Runtime_Redist_3.259.3.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.3.1_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_3.259.3.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_3.259.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_3.259.3.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_3.259.3.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0">
+      <Component Id="Runtime_Redist_4.3.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.3.1.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_4.3.1.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_4.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_4.3.1.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_4.3.1.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1">
+      <Component Id="Runtime_Redist_2.3.5.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_2.3.5.1_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_2.3.5.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_2.3.5.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_2.3.5.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_2.3.5.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0">
+      <Component Id="Runtime_Redist_3.3.1.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.3.1.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.3.1.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.3.1.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.3.1.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.3.1.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1">
+      <Component Id="Runtime_Redist_3.78.3.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.78.3.1_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.78.3.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.78.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.78.3.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.78.3.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1">
+      <Component Id="Runtime_Redist_3.259.3.1_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_3.259.3.1_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_3.259.3.1_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_3.259.3.1_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_3.259.3.1_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_3.259.3.1_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
 
-		<!-- F# 3.0 -->
+    <!-- F# 3.0 -->
 
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0">
-			<Component Id="Runtime_Redist_4.3.0.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.3.0.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_4.3.0.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_4.3.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_4.3.0.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_4.3.0.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-		<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0">
-			<Component Id="Runtime_Redist_2.3.5.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_2.3.5.0_FSharp.Core, $(var.LocaleCode)))">
-				<File Id="Runtime_Redist_2.3.5.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.dll" KeyPath="yes" />
-				<File Id="Runtime_Redist_2.3.5.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.xml" />
-				<File Id="Runtime_Redist_2.3.5.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.sigdata" />
-				<File Id="Runtime_Redist_2.3.5.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.optdata" />
-			</Component>
-		</DirectoryRef>
-	</Fragment>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0">
+      <Component Id="Runtime_Redist_4.3.0.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.3.0.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_4.3.0.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_4.3.0.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_4.3.0.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_4.3.0.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0">
+      <Component Id="Runtime_Redist_2.3.5.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_2.3.5.0_FSharp.Core, $(var.LocaleCode)))">
+        <File Id="Runtime_Redist_2.3.5.0_FSharp.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.dll" KeyPath="yes" />
+        <File Id="Runtime_Redist_2.3.5.0_FSharp.Core.xml" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.xml" />
+        <File Id="Runtime_Redist_2.3.5.0_FSharp.Core.sigdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.sigdata" />
+        <File Id="Runtime_Redist_2.3.5.0_FSharp.Core.optdata" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.optdata" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
 </Wix>
\ No newline at end of file

From a9af08277669fed945fed4d2358662dcb2f926e9 Mon Sep 17 00:00:00 2001
From: KevinRansom <codecutter@hotmail.com>
Date: Tue, 23 Aug 2016 12:55:29 -0700
Subject: [PATCH 3/3] feedback

---
 setup/FSharp.SDK/component-groups/Compiler_Redist.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
index 672d1f387e..bb933585b3 100644
--- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
+++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
@@ -73,7 +73,7 @@
       </Component>
 
       <Component Id="Compiler_Redist_fsi.exe" Guid="$(fsharp.guid(Compiler_Redist_fsi.exe, $(var.LocaleCode)))">
-        <File Id="Compiler_Redist_fsi.exe.config" Source="$(var.BinariesDir)\net40\bin\fsi.exe" KeyPath="yes">
+        <File Id="Compiler_Redist_fsi.exe" Source="$(var.BinariesDir)\net40\bin\fsi.exe" KeyPath="yes">
           <NetFx:NativeImage Id="Compiler_Redist_fsi.Native.exe" Priority="0" Dependencies="no" Platform="all" />
         </File>
         <File Id="Compiler_Redist_fsi.exe.config" Source="$(var.BinariesDir)\net40\bin\fsi.exe.config" />