mono
/
fsharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update Version Numbers (#4064) 

* Rev version numbers to 4.4.3.0

* updates

* Fix fcs builds
This commit is contained in:
Kevin Ransom (msft) 2017-12-07 10:42:32 -08:00 коммит произвёл GitHub
Родитель 4c06ae2dd0
Коммит a0414e7203
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
96 изменённых файлов: 371 добавлений и 334 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj
Просмотреть файл

@ -77,7 +77,7 @@
</Reference>
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools -->
<Reference Include="FSharp.Core">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>

2
fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj
Просмотреть файл

@ -46,7 +46,7 @@
<Reference Include="System.Xml" />
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools -->
<Reference Include="FSharp.Core">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>

2
fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj
Просмотреть файл

@ -58,7 +58,7 @@
<Reference Include="System.Xml" />
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools -->
<Reference Include="FSharp.Core">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>

2
fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
Просмотреть файл

@ -651,7 +651,7 @@
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools -->
<Reference Include="FSharp.Core">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>

2
fcs/samples/EditorService/EditorService.fsproj
Просмотреть файл

@ -41,7 +41,7 @@
<ItemGroup>
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools -->
<Reference Include="FSharp.Core">
<HintPath>$(SolutionDir)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>$(SolutionDir)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
packages.config
Просмотреть файл

@ -45,7 +45,7 @@
<package id="FSharp.Compiler.Tools" version="4.1.27"/>
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
<package id="Microsoft.Portable.FSharp.Core" version="4.1.20"/>
<package id="Microsoft.Portable.FSharp.Core" version="4.3.0"/>
<!-- FSharp.Core is used to get back versions of FSharp.Core -->
<package id="FSharp.Core" version="4.1.17"/>

11
setup/FSharp.SDK/Common.Wix.Properties.wxs
Просмотреть файл

@ -11,6 +11,9 @@
<Directory Id="ReferenceAssemblies_Microsoft_FSharp" Name="FSharp">
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0" Name="4.4.3.0">
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
</Directory>
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
</Directory>
@ -78,10 +81,10 @@
<Directory Id="MicrosoftSDKs" Name="Microsoft SDKs">
<Directory Id="MicrosoftSDKs_FS" Name="F#">
<Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
<Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
<Directory Id="MicrosoftSDKs_FS_4.3" Name="4.3">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework" Name="Framework">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework_v4.0" Name="v4.0">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
</Directory>
</Directory>
</Directory>

2
setup/FSharp.SDK/FSharp.SDK.wxs
Просмотреть файл

@ -2,7 +2,7 @@
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define ProductVersion = "4.1"?>
<?define ProductVersion = "4.3"?>
<?define ProductPlatform = "x86"?>
<?define ProductManufacturer = "Microsoft Corporation"?>
<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>

2
setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
Просмотреть файл

@ -9,7 +9,7 @@
<ComponentRef Id="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
</ComponentGroup>
<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
<DirectoryRef Id="MicrosoftSDKs_FS_4.3_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\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>

18
setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
Просмотреть файл

@ -39,7 +39,7 @@
</ComponentGroup>
<DirectoryRef Id="MicrosoftSDKs_FS_4.1_Framework_v4.0">
<DirectoryRef Id="MicrosoftSDKs_FS_4.3_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">
@ -131,18 +131,18 @@
</Component>
<Component Id="Compiler_Redist_RegistryKeys_CompilerLocation" Guid="$(fsharp.guid(Compiler_Redist_RegistryKeys_CompilerLocation, $(var.LocaleCode)))">
<Environment Id="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable" Name="FSHARPINSTALLDIR" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Action="create" System="yes" />
<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" />
<Environment Id="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable" Name="FSHARPINSTALLDIR" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]" Action="create" System="yes" />
<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.3\Runtime\v4.0" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Value="[MicrosoftSDKs_FS_4.3_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" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.props" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.FSharp.NetSdk.props" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.targets" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]Microsoft.FSharpNetSdk.targets" Type="string" />
<RegistryValue Name="Microsoft.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.Portable.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.Portable.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.props" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.NetSdk.props" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharpNetSdk.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" />
<RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]" Type="string" />
</RegistryKey>
</Component>

230
setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
Просмотреть файл

@ -8,6 +8,10 @@
<ComponentGroup Id="Runtime_LangPack">
<!-- F# 4.3 -->
<ComponentRef Id="Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack" />
<!-- F# 4.1 -->
<ComponentRef Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" />
@ -43,123 +47,131 @@
</ComponentGroup>
<!-- F# 4.1 -->
<!-- F# 4.3 -->
<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\$(var.LocaleParentCulture)\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)\profiles\portable-net45+sl5+netcore45\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)\profiles\portable-net45+netcore45\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)\profiles\portable-net45+netcore45+wp8\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)\profiles\portable-net45+netcore45+wpa81+wp8\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>
</DirectoryRef>
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0_$(var.LocaleId)">
<Component Id="Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
<File Id="Runtime_LangPack_4.4.3.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>
</DirectoryRef>
<!-- F# 4.0 -->
<!-- F# 4.1 -->
<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>
<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\$(var.LocaleParentCulture)\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)\profiles\portable-net45+sl5+netcore45\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)\profiles\portable-net45+netcore45\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)\profiles\portable-net45+netcore45+wp8\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)\profiles\portable-net45+netcore45+wpa81+wp8\localize\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
</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# 4.0 -->
<!-- F# 3.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>
<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>
<!-- 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>
<!-- Registry Keys -->
<!-- F# 3.0 -->
<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>
<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.3\Runtime\v4.0_$(var.LocaleId)\Install" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Name="InstallSuccess" Value="4.4.3.0" Type="string" />
</RegistryKey>
</Component>
</DirectoryRef>
</Fragment>
</Wix>

35
setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
Просмотреть файл

@ -5,6 +5,9 @@
<Fragment>
<ComponentGroup Id="Runtime_Redist">
<!-- F# 4.3 -->
<ComponentRef Id="Runtime_Redist_4.4.3.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" />
@ -32,12 +35,10 @@
</ComponentGroup>
<!-- 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" />
<!-- F# 4.3 -->
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0">
<Component Id="Runtime_Redist_4.4.3.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.3.0_FSharp.Core, $(var.LocaleCode)))">
<File Id="Runtime_Redist_4.4.3.0_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes" />
<!-- NOTE: The optdata and sigdata files are now integrated as resources for more recent FSharp.Core.dll's. -->
<!-- However old versions of FSharp.Core still need these files. For consistency we also continue to produce the files -->
<!-- for FSharp.Core 4.4.1.0, and include them in the redist. -->
@ -47,8 +48,26 @@
<!-- versions of the FSharp.Core package (which can happen automatically on package upgrade). However for FSharp.Core 4.4.2.0 -->
<!-- beyond the files will not be needed in the redist, which is only ever installed on machines alongside a recent -->
<!-- F# compiler -->
<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" />
<File Id="Runtime_Redist_4.4.3.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.sigdata" />
<File Id="Runtime_Redist_4.4.3.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.optdata" />
</Component>
</DirectoryRef>
<!-- 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)\versions\4.4.1.0\FSharp.Core.dll" KeyPath="yes" />
<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.xml" Source="$(var.BinariesDir)\versions\4.4.1.0\FSharp.Core.xml" />
<!-- NOTE: The optdata and sigdata files are now integrated as resources for more recent FSharp.Core.dll's. -->
<!-- However old versions of FSharp.Core still need these files. For consistency we also continue to produce the files -->
<!-- for FSharp.Core 4.4.1.0, and include them in the redist. -->
<!-- -->
<!-- We should continue to produce the files for FSharp.Core 4.4.2.0 and beyond, for inclusion in the FSharp.Core -->
<!-- nuget package. We should do this for as long as it is possible that old F# compilers (VS2010-VS2017) will end up referring to newer -->
<!-- versions of the FSharp.Core package (which can happen automatically on package upgrade). However for FSharp.Core 4.4.2.0 -->
<!-- beyond the files will not be needed in the redist, which is only ever installed on machines alongside a recent -->
<!-- F# compiler -->
<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.sigdata" Source="$(var.BinariesDir)\versions\4.4.1.0\FSharp.Core.sigdata" />
<File Id="Runtime_Redist_4.4.1.0_FSharp.Core.optdata" Source="$(var.BinariesDir)\versions\4.4.1.0\FSharp.Core.optdata" />
</Component>
</DirectoryRef>
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0">

6
setup/FSharp.Setup.props
Просмотреть файл

@ -8,16 +8,16 @@
<WixInstallPath>$(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix</WixInstallPath>
<NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>
</PropertyGroup>
<PropertyGroup>
<FSharpProductVersion>4.1</FSharpProductVersion>
<FSharpProductVersion>4.3</FSharpProductVersion>
<!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build -->
<BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
<!-- Remove .DRAFT suffix if it exists in the build number -->
<FSharpPackageVersion>$(FSharpProductVersion).$(BUILD_BUILDNUMBER.Replace(".DRAFT", ""))</FSharpPackageVersion>
<!-- FSharpPackageVersion should be {F# version}.{today's date}.{build number}. Example: 4.1.20160901.3 -->
</PropertyGroup>
<PropertyGroup>
<TargetDotnetProfile Condition=" '$(TargetDotnetProfile)' == '' ">net40</TargetDotnetProfile>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

2
setup/FSharp.Wix.Extensions/FSharp.Wix.Extensions.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<PropertyGroup>
<ProjectLanguage>CSharp</ProjectLanguage>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<MicroBuildAssemblyVersion>4.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>

2
setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
Просмотреть файл

@ -3,7 +3,7 @@ use vs
package name=Microsoft.FSharp.SDK.Core
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.1
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.3
vs.installSize
SystemDrive=194670592

2
setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
Просмотреть файл

@ -4,4 +4,4 @@ package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.language=$(LocaleSpecificCulture)
vs.package.installSize=1
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.1
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3

2
setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
Просмотреть файл

@ -4,7 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.language=$(LocaleSpecificCulture)
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.1
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3
vs.installSize
SystemDrive=12681438

2
setup/resources/Microsoft.FSharp.NetSdk.Shim.props
Просмотреть файл

@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.FSharp.NetSdk.props" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.NetSdk.props" />
</Project>

2
setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
Просмотреть файл

@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.FSharp.NetSdk.targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.NetSdk.targets" />
</Project>

2
setup/resources/Microsoft.FSharp.Shim.targets
Просмотреть файл

@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.FSharp.Targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.Targets" />
</Project>

2
setup/resources/Microsoft.Portable.FSharp.Shim.targets
Просмотреть файл

@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
</Project>

11
src/FSharpSource.Settings.targets
Просмотреть файл

@ -45,10 +45,13 @@
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
<IntermediateOutputPath Condition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
<FSharpCore41TargetVersion>4.1.19</FSharpCore41TargetVersion>
<FSharpCore41FrozenPortableVersion>4.1.20</FSharpCore41FrozenPortableVersion>
<FSharpCore41FrozenPortableTargetVersion>4.1.21</FSharpCore41FrozenPortableTargetVersion>
<FSharpCore42TargetVersion>4.2.4</FSharpCore42TargetVersion>
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
<FSharpCoreFrozenPortablePackageVersion>4.3.0</FSharpCoreFrozenPortablePackageVersion>
<FSharpCoreFrozenPortableTargetPackageVersion>4.3.1</FSharpCoreFrozenPortableTargetPackageVersion>
<FSharpCoreFrozenPortableTargetMajorVersion>4.3</FSharpCoreFrozenPortableTargetMajorVersion>
<NUnitVersion>3.5.0</NUnitVersion>
<NUnitFullVersion>3.5.0.0</NUnitFullVersion>

5
src/FSharpSource.targets
Просмотреть файл

@ -3,9 +3,8 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSCoreVersion>4.4.1.0</FSCoreVersion>
<FSCoreVersion>4.4.3.0</FSCoreVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release' ">
<PropertyGroup>
@ -33,7 +32,7 @@
<StrongNames>true</StrongNames>
<MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion -->
<MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>
</Otherwise>

6
src/fsharp/FSharp.Core.nuget/FSharp.Core.4.2.xxx.nuspec → src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec
Просмотреть файл

@ -3,10 +3,10 @@
<metadata>
<!-- rename to FSharp.Core when done -->
<id>FSharp.Core</id>
<title>FSharp.Core for F# 4.1</title>
<summary>FSharp.Core for F# 4.1</summary>
<title>FSharp.Core for F# 4.3</title>
<summary>FSharp.Core for F# 4.3</summary>
<description>
FSharp.Core redistributables from Visual F# 4.1.0
FSharp.Core redistributables from Visual F# 4.3.0
Supported Platforms:
.NET 4.5+ (net45)
netstandard1.6 (netstandard1.6)

20
src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj
Просмотреть файл

@ -16,9 +16,9 @@
</PropertyGroup>
<ItemGroup>
<PackageNuspec Include="FSharp.Core.4.2.xxx.nuspec" />
<PackageNuspec Include="FSharp.Core.LatestNuget.nuspec" />
<PackageNuspec Include="FSharp.Core.4.1.xxx.nuspec" />
<PackageNuspec Include="Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec" />
<PackageNuspec Include="Microsoft.Portable.FSharp.Core.nuspec" />
</ItemGroup>
<ItemGroup>
@ -37,8 +37,8 @@
<Target Name="CopyFiles">
<ItemGroup>
<Profiles Include="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersion)\lib\**\*.*"
Exclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersion)\lib\net45\**\*.*;$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCore41FrozenPortableVersionm)\lib\netstandard1.6\**\*.*" />
<Profiles Include="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\**\*.*"
Exclude="$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\net45\**\*.*;$(NugetLocalPackagesDir)\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\netstandard1.6\**\*.*" />
</ItemGroup>
<Copy SourceFiles="@(Profiles)" DestinationFolder="$(FSharpSourcesRoot)\..\$(Configuration)\%(RecursiveDir)" />
</Target>
@ -52,14 +52,14 @@
<PropertyGroup>
<PackageVersion>X.X.XXX</PackageVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">4.1</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.nuspec'">$(FSharpCoreFrozenPortableTargetMajorVersion)</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">$(FSharpCore42TargetVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.2.xxx.nuspec'">4.2</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41TargetMajorVersion)</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec'">$(FSharpCore41FrozenPortableTargetVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec'">4.1</PackageMajorVersion>
<PackageVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreFrozenPortableTargetPackageVersion)</PackageVersion>
<PackageMajorVersion Condition="'@(PackageNuspec)' == 'FSharp.Core.LatestNuget.nuspec'">$(FSharpCoreFrozenPortableTargetMajorVersion)</PackageMajorVersion>
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
</PropertyGroup>

18
src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.4.1.xxx.nuspec → src/fsharp/FSharp.Core.nuget/Microsoft.Portable.FSharp.Core.nuspec
Просмотреть файл

@ -14,14 +14,14 @@
<dependencies></dependencies>
</metadata>
<files>
<file src="profiles\net20\**\**" target="lib" />
<file src="profiles\net40\**\**" target="lib" />
<file src="profiles\portable-net45+monoandroid10+monotouch10+xamarinios10\**\**" target="lib" />
<file src="profiles\portable-net45+netcore45\**\**" target="lib" />
<file src="profiles\portable-net45+netcore45+wp8\**\**" target="lib" />
<file src="profiles\portable-net45+netcore45+wpa81+wp8\**\**" target="lib" />
<file src="profiles\portable-net45+sl5+netcore45\**\**" target="lib" />
<file src="profiles\xamarinmac20\**\**" target="lib" />
<file src="profiles/net20/**/**" target="lib" />
<file src="profiles/net40/**/**" target="lib" />
<file src="profiles/portable-net45+monoandroid10+monotouch10+xamarinios10/**/**" target="lib" />
<file src="profiles/portable-net45+netcore45/**/**" target="lib" />
<file src="profiles/portable-net45+netcore45+wp8/**/**" target="lib" />
<file src="profiles/portable-net45+netcore45+wpa81+wp8/**/**" target="lib" />
<file src="profiles/portable-net45+sl5+netcore45/**/**" target="lib" />
<file src="profiles/xamarinmac20/**/**" target="lib" />
<file src="versions/4.4.1.0/**/**" target="lib" />
</files>
</package>

2
src/fsharp/FSharp.Core/FSharp.Core.fsproj
Просмотреть файл

@ -278,7 +278,7 @@
Outputs='$(FSharpSourcesRoot)\..\$(Configuration)\artifacts\"%(PackageNuspec.Filename)).nupkg'>
<PropertyGroup>
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCore42TargetVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(FSharpCoreFrozenPortablePackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
</PropertyGroup>
<MakeDir Directories="$(FSharpSourcesRoot)\..\artifacts" />

2
src/utils/CompilerLocationUtils.fs
Просмотреть файл

@ -12,7 +12,7 @@ open System.Runtime.InteropServices
module internal FSharpEnvironment =
/// The F# version reported in the banner
let FSharpBannerVersion = "4.1"
let FSharpBannerVersion = "4.3"
let versionOf<'t> =
#if FX_RESHAPED_REFLECTION

2
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40/Sample_VS2012_FSharp_ConsoleApp_net40.fsproj
Просмотреть файл

@ -43,7 +43,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013/Sample_VS2012_FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj
Просмотреть файл

@ -43,7 +43,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2012_FSharp_Portable_Library/Sample_VS2012_FSharp_Portable_Library.fsproj
Просмотреть файл

@ -36,7 +36,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2012_FSharp_Portable_Library_upgraded_2013/Sample_VS2012_FSharp_Portable_Library_upgraded_2013.fsproj
Просмотреть файл

@ -35,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net40/Sample_VS2013_FSharp_Portable_Library_Legacy_net40.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net45/Sample_VS2013_FSharp_Portable_Library_Legacy_net45.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_Legacy_net451/Sample_VS2013_FSharp_Portable_Library_Legacy_net451.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_net45/Sample_VS2013_FSharp_Portable_Library_net45.fsproj
Просмотреть файл

@ -38,7 +38,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_net451/Sample_VS2013_FSharp_Portable_Library_net451.fsproj
Просмотреть файл

@ -38,7 +38,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile259/Sample_VS2013_FSharp_Portable_Library_net451.fsproj
Просмотреть файл

@ -38,7 +38,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2013_FSharp_Portable_Library_net451_adjusted_to_profile78/Sample_VS2013_FSharp_Portable_Library_net451.fsproj
Просмотреть файл

@ -38,7 +38,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2015_FSharp_Portable259_Library/Sample_VS2015_FSharp_Portable259_Library.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2015_FSharp_Portable47_Library/Sample_VS2015_FSharp_Portable47_Library.fsproj
Просмотреть файл

@ -38,7 +38,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2015_FSharp_Portable78_Library/Sample_VS2015_FSharp_Portable78_Library.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/projects/Sample_VS2015_FSharp_Portable7_Library/Sample_VS2015_FSharp_Portable7_Library.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
tests/service/data/DifferingOutputDir/Dir1/Test1.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
tests/service/data/DifferingOutputDir/Dir2/Test2.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

6
tests/service/data/FsAndFsiFiles.fsproj
Просмотреть файл

@ -35,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
@ -45,8 +45,8 @@
<Compile Include="Test1File2.fsi" />
<Compile Include="Test1File2.fs" />
<Compile Include="Test1File1.fs" />
<Compile Include="Test1File0.fsi" />
<Compile Include="Test1File0.fs" />
<Compile Include="Test1File0.fsi" />
<Compile Include="Test1File0.fs" />
</ItemGroup>
<Import Project="..\..\..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets" />
<Choose>

2
tests/service/data/MultiLanguageProject/ConsoleApplication1.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
tests/service/data/MultiLanguageProject/ConsoleApplication2.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
tests/service/data/Space in name.fsproj
Просмотреть файл

@ -35,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
tests/service/data/Test1.fsproj
Просмотреть файл

@ -35,7 +35,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
tests/service/data/Test2.fsproj
Просмотреть файл

@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
tests/service/data/Test3.fsproj
Просмотреть файл

@ -36,7 +36,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="mscorlib" />

2
tests/service/data/TestProject/TestProject.fsproj
Просмотреть файл

@ -35,7 +35,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="TestTP">

2
tests/service/data/TestTP/TestTP.fsproj
Просмотреть файл

@ -47,7 +47,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
tests/service/data/TypeProviderConsole/TypeProviderConsole.fsproj
Просмотреть файл

@ -39,7 +39,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
tests/service/data/TypeProviderLibrary/TypeProviderLibrary.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
tests/service/data/TypeProvidersBug/TestConsole/TestConsole.fsproj
Просмотреть файл

@ -47,7 +47,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<ProjectReference Include="..\TypeProvidersBug\TypeProvidersBug.fsproj">

2
tests/service/data/TypeProvidersBug/TypeProvidersBug/TypeProvidersBug.fsproj
Просмотреть файл

@ -42,7 +42,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="FSharp.Configuration">

2
tests/service/data/sqlite-net-spike/sqlite-net-spike.fsproj
Просмотреть файл

@ -37,7 +37,7 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core">
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="System" />

2
vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj
Просмотреть файл

@ -13,7 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<UseStandardResourceNames>true</UseStandardResourceNames>
$if$ ($targetframeworkversion$ >= 4.0)
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
$else$
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
$endif$

2
vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj
Просмотреть файл

@ -12,7 +12,7 @@
<UseStandardResourceNames>true</UseStandardResourceNames>
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
$if$ ($targetframeworkversion$ >= 4.0)
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
$else$
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
$endif$

2
vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.fsproj
Просмотреть файл

@ -13,7 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<UseStandardResourceNames>true</UseStandardResourceNames>
$if$ ($targetframeworkversion$ >= 4.0)
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
$else$
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
$endif$

2
vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj
Просмотреть файл

@ -16,7 +16,7 @@
<AssemblyName>LanguageServiceProfiling</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<Name>LanguageServiceProfiling</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

14
vsintegration/Vsix/RegisterFsharpPackage.pkgdef
Просмотреть файл

@ -53,7 +53,7 @@
"1"="{92EF0900-2251-11D2-B72E-0000F87572EF}"
[$RootKey$\Packages\{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}]
"ProductVersion"="4.1"
"ProductVersion"="4.3"
"ProductName"="Visual F#"
"CompanyName"="Microsoft Corp."
@ -63,42 +63,42 @@
[$RootKey$\CLSID\{e1194663-db3c-49eb-8b45-276fcdc440ea}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage"
"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage"
[$RootKey$\CLSID\{6d2d9b56-2691-4624-a1bf-d07a14594748}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass"
[$RootKey$\CLSID\{dd84aa8f-71bb-462a-8ef8-c9992cb325b7}]
"InprocServer32"="$System$mscoree.dll"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass"
[$RootKey$\CLSID\{fac0a17e-2e70-4211-916a-0d34fb708bff}]
"InprocServer32"="$System$mscoree.dll"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass"
[$RootKey$\CLSID\{9cfbeb2a-6824-43e2-bd3b-b112febc3772}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass"
[$RootKey$\CLSID\{df16b1a2-0e91-4499-ae60-c7144e614bf1}]
"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
"Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ThreadingModel"="Both"
@="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass"

2
vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
Просмотреть файл

@ -53,7 +53,7 @@
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
<AssemblyName>VisualFSharpFull</AssemblyName>
<OutputPath>$(RootBinPath)</OutputPath>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
<DeployExtension>false</DeployExtension>
</PropertyGroup>

2
vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
Просмотреть файл

@ -53,7 +53,7 @@
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
<AssemblyName>VisualFSharpOpenSource</AssemblyName>
<OutputPath>$(RootBinPath)</OutputPath>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />

2
vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj
Просмотреть файл

@ -51,7 +51,7 @@
<RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
<AssemblyName>VisualFSharpTemplate</AssemblyName>
<OutputPath>$(RootBinPath)</OutputPath>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
<DeployExtension>false</DeployExtension>
</PropertyGroup>

2
vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
Просмотреть файл

@ -4,7 +4,7 @@
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
<ProjectLanguage>CSharp</ProjectLanguage>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>
<PropertyGroup>

2
vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
Просмотреть файл

@ -6,7 +6,7 @@
<ProjectLanguage>CSharp</ProjectLanguage>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
<NoWarn>3001,3002,3003,3005,3008,3009,3021,3024</NoWarn>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
<VsSDKTools>$(VsSDKTools)</VsSDKTools>
</PropertyGroup>

8
vsintegration/src/FSharp.ProjectSystem.FSharp/AppConfigHelper.fs
Просмотреть файл

@ -359,10 +359,10 @@ namespace Microsoft.VisualStudio.FSharp.ProjectSystem
"3.78.41.0", "3.78.41.0", ["3.78.41.0"]
"3.259.4.0", "3.259.41.0", ["3.259.3.1"; "3.259.4.0"]
"3.259.41.0", "3.259.41.0", ["3.259.41.0"]
"4.3.0.0", "4.4.1.0", ["2.0.0.0"; "2.3.0.0"; "2.3.5.0"; "4.0.0.0"; "4.3.0.0"]
"4.3.1.0", "4.4.1.0", ["3.3.1.0"; "2.3.5.1"; "3.78.3.1"; "3.259.3.1"; "4.3.1.0"]
"4.4.0.0", "4.4.1.0", ["3.47.4.0"; "3.78.4.0"; "3.259.4.0"; "4.4.0.0"]
"4.4.1.0", "4.4.1.0", ["3.47.41.0"; "3.78.41.0"; "3.259.41.0"; "4.4.0.0"; "4.4.1.0"]
"4.3.0.0", "4.4.3.0", ["2.0.0.0"; "2.3.0.0"; "2.3.5.0"; "4.0.0.0"; "4.3.0.0"]
"4.3.1.0", "4.4.3.0", ["3.3.1.0"; "2.3.5.1"; "3.78.3.1"; "3.259.3.1"; "4.3.1.0"]
"4.4.0.0", "4.4.3.0", ["3.47.4.0"; "3.78.4.0"; "3.259.4.0"; "4.4.0.0"]
"4.4.1.0", "4.4.3.0", ["3.47.41.0"; "3.78.41.0"; "3.259.41.0"; "4.4.0.0"; "4.4.3.0"]
] |> Seq.where(fun (min, max, _) -> targetFSharpCoreVersion >= min && targetFSharpCoreVersion <= max)
// some helpers to simplify work with XLinq

4
vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
Просмотреть файл

@ -45,7 +45,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
[<assembly:ProvideCodeBase(AssemblyName = "FSharp.Compiler.Private", CodeBase = @"$PackageFolder$\FSharp.Compiler.Private.dll")>]
[<assembly:ProvideCodeBase(AssemblyName = "FSharp.Compiler.Server.Shared", CodeBase = @"$PackageFolder$\FSharp.Compiler.Server.Shared.dll")>]
[<assembly:ProvideCodeBase(AssemblyName = "FSharp.UIResources", CodeBase = @"$PackageFolder$\FSharp.UIResources.dll")>]
[<assembly:ProvideBindingRedirection(AssemblyName = "FSharp.Core", OldVersionLowerBound = "2.0.0.0", OldVersionUpperBound = "4.4.0.0", NewVersion = "4.4.1.0", CodeBase = @"$PackageFolder$\FSharp.Core.dll")>]
[<assembly:ProvideBindingRedirection(AssemblyName = "FSharp.Core", OldVersionLowerBound = "2.0.0.0", OldVersionUpperBound = "4.4.3.0", NewVersion = "4.4.3.0", CodeBase = @"$PackageFolder$\FSharp.Core.dll")>]
do ()
module internal VSHiveUtilities =
@ -509,7 +509,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
"3.259.3.1"; "3.259.4.0"] // portable 259
|> List.map (fun s -> System.Version(s))
let latestOnlyVersions =
["4.4.1.0" // .NET 4 desktop
["4.4.3.0" // .NET 4 desktop
"3.47.41.0" // portable 47
"3.7.41.0" // portable 7
"3.78.41.0" // portable 78

6
vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx
Просмотреть файл

@ -468,10 +468,10 @@
<value>Customizes the environment to maximize code editor screen space and improve the visibility of F# commands and tool windows.</value>
</data>
<data name="ProductDetails" xml:space="preserve">
<value>Microsoft Visual F# 4.1</value>
<value>Microsoft Visual F# 4.3</value>
</data>
<data name="9002" xml:space="preserve">
<value>Microsoft Visual F# 4.1</value>
<value>Microsoft Visual F# 4.3</value>
</data>
<data name="ProductID" xml:space="preserve">
<value>1.0</value>
@ -480,7 +480,7 @@
<value>Microsoft Visual F#</value>
</data>
<data name="9001" xml:space="preserve">
<value>Visual F# 4.1</value>
<value>Visual F# 4.3</value>
</data>
<data name="9027" xml:space="preserve">
<value>F# Interactive</value>

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.en.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="new">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="new">Microsoft Visual F# 4.3</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="new">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="new">Microsoft Visual F# 4.3</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="new">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="new">Visual F# 4.3</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

12
vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf
Просмотреть файл

@ -433,13 +433,13 @@
<note />
</trans-unit>
<trans-unit id="ProductDetails">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9002">
<source>Microsoft Visual F# 4.1</source>
<target state="translated">Microsoft Visual F# 4.1</target>
<source>Microsoft Visual F# 4.3</source>
<target state="needs-review-translation">Microsoft Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="ProductID">
@ -453,8 +453,8 @@
<note />
</trans-unit>
<trans-unit id="9001">
<source>Visual F# 4.1</source>
<target state="translated">Visual F# 4.1</target>
<source>Visual F# 4.3</source>
<target state="needs-review-translation">Visual F# 4.1</target>
<note />
</trans-unit>
<trans-unit id="9027">

2
vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
Просмотреть файл

@ -4,7 +4,7 @@
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
<ProjectLanguage>VisualBasic</ProjectLanguage>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>vb</MicroBuildAssemblyFileLanguage>
</PropertyGroup>
<PropertyGroup>

2
vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx
Просмотреть файл

@ -661,6 +661,6 @@
<value>ApplicationPropPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Microsoft.VisualStudio.Editors.PropertyPages.ApplicationPropPageBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Microsoft.VisualStudio.Editors.PropertyPages.ApplicationPropPageBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

4
vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb
Просмотреть файл

@ -80,8 +80,8 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.0\Runtime\v4.0"
#End If
#If VS_VERSION_DEV15 Then
Dim v20FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.1\Runtime\v2.0"
Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.1\Runtime\v4.0"
Dim v20FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.3\Runtime\v2.0"
Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.3\Runtime\v4.0"
#End If
m_v20FSharpRedistInstalled = Not (IsNothing(Microsoft.Win32.Registry.GetValue(v20FSharpRedistKey, Nothing, Nothing)))

2
vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx
Просмотреть файл

@ -1351,6 +1351,6 @@
<value>BuildPropPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

4
vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/DebugPropPage.resx
Просмотреть файл

@ -523,7 +523,7 @@
<value>StartArguments</value>
</data>
<data name="&gt;&gt;StartArguments.Type" xml:space="preserve">
<value>Microsoft.VisualStudio.Editors.PropertyPages.DebugPropPage+MultilineTextBoxRejectsEnter, FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Microsoft.VisualStudio.Editors.PropertyPages.DebugPropPage+MultilineTextBoxRejectsEnter, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="&gt;&gt;StartArguments.Parent" xml:space="preserve">
<value>overarchingTableLayoutPanel</value>
@ -982,6 +982,6 @@
<value>DebugPropPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

2
vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
Просмотреть файл

@ -4,7 +4,7 @@
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
<ProjectLanguage>CSharp</ProjectLanguage>
<MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyVersion>15.4.3.0</MicroBuildAssemblyVersion>
<MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>
<PropertyGroup>

1
vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml
Просмотреть файл

@ -11,6 +11,7 @@
<Assembly Version="4.3.1.0" Description="F# 3.1 (FSharp.Core, 4.3.1.0)"/>
<Assembly Version="4.4.0.0" Description="F# 4.0 (FSharp.Core, 4.4.0.0)"/>
<Assembly Version="4.4.1.0" Description="F# 4.1 (FSharp.Core, 4.4.1.0)"/>
<Assembly Version="4.4.3.0" Description="F# 4.3 (FSharp.Core, 4.4.3.0)"/>
</TargetFramework>
<TargetFramework Identifier=".NETPortable" Profile="Profile47">
<Assembly Version="2.3.5.0" Description="F# 3.0 (FSharp.Core, 2.3.5.0)"/>

2
vsintegration/tests/unittests/Tests.LanguageService.Script.fs
Просмотреть файл

@ -1343,7 +1343,7 @@ type UsingMSBuild() as this =
"4.4.0.0"
#endif
#if VS_VERSION_DEV15
"4.4.1.0"
"4.4.3.0"
#endif
let binariesFolder = match Internal.Utilities.FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(None) with
| Some(x) -> x

2
vsintegration/tests/unittests/VisualFSharp.Unittests.dll.config
Просмотреть файл

@ -28,7 +28,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="2.0.0.0-4.4.1.0" newVersion="4.4.1.0" />
<bindingRedirect oldVersion="2.0.0.0-4.4.3.0" newVersion="4.4.3.0" />
</dependentAssembly>
<!-- VS Dlls with versions that Roslyn uses -->
<dependentAssembly>

4
vsintegration/update-vsintegration.cmd
Просмотреть файл

@ -158,8 +158,8 @@ set SN64="%WINSDKNETFXTOOLS%x64\sn.exe"
set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe
set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe
set FSHARPVERSION=4.1
set FSHARPVERSION2=41
set FSHARPVERSION=4.3
set FSHARPVERSION2=43
rem The various locations of the SDK and tools