Skip to content

Commit 83748d1

Browse files
author
Omar Tawfik
committed
Using MSBuild 15.0 binaries from nuget
1 parent e4cc128 commit 83748d1

Some content is hidden

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

45 files changed

+314
-172
lines changed

‎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/FSharp.SDK.wixproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
<DefineConstants>$(DefineConstants);BinariesDir=$(BinariesDir)</DefineConstants>
3030
<DefineConstants>$(DefineConstants);FSharpTreeRoot=$(FSharpTreeRoot)</DefineConstants>
31-
<DefineConstants>$(DefineConstants);FSharpCoreRedistDir=$(FSharpCoreRedistDir)</DefineConstants>
32-
<DefineConstants>$(DefineConstants);FSharpTypeProvidersRedistDir=$(FSharpTypeProvidersRedistDir)</DefineConstants>
31+
<DefineConstants>$(DefineConstants);NugetPackagesDir=$(NugetPackagesDir)</DefineConstants>
3332
</PropertyGroup>
3433

3534
<ItemGroup>

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
<ComponentRef Id="Compiler_Redist_Microsoft.Portable.FSharp.targets" />
1919
<ComponentRef Id="Compiler_Redist_SupportedRuntimes.xml" />
2020
<ComponentRef Id="Compiler_Redist_RegistryKeys_CompilerLocation" />
21+
22+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" />
23+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.dll" />
24+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Engine.dll" />
25+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Framework.dll" />
26+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" />
27+
<ComponentRef Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" />
2128

2229
<ComponentRef Id="Compiler_Redist_OtherResources_Redist.txt" />
2330
<ComponentRef Id="Compiler_Redist_OtherResources_ThirdPartyNotices.txt" />
@@ -54,7 +61,7 @@
5461
</Component>
5562

5663
<Component Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Data.TypeProviders.dll, $(var.LocaleCode)))">
57-
<File Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Source="$(var.FSharpTypeProvidersRedistDir)\content\4.3.0.0\FSharp.Data.TypeProviders.dll" KeyPath="yes">
64+
<File Id="Compiler_Redist_FSharp.Data.TypeProviders.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Type.Providers.Redist.1.0.0\content\4.3.0.0\FSharp.Data.TypeProviders.dll" KeyPath="yes">
5865
<NetFx:NativeImage Id="Compiler_Redist_FSharp.Data.TypeProviders.Native.dll" Priority="0" Dependencies="no" Platform="all" />
5966
</File>
6067
</Component>
@@ -107,11 +114,35 @@
107114
<RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_4.1_Framework_v4.0]" Type="string" />
108115
</RegistryKey>
109116
</Component>
117+
118+
<Component Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Conversion.Core.dll, $(var.LocaleCode)))">
119+
<File Id="Compiler_Redist_Microsoft.Build.Conversion.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Conversion.Core.dll" />
120+
</Component>
121+
122+
<Component Id="Compiler_Redist_Microsoft.Build.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.dll, $(var.LocaleCode)))">
123+
<File Id="Compiler_Redist_Microsoft.Build.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.dll" />
124+
</Component>
125+
126+
<Component Id="Compiler_Redist_Microsoft.Build.Engine.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Engine.dll, $(var.LocaleCode)))">
127+
<File Id="Compiler_Redist_Microsoft.Build.Engine.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Engine.dll" />
128+
</Component>
129+
130+
<Component Id="Compiler_Redist_Microsoft.Build.Framework.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Framework.dll, $(var.LocaleCode)))">
131+
<File Id="Compiler_Redist_Microsoft.Build.Framework.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Framework.dll" />
132+
</Component>
133+
134+
<Component Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Tasks.Core.dll, $(var.LocaleCode)))">
135+
<File Id="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Tasks.Core.dll" />
136+
</Component>
137+
138+
<Component Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_Microsoft.Build.Utilities.Core.dll, $(var.LocaleCode)))">
139+
<File Id="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Msbuild.15.0.1.0.0\lib\net45\Microsoft.Build.Utilities.Core.dll" />
140+
</Component>
110141
</DirectoryRef>
111142

112143
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
113144
<Component Id="Compiler_Redist_OtherResources_Redist.txt" Guid="$(fsharp.guid(Compiler_OtherResources_Redist.txt, $(var.LocaleCode)))">
114-
<File Id="Compiler_Redist_OtherResources_Redist.txt" Source="$(var.FSharpCoreRedistDir)\content\Redist.txt" />
145+
<File Id="Compiler_Redist_OtherResources_Redist.txt" Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\Redist.txt" />
115146
</Component>
116147
</DirectoryRef>
117148

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,80 +75,80 @@
7575

7676
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0_$(var.LocaleId)">
7777
<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)))">
78-
<File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.4.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
79-
<File Id="Runtime_LangPack_4.4.0.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.4.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
78+
<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" />
79+
<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" />
8080
</Component>
8181
</DirectoryRef>
8282
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0_$(var.LocaleId)">
8383
<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)))">
84-
<File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\3.47.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
85-
<File Id="Runtime_LangPack_3.47.4.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\3.47.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
84+
<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" />
85+
<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" />
8686
</Component>
8787
</DirectoryRef>
8888
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0_$(var.LocaleId)">
8989
<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)))">
90-
<File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.7.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
91-
<File Id="Runtime_LangPack_3.7.4.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.7.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
90+
<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" />
91+
<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" />
9292
</Component>
9393
</DirectoryRef>
9494
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0_$(var.LocaleId)">
9595
<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)))">
96-
<File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.78.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
97-
<File Id="Runtime_LangPack_3.78.4.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.78.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
96+
<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" />
97+
<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" />
9898
</Component>
9999
</DirectoryRef>
100100
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0_$(var.LocaleId)">
101101
<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)))">
102-
<File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.259.4.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
103-
<File Id="Runtime_LangPack_3.259.4.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.259.4.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
102+
<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" />
103+
<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" />
104104
</Component>
105105
</DirectoryRef>
106106

107107
<!-- F# 3.1 -->
108108

109109
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0_$(var.LocaleId)">
110110
<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)))">
111-
<File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
112-
<File Id="Runtime_LangPack_4.3.1.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
111+
<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" />
112+
<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" />
113113
</Component>
114114
</DirectoryRef>
115115
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1_$(var.LocaleId)">
116116
<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)))">
117-
<File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\2.3.5.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
118-
<File Id="Runtime_LangPack_2.3.5.1_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\2.3.5.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
117+
<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" />
118+
<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" />
119119
</Component>
120120
</DirectoryRef>
121121
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0_$(var.LocaleId)">
122122
<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)))">
123-
<File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.3.1.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
124-
<File Id="Runtime_LangPack_3.3.1.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.3.1.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
123+
<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" />
124+
<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" />
125125
</Component>
126126
</DirectoryRef>
127127
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1_$(var.LocaleId)">
128128
<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)))">
129-
<File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.78.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
130-
<File Id="Runtime_LangPack_3.78.3.1_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.78.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
129+
<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" />
130+
<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" />
131131
</Component>
132132
</DirectoryRef>
133133
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1_$(var.LocaleId)">
134134
<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)))">
135-
<File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.259.3.1\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
136-
<File Id="Runtime_LangPack_3.259.3.1_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETCore\3.259.3.1\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
135+
<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" />
136+
<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" />
137137
</Component>
138138
</DirectoryRef>
139139

140140
<!-- F# 3.0 -->
141141

142142
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0_$(var.LocaleId)">
143143
<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)))">
144-
<File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.3.0.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
145-
<File Id="Runtime_LangPack_4.3.0.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETFramework\v4.0\4.3.0.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
144+
<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" />
145+
<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" />
146146
</Component>
147147
</DirectoryRef>
148148
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0_$(var.LocaleId)">
149149
<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)))">
150-
<File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.resources.dll" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\2.3.5.0\$(var.LocaleCode)\FSharp.Core.resources.dll" KeyPath="yes" />
151-
<File Id="Runtime_LangPack_2.3.5.0_FSharp.Core.xml" Source="$(var.FSharpCoreRedistDir)\content\.NETPortable\2.3.5.0\Intellisense\$(var.LocaleId)\FSharp.Core.xml" />
150+
<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" />
151+
<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" />
152152
</Component>
153153
</DirectoryRef>
154154

0 commit comments

Comments
 (0)