Skip to content

F
fsharp

dotNET Platform / fsharp
12 个月 前同步成功

通知 0
Star 1
Fork 0
F
fsharp

体验新版 GitCode，发现更多精彩内容 >>

提交 6f425432 编写于 作者: K Kevin Ransom (msft) 提交者： GitHub
浏览文件
操作

Merge pull request #1477 from KevinRansom/fixappconfigs 

Add fsc.exe.config/fsi.exe.config and fsiAnyCpu.config to setup.  And…
上级 69b33791 a9af0827
展开全部 隐藏空白更改
内联 并排
Showing with 557 addition and 561 deletion
setup/FSharp.SDK/FSharp.SDK.wixproj
浏览文件 @ 6f425432
......@@ -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." />
......
setup/FSharp.SDK/FSharp.SDK.wxs
浏览文件 @ 6f425432
......@@ -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
setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
浏览文件 @ 6f425432
......@@ -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
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或