Skip to content

Commit 3951da6

Browse files
KevinRansomKevinRansom
authored
Merge pull request #1490 from Microsoft/compilerdeployment
Deploy correct dependencies for the compiler
2 parents 848c934 + 9b215b0 commit 3951da6

File tree

3 files changed

+119
-93
lines changed

3 files changed

+119
-93
lines changed

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

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

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

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

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

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" />
2626
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" />
2727

28+
<ComponentRef Id="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll" />
29+
<ComponentRef Id="Compiler_Redist_Microsoft.DiaSymReader.dll" />
30+
<ComponentRef Id="Compiler_Redist_System.Reflection.Metadata.dll" />
31+
<ComponentRef Id="Compiler_Redist_System.Collections.Immutable.dll" />
32+
2833
<ComponentRef Id="Compiler_Redist_OtherResources_Redist.txt" />
2934
<ComponentRef Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" />
3035
<ComponentRef Id="Compiler_Redist_OtherResources_FSharp_eula.$(var.LocaleCode).rtf" />
@@ -95,6 +100,7 @@
95100
<Component Id="Compiler_Redist_Microsoft.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.FSharp.targets, $(var.LocaleCode)))">
96101
<File Id="Compiler_Redist_Microsoft.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.FSharp.targets" />
97102
</Component>
103+
98104
<Component Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Portable.FSharp.targets, $(var.LocaleCode)))">
99105
<File Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\net40\bin\Microsoft.Portable.FSharp.targets" />
100106
</Component>
@@ -139,6 +145,22 @@
139145
<Component Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Utilities.Core.dll, $(var.LocaleCode)))">
140146
<File Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll" />
141147
</Component>
148+
149+
<Component Id="Compiler_Redist_System.Collections.Immutable.dll" Guid="$(fsharp.guid(Compiler_Redist_System.Collections.Immutable.dll, $(var.LocaleCode)))">
150+
<File Id="Compiler_Redist_System.Collections.Immutable.dll" Source="$(var.NugetPackagesDir)\System.Collections.Immutable.1.2.0\lib\netstandard1.0\System.Collections.Immutable.dll" />
151+
</Component>
152+
153+
<Component Id="Compiler_Redist_System.Reflection.Metadata.dll" Guid="$(fsharp.guid(Compiler_Redist_System.Reflection.Metadata.dll, $(var.LocaleCode)))">
154+
<File Id="Compiler_Redist_System.Reflection.Metadata.dll" Source="$(var.NugetPackagesDir)\System.Reflection.Metadata\1.4.1-beta-24227-04\lib\netstandard1.1\System.Reflection.Metadata.dll" />
155+
</Component>
156+
157+
<Component Id="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">
158+
<File Id="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll" Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll" />
159+
</Component>
160+
161+
<Component Id="Compiler_Redist_Microsoft.DiaSymReader.dll.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.dll, $(var.LocaleCode)))">
162+
<File Id="Compiler_Redist_Microsoft.DiaSymReader.dll" Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.0.8\lib\netstandard1.1Microsoft.DiaSymReader.dll" />
163+
</Component>
142164
</DirectoryRef>
143165

144166
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">

‎setup/Swix/Microsoft.FSharp.Dependencies/Files.swr‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,23 @@ folder "InstallDir:Common7\IDE\PublicAssemblies"
2121
file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
2222
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
2323
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
24-
24+
2525
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
2626
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Conversion.Core.dll"
2727
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll"
2828
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Engine.dll"
2929
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll"
3030
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll"
3131
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll"
32-
32+
file source="$(PackagesFolder)\System.Collections.Immutable.1.2.0\lib\netstandard1.0\System.Collections.Immutable.dll"
33+
file source="$(PackagesFolder)\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\netstandard1.1\System.Reflection.Metadata.dll"
34+
file source="$(PackagesFolder)\Microsoft.DiaSymReader.1.0.8\lib\netstandard1.1\Microsoft.DiaSymReader.dll"
35+
file source="$(PackagesFolder)\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll"
36+
3337
folder "InstallDir:Common7\IDE\NewScriptItems"
3438
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
3539
file source="$(BinariesFolder)\setup\resources\NewFileDialog\Script\Script.fsx"
36-
40+
3741
folder "InstallDir:Common7\IDE\NewFileItems"
3842
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\NewFSharpFileItems.vsdir"
3943
file source="$(BinariesFolder)\setup\resources\NewFileDialog\General\File.fs"

0 commit comments

Comments
 (0)