Skip to content

Commit 6f42543

Browse files
KevinRansomKevinRansom
authored
Merge pull request #1477 from KevinRansom/fixappconfigs
Add fsc.exe.config/fsi.exe.config and fsiAnyCpu.config to setup. And…
2 parents 69b3379 + a9af082 commit 6f42543

File tree

6 files changed

+557
-561
lines changed

6 files changed

+557
-561
lines changed

‎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>

‎setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +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" xmlns:NetFx="http://schemas.microsoft.com/wix/NetFxExtension">
44

5-
<Fragment>
6-
<ComponentGroup Id="Compiler_LangPack">
5+
<Fragment>
6+
<ComponentGroup Id="Compiler_LangPack">
7+
<ComponentRef Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
8+
<ComponentRef Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
9+
<ComponentRef Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" />
10+
<ComponentRef Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
11+
<ComponentRef Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
12+
<ComponentRef Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
13+
</ComponentGroup>
714

8-
<ComponentRef Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
9-
<ComponentRef Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
10-
<ComponentRef Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" />
11-
<ComponentRef Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
12-
<ComponentRef Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
13-
<ComponentRef Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
14-
15-
</ComponentGroup>
15+
<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
16+
<Component Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
17+
<File Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
18+
</Component>
1619

17-
<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
20+
<Component Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode), $(var.LocaleCode)))">
21+
<File Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll" KeyPath="yes" />
22+
</Component>
1823

19-
<Component Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
20-
<File Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
21-
</Component>
22-
23-
<Component Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode), $(var.LocaleCode)))">
24-
<File Id="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll" KeyPath="yes" />
25-
</Component>
26-
27-
<Component Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode), $(var.LocaleCode)))">
28-
<File Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll" KeyPath="yes" />
29-
</Component>
30-
31-
<Component Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">
32-
<File Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsc.resources.dll" KeyPath="yes" />
33-
</Component>
34-
35-
<Component Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsi.exe_$(var.LocaleCode), $(var.LocaleCode)))">
36-
<File Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsi.resources.dll" KeyPath="yes"/>
37-
</Component>
38-
39-
<Component Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode), $(var.LocaleCode)))">
40-
<File Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsiAnyCPU.resources.dll" KeyPath="yes" />
41-
</Component>
42-
43-
</DirectoryRef>
44-
</Fragment>
24+
<Component Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25+
<File Id="Compiler_LangPack_FSharp.Compiler.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.resources.dll" KeyPath="yes" />
26+
</Component>
27+
28+
<Component Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">
29+
<File Id="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsc.resources.dll" KeyPath="yes" />
30+
</Component>
31+
32+
<Component Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsi.exe_$(var.LocaleCode), $(var.LocaleCode)))">
33+
<File Id="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsi.resources.dll" KeyPath="yes"/>
34+
</Component>
35+
36+
<Component Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode), $(var.LocaleCode)))">
37+
<File Id="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsiAnyCPU.resources.dll" KeyPath="yes" />
38+
</Component>
39+
</DirectoryRef>
40+
</Fragment>
4541
</Wix>

0 commit comments

Comments
 (0)