Skip to content

Commit 82a3d0f

Browse files
OmarTawfikOmarTawfik
authored
Merge pull request #1523 from OmarTawfik/roslyn
Update Roslyn branch from master
2 parents 9b8b6c0 + 97303d4 commit 82a3d0f

File tree

167 files changed

+3550
-2589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+3550
-2589
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ For F# 4.1 development
6565
- [Windows 7 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279)
6666
- [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)
6767
- [Windows 8.1 SDK](http://msdn.microsoft.com/en-us/library/windows/desktop/bg162891.aspx)
68+
- [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk)
6869

6970
####Contributing
7071

‎packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@
4242
<package id="RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor" version="14.3.25407" targetFramework="net46" />
4343
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
4444
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
45+
<package id="BenchmarkDotNet" version="0.9.8"/>
46+
<package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
4547
</packages>

‎setup/FSharp.SDK/Common.Wix.Properties.wxs‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,96 @@
22
<!-- 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. -->
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<!-- Common Folders -->
6-
<Fragment>
7-
<Directory Id="TARGETDIR" Name="SourceDir">
8-
<Directory Id="ProgramFilesFolder" Name="Program Files">
9-
<Directory Id="ReferenceAssemblies" Name="Reference Assemblies">
10-
<Directory Id="ReferenceAssemblies_Microsoft" Name="Microsoft">
11-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp" Name="FSharp">
12-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
13-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
14-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
15-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
16-
</Directory>
17-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0" Name="4.4.0.0">
18-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
19-
</Directory>
20-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0" Name="4.3.1.0">
21-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
22-
</Directory>
23-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0" Name="4.3.0.0">
24-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
25-
</Directory>
26-
</Directory>
27-
</Directory>
28-
29-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable" Name=".NETPortable">
30-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0" Name="3.47.41.0">
31-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
32-
</Directory>
33-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0" Name="3.47.4.0">
34-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
35-
</Directory>
36-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1" Name="2.3.5.1">
37-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
38-
</Directory>
39-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0" Name="2.3.5.0">
40-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
41-
</Directory>
42-
</Directory>
43-
44-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore" Name=".NETCore">
45-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0" Name="3.7.41.0">
46-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
47-
</Directory>
48-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0" Name="3.7.4.0">
49-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
50-
</Directory>
51-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0" Name="3.3.1.0">
52-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
53-
</Directory>
5+
<!-- Common Folders -->
6+
<Fragment>
7+
<Directory Id="TARGETDIR" Name="SourceDir">
8+
<Directory Id="ProgramFilesFolder" Name="Program Files">
9+
<Directory Id="ReferenceAssemblies" Name="Reference Assemblies">
10+
<Directory Id="ReferenceAssemblies_Microsoft" Name="Microsoft">
11+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp" Name="FSharp">
12+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
13+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
14+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
15+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
16+
</Directory>
17+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0" Name="4.4.0.0">
18+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
19+
</Directory>
20+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0" Name="4.3.1.0">
21+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
22+
</Directory>
23+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0" Name="4.3.0.0">
24+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
25+
</Directory>
26+
</Directory>
27+
</Directory>
5428

55-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0" Name="3.78.41.0">
56-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
57-
</Directory>
58-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0" Name="3.78.4.0">
59-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
60-
</Directory>
61-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1" Name="3.78.3.1">
62-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
63-
</Directory>
29+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable" Name=".NETPortable">
30+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0" Name="3.47.41.0">
31+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
32+
</Directory>
33+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0" Name="3.47.4.0">
34+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
35+
</Directory>
36+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1" Name="2.3.5.1">
37+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
38+
</Directory>
39+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0" Name="2.3.5.0">
40+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
41+
</Directory>
42+
</Directory>
6443

65-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0" Name="3.259.41.0">
66-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
67-
</Directory>
68-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0" Name="3.259.4.0">
69-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
70-
</Directory>
71-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1" Name="3.259.3.1">
72-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
73-
</Directory>
74-
</Directory>
75-
</Directory>
76-
</Directory>
77-
</Directory>
78-
79-
<Directory Id="MicrosoftSDKs" Name="Microsoft SDKs">
80-
<Directory Id="MicrosoftSDKs_FS" Name="F#">
81-
<Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
82-
<Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
83-
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
84-
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
85-
</Directory>
86-
</Directory>
87-
</Directory>
88-
89-
<Directory Id="MicrosoftSDKs_FS_Licenses" Name="Licenses">
90-
<Directory Id="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)" Name="$(var.LocaleId)" />
91-
</Directory>
92-
</Directory>
93-
</Directory>
94-
</Directory>
95-
</Directory>
96-
</Fragment>
44+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore" Name=".NETCore">
45+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0" Name="3.7.41.0">
46+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
47+
</Directory>
48+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0" Name="3.7.4.0">
49+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
50+
</Directory>
51+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0" Name="3.3.1.0">
52+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
53+
</Directory>
54+
55+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0" Name="3.78.41.0">
56+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
57+
</Directory>
58+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0" Name="3.78.4.0">
59+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
60+
</Directory>
61+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1" Name="3.78.3.1">
62+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
63+
</Directory>
64+
65+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0" Name="3.259.41.0">
66+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
67+
</Directory>
68+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0" Name="3.259.4.0">
69+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
70+
</Directory>
71+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1" Name="3.259.3.1">
72+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
73+
</Directory>
74+
</Directory>
75+
</Directory>
76+
</Directory>
77+
</Directory>
78+
79+
<Directory Id="MicrosoftSDKs" Name="Microsoft SDKs">
80+
<Directory Id="MicrosoftSDKs_FS" Name="F#">
81+
<Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
82+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
83+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
84+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
85+
</Directory>
86+
</Directory>
87+
</Directory>
88+
89+
<Directory Id="MicrosoftSDKs_FS_Licenses" Name="Licenses">
90+
<Directory Id="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)" Name="$(var.LocaleId)" />
91+
</Directory>
92+
</Directory>
93+
</Directory>
94+
</Directory>
95+
</Directory>
96+
</Fragment>
9797
</Wix>

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
66
<SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
77
</PropertyGroup>
8-
8+
99
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1010
<Import Project="$(SetupRootFolder)\FSharp.Setup.props" />
11-
11+
1212
<PropertyGroup>
1313
<OutputName>Microsoft.FSharp.SDK</OutputName>
1414
<ProjectGuid>da0da41f-0e00-4598-8eee-b29d31b0ca04</ProjectGuid>
@@ -19,7 +19,7 @@
1919
<ServiceByMajorUpgrade>true</ServiceByMajorUpgrade>
2020
<DefineSolutionProperties>false</DefineSolutionProperties>
2121
</PropertyGroup>
22-
22+
2323
<PropertyGroup>
2424
<DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
2525
<DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
@@ -30,7 +30,7 @@
3030
<DefineConstants>$(DefineConstants);FSharpTreeRoot=$(FSharpTreeRoot)</DefineConstants>
3131
<DefineConstants>$(DefineConstants);NugetPackagesDir=$(NugetPackagesDir)</DefineConstants>
3232
</PropertyGroup>
33-
33+
3434
<ItemGroup>
3535
<WixExtension Include="WixNetFxExtension">
3636
<Name>WixNetFxExtension</Name>
@@ -40,28 +40,28 @@
4040
<HintPath>$(BinariesDir)\setup\FSharp.Wix.Extensions.dll</HintPath>
4141
</WixExtension>
4242
</ItemGroup>
43-
43+
4444
<ItemGroup>
4545
<Compile Include="Common.Wix.Properties.wxs" />
46-
46+
4747
<Compile Include="FSharp.SDK.wxs" />
4848

4949
<Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Compiler_Redist.wxs" />
5050
<Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Compiler_LangPack.wxs" />
51-
51+
5252
<Compile Condition="'$(IsLangPack)' != 'true'" Include="component-groups\Runtime_Redist.wxs" />
5353
<Compile Condition="'$(IsLangPack)' == 'true'" Include="component-groups\Runtime_LangPack.wxs" />
5454
</ItemGroup>
55-
55+
5656
<ItemGroup>
5757
<FilesToSign Include="$(OutDir)$(OutputName).msi">
5858
<Authenticode>Microsoft400</Authenticode>
5959
</FilesToSign>
6060
</ItemGroup>
61-
61+
6262
<Import Project="$(WixInstallPath)\wix.targets" />
6363
<Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
64-
64+
6565
<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
6666
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
6767
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,40 @@
22
<!-- 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. -->
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<?define ProductVersion = "4.1"?>
6-
<?define ProductPlatform = "x86"?>
7-
<?define ProductManufacturer = "Microsoft Corporation"?>
8-
<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
9-
<?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
5+
<?define ProductVersion = "4.1"?>
6+
<?define ProductPlatform = "x86"?>
7+
<?define ProductManufacturer = "Microsoft Corporation"?>
8+
<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
9+
<?define ProductUpgradeCode = "$(fsharp.guid($(var.ProductDescription),$(var.ProductPlatform),$(var.LocaleId),$(var.ProductVersion)))" ?>
1010

11-
<Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">
11+
<Product Id="*" Name="$(var.ProductDescription)" Manufacturer="$(var.ProductManufacturer)" Version="$(var.ProductVersion)" Language="$(var.LocaleId)" UpgradeCode="$(var.ProductUpgradeCode)">
1212

13-
<Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
14-
<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
15-
<MediaTemplate EmbedCab="yes" />
13+
<Package Description="$(var.ProductDescription)" Platform="$(var.ProductPlatform)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
14+
<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of this product is already installed." Schedule="afterInstallInitialize" />
15+
<MediaTemplate EmbedCab="yes" />
1616

17-
<Feature Id="Compiler_Feature"
18-
AllowAdvertise="no"
19-
Description="Installs the Visual F# programming language and all associated components."
20-
Title="Visual F#">
17+
<Feature Id="Compiler_Feature"
18+
AllowAdvertise="no"
19+
Description="Installs the Visual F# programming language and all associated components."
20+
Title="Visual F#">
2121

22-
<?if $(var.IsLangPack) = true ?>
23-
<ComponentGroupRef Id="Compiler_LangPack" />
24-
<?else ?>
25-
<ComponentGroupRef Id="Compiler_Redist" />
26-
<?endif ?>
27-
</Feature>
28-
29-
<Feature Id="Runtime_Feature"
30-
Title="Microsoft Visual F# Runtime for .NET"
31-
Description="Runtime components for F# compiled binaries."
32-
Display="hidden">
33-
34-
<?if $(var.IsLangPack) = true ?>
35-
<ComponentGroupRef Id="Runtime_LangPack" />
36-
<?else ?>
37-
<ComponentGroupRef Id="Runtime_Redist" />
38-
<?endif ?>
39-
</Feature>
40-
</Product>
22+
<?if $(var.IsLangPack) = true ?>
23+
<ComponentGroupRef Id="Compiler_LangPack" />
24+
<?else ?>
25+
<ComponentGroupRef Id="Compiler_Redist" />
26+
<?endif ?>
27+
</Feature>
28+
29+
<Feature Id="Runtime_Feature"
30+
Title="Microsoft Visual F# Runtime for .NET"
31+
Description="Runtime components for F# compiled binaries."
32+
Display="hidden">
33+
34+
<?if $(var.IsLangPack) = true ?>
35+
<ComponentGroupRef Id="Runtime_LangPack" />
36+
<?else ?>
37+
<ComponentGroupRef Id="Runtime_Redist" />
38+
<?endif ?>
39+
</Feature>
40+
</Product>
4141
</Wix>

0 commit comments

Comments
 (0)