Skip to content

Commit 7b0e800

Browse files
dsymedsyme
committed
Merge branch 'master' of https://github.com/Microsoft/visualfsharp into fix-1311-2
2 parents 9f11168 + a42481f commit 7b0e800

File tree

376 files changed

+11378
-22629
lines changed

Some content is hidden

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

376 files changed

+11378
-22629
lines changed

‎DEVGUIDE.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ There are various qualifiers:
5050
build.cmd test-fsharpqa -- build, run tests\fsharpqa suite
5151
build.cmd test-vs -- build, run Visual F# IDE Tools unit tests
5252

53+
**Notes**
54+
To build and test Visual F# IDE Tools, you must use [Visual Studio "vNext" (aka "Dev15")](https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx). This is the one after Visual Studio 2015 (aka "Dev 14"). You must also install Visual Studio SDK (also called _Visual Studio Extensibility SDK_ on the Visual Studio installer) before building Visual F# IDE Tools.
55+
Please ensure that the Visual Studio SDK version is matched with your current Visual Studio to ensure successful builds. For example: Visual Studio 2015 Update 1 requires Visual Studio 2015 SDK Update 1. Any installation of Visual Studio 2015 and later provides Visual Studio SDK as part of the installation of Visual Studio 2015 as feature installation.
56+
5357
Combinations are also allowed:
5458

5559
build.cmd debug,compiler,notests -- build the debug compiler and run smoke tests
@@ -147,8 +151,13 @@ For **Release** this corresponds to these steps, which you can run individually
147151

148152
### 4. [Optional] Install the Visual F# IDE Tools
149153

150-
**Note:** This step will install a VSIX extension into Visual Studio 15 that changes the Visual F# IDE Tools
151-
components installed into Visual Studio 15. You can revert this step by disabling or uninstalling the addin.
154+
At time of writing, the Visual F# IDE Tools can only be installed into Visual Studio "Next" (aka "Dev15") releases.
155+
The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
156+
157+
You can install VIsual Studio "Next (aka "Dev15") from https://www.visualstudio.com/en-us/downloads/visual-studio-next-downloads-vs.aspx.
158+
159+
**Note:** This step will install a VSIX extension into Visual Studio "Next" (aka "Dev15") that changes the Visual F# IDE Tools
160+
components installed in that VS installation. You can revert this step by disabling or uninstalling the addin.
152161

153162
For **Debug**:
154163

‎VisualFSharp.sln‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.25302.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -118,13 +118,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextFile", "vsintegration\I
118118
EndProject
119119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLFile", "vsintegration\ItemTemplates\XMLFile\XMLFile.csproj", "{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6}"
120120
EndProject
121-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpVsix", "vsintegration\VisualFSharpVsix\VisualFSharpVsix.csproj", "{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}"
122-
EndProject
123121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A83A9A70-8C33-4253-BF6F-3AADB509F21C}"
124122
ProjectSection(SolutionItems) = preProject
125123
Performance1.psess = Performance1.psess
126124
EndProjectSection
127125
EndProject
126+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vsix", "Vsix", "{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
127+
EndProject
128+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpDesktop", "vsintegration\Vsix\VisualFSharpDesktop\VisualFSharpDesktop.csproj", "{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}"
129+
EndProject
130+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpFull", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj", "{59ADCE46-9740-4079-834D-9A03A3494EBC}"
131+
EndProject
132+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpWeb", "vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj", "{58730C8B-16F5-4956-9291-BB68E17C9142}"
133+
EndProject
128134
Global
129135
GlobalSection(SolutionConfigurationPlatforms) = preSolution
130136
Debug|Any CPU = Debug|Any CPU
@@ -710,6 +716,30 @@ Global
710716
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|Any CPU.Build.0 = Release|Any CPU
711717
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.ActiveCfg = Release|Any CPU
712718
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090}.Release|x86.Build.0 = Release|Any CPU
719+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
720+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
721+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg = Debug|Any CPU
722+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.Build.0 = Debug|Any CPU
723+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
724+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0 = Proto|Any CPU
725+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg = Proto|Any CPU
726+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0 = Proto|Any CPU
727+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
728+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0 = Release|Any CPU
729+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg = Release|Any CPU
730+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.Build.0 = Release|Any CPU
731+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
732+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|Any CPU.Build.0 = Debug|Any CPU
733+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.ActiveCfg = Debug|Any CPU
734+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Debug|x86.Build.0 = Debug|Any CPU
735+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
736+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|Any CPU.Build.0 = Proto|Any CPU
737+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|x86.ActiveCfg = Proto|Any CPU
738+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Proto|x86.Build.0 = Proto|Any CPU
739+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.ActiveCfg = Release|Any CPU
740+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.Build.0 = Release|Any CPU
741+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.ActiveCfg = Release|Any CPU
742+
{58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.Build.0 = Release|Any CPU
713743
EndGlobalSection
714744
GlobalSection(SolutionProperties) = preSolution
715745
HideSolutionNode = FALSE
@@ -766,6 +796,9 @@ Global
766796
{E3FDD4AC-46B6-4B9F-B672-317D1202CC50} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
767797
{D11FC318-8F5D-4C8C-9287-AB40A016D13C} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
768798
{1FB1DD07-06AA-45B4-B5AC-20FF5BEE98B6} = {F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
769-
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
799+
{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
800+
{E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
801+
{59ADCE46-9740-4079-834D-9A03A3494EBC} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
802+
{58730C8B-16F5-4956-9291-BB68E17C9142} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}
770803
EndGlobalSection
771804
EndGlobal

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: Visual Studio 2015
2-
2+
33
environment:
44
matrix:
55
- BUILD_PROFILE: ci_part1

‎build.cmd‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ if /i '%ARG%' == 'ci' (
141141
set CONF_FSHARPQA_SUITE=Smoke
142142
)
143143

144-
REM These divide 'ci' into three chunks which can be done in parallel
144+
145+
REM These divide 'ci' into two chunks which can be done in parallel
145146
if /i '%ARG%' == 'ci_part1' (
146147
set BUILD_PROTO=1
147148
set SKIP_EXPENSIVE_TESTS=1
@@ -338,20 +339,20 @@ pushd .\lkg & %_dotnetexe% publish project.json &popd
338339
@if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure
339340

340341
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
341-
pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
342-
fc fsc.exe corehost.exe >nul
342+
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
343+
fc fsc.exe dotnet.exe >nul
343344
@if ERRORLEVEL 1 (
344345
copy fsc.exe fsc.dll
345-
copy corehost.exe fsc.exe
346+
copy dotnet.exe fsc.exe
346347
)
347348
popd
348349

349350
rem rename fsc and coreconsole to allow fsc.exe to to start compiler
350-
pushd .\lkg\bin\debug\dnxcore50\win7-x64\publish
351-
fc fsi.exe corehost.exe >nul
351+
pushd .\lkg\bin\debug\netstandard1.6\win7-x64\publish
352+
fc fsi.exe dotnet.exe >nul
352353
@if ERRORLEVEL 1 (
353354
copy fsi.exe fsi.dll
354-
copy corehost.exe fsi.exe
355+
copy dotnet.exe fsi.exe
355356
)
356357
popd
357358

‎lkg/project.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
12
{
23
"dependencies": {
3-
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160406",
4+
"Microsoft.FSharp.Compiler.Host.netcore": "1.0.0-alpha-160629",
5+
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
6+
"Microsoft.NETCore.DotNetHostPolicy": "1.0.1",
7+
"Microsoft.NETCore.DotNetHost": "1.0.1"
48
},
59
"runtimes": {
610
"win7-x86": { },
@@ -9,7 +13,7 @@
913
"ubuntu.14.04-x64": { }
1014
},
1115
"frameworks": {
12-
"dnxcore50": {
16+
"netstandard1.6": {
1317
"imports": "portable-net45+win8"
1418
}
1519
}

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
1717
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
1818
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
19+
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.0" />
1920
</packages>

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

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<!-- Common Variables -->
6-
<Fragment>
7-
<?define LangLCID = $(fsharp.localeToId($(var.Lang))) ?>
8-
<?define LangCulture = $(fsharp.localeToCulture($(var.Lang))) ?>
9-
</Fragment>
10-
115
<!-- Common Folders -->
126
<Fragment>
137
<Directory Id="TARGETDIR" Name="SourceDir">
@@ -18,64 +12,64 @@
1812
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework" Name=".NETFramework">
1913
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0" Name="v4.0">
2014
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0" Name="4.4.1.0">
21-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
15+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
2216
</Directory>
2317
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0" Name="4.4.0.0">
24-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
18+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
2519
</Directory>
2620
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0" Name="4.3.1.0">
27-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
21+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
2822
</Directory>
2923
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0" Name="4.3.0.0">
30-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
24+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
3125
</Directory>
3226
</Directory>
3327
</Directory>
3428

3529
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable" Name=".NETPortable">
3630
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0" Name="3.47.41.0">
37-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
31+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
3832
</Directory>
3933
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0" Name="3.47.4.0">
40-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
34+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
4135
</Directory>
4236
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1" Name="2.3.5.1">
43-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LangLCID)" Name="$(var.LangCulture)" />
37+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
4438
</Directory>
4539
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0" Name="2.3.5.0">
46-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
40+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
4741
</Directory>
4842
</Directory>
4943

5044
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore" Name=".NETCore">
5145
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0" Name="3.7.41.0">
52-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
46+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
5347
</Directory>
5448
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0" Name="3.7.4.0">
55-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
49+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
5650
</Directory>
5751
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0" Name="3.3.1.0">
58-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
52+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
5953
</Directory>
6054

6155
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0" Name="3.78.41.0">
62-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
56+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
6357
</Directory>
6458
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0" Name="3.78.4.0">
65-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
59+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
6660
</Directory>
6761
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1" Name="3.78.3.1">
68-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LangLCID)" Name="$(var.LangCulture)" />
62+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
6963
</Directory>
7064

7165
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0" Name="3.259.41.0">
72-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
66+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.41.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
7367
</Directory>
7468
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0" Name="3.259.4.0">
75-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LangLCID)" Name="$(var.LangCulture)" />
69+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
7670
</Directory>
7771
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1" Name="3.259.3.1">
78-
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LangLCID)" Name="$(var.LangCulture)" />
72+
<Directory Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
7973
</Directory>
8074
</Directory>
8175
</Directory>
@@ -86,12 +80,14 @@
8680
<Directory Id="MicrosoftSDKs_FS" Name="F#">
8781
<Directory Id="MicrosoftSDKs_FS_4.1" Name="4.1">
8882
<Directory Id="MicrosoftSDKs_FS_4.1_Framework" Name="Framework">
89-
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0" />
83+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0" Name="v4.0">
84+
<Directory Id="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleRegion)" />
85+
</Directory>
9086
</Directory>
9187
</Directory>
9288

9389
<Directory Id="MicrosoftSDKs_FS_Licenses" Name="Licenses">
94-
<Directory Id="MicrosoftSDKs_FS_Licenses_$(var.LangLCID)" Name="$(var.LangLCID)" />
90+
<Directory Id="MicrosoftSDKs_FS_Licenses_$(var.LocaleId)" Name="$(var.LocaleId)" />
9591
</Directory>
9692
</Directory>
9793
</Directory>

0 commit comments

Comments
 (0)