Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8edf7e0

Browse files
authored
Ensure that fsharp sdk msi uses correct component guids. (dotnet#2243)
* Fix fscorelocation on coreclr when no fsharp.core dll was provided* Ensure that the installer has the correct component guids for SDK items shipped previously
1 parent48e078e commit8edf7e0

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,39 +78,39 @@
7878
<!-- F# 4.0-->
7979

8080
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.0.0">
81-
<ComponentId="Runtime_Redist_4.4.0.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_4.4.0.0_FSharp.Core, $(var.LocaleCode)))">
81+
<ComponentId="Runtime_Redist_4.4.0.0_FSharp.Core"Transitive="yes"Guid="DA07D2FE-8B67-566A-A48C-88AB3188BBCA">
8282
<FileId="Runtime_Redist_4.4.0.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.dll"KeyPath="yes" />
8383
<FileId="Runtime_Redist_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\FSharp.Core.xml" />
8484
<FileId="Runtime_Redist_4.4.0.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.sigdata" />
8585
<FileId="Runtime_Redist_4.4.0.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.optdata" />
8686
</Component>
8787
</DirectoryRef>
8888
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.4.0">
89-
<ComponentId="Runtime_Redist_3.47.4.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.47.4.0_FSharp.Core, $(var.LocaleCode)))">
89+
<ComponentId="Runtime_Redist_3.47.4.0_FSharp.Core"Transitive="yes"Guid="37873912-7DAC-5992-9FEA-92CF91857AA8">
9090
<FileId="Runtime_Redist_3.47.4.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.dll"KeyPath="yes" />
9191
<FileId="Runtime_Redist_3.47.4.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.xml" />
9292
<FileId="Runtime_Redist_3.47.4.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.sigdata" />
9393
<FileId="Runtime_Redist_3.47.4.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.optdata" />
9494
</Component>
9595
</DirectoryRef>
9696
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.7.4.0">
97-
<ComponentId="Runtime_Redist_3.7.4.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.7.4.0_FSharp.Core, $(var.LocaleCode)))">
97+
<ComponentId="Runtime_Redist_3.7.4.0_FSharp.Core"Transitive="yes"Guid="1574403D-39A7-5946-A982-AF82AAC8D7EB">
9898
<FileId="Runtime_Redist_3.7.4.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.dll"KeyPath="yes" />
9999
<FileId="Runtime_Redist_3.7.4.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.xml" />
100100
<FileId="Runtime_Redist_3.7.4.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.sigdata" />
101101
<FileId="Runtime_Redist_3.7.4.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.optdata" />
102102
</Component>
103103
</DirectoryRef>
104104
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.4.0">
105-
<ComponentId="Runtime_Redist_3.78.4.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.78.4.0_FSharp.Core, $(var.LocaleCode)))">
105+
<ComponentId="Runtime_Redist_3.78.4.0_FSharp.Core"Transitive="yes"Guid="38863225-7332-5676-B315-D075D92EE7B3">
106106
<FileId="Runtime_Redist_3.78.4.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.dll"KeyPath="yes" />
107107
<FileId="Runtime_Redist_3.78.4.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.xml" />
108108
<FileId="Runtime_Redist_3.78.4.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.sigdata" />
109109
<FileId="Runtime_Redist_3.78.4.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.optdata" />
110110
</Component>
111111
</DirectoryRef>
112112
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.4.0">
113-
<ComponentId="Runtime_Redist_3.259.4.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.259.4.0_FSharp.Core, $(var.LocaleCode)))">
113+
<ComponentId="Runtime_Redist_3.259.4.0_FSharp.Core"Transitive="yes"Guid="DCD97222-B0CF-5CA6-AFED-E12CA45E3A50">
114114
<FileId="Runtime_Redist_3.259.4.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.dll"KeyPath="yes" />
115115
<FileId="Runtime_Redist_3.259.4.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.xml" />
116116
<FileId="Runtime_Redist_3.259.4.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.sigdata" />
@@ -121,39 +121,39 @@
121121
<!-- F# 3.1-->
122122

123123
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.1.0">
124-
<ComponentId="Runtime_Redist_4.3.1.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_4.3.1.0_FSharp.Core, $(var.LocaleCode)))">
124+
<ComponentId="Runtime_Redist_4.3.1.0_FSharp.Core"Transitive="yes"Guid="4A1993AA-FA5A-45E5-A08C-7A1887DA52B9">
125125
<FileId="Runtime_Redist_4.3.1.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.dll"KeyPath="yes" />
126126
<FileId="Runtime_Redist_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\FSharp.Core.xml" />
127127
<FileId="Runtime_Redist_4.3.1.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.sigdata" />
128128
<FileId="Runtime_Redist_4.3.1.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.optdata" />
129129
</Component>
130130
</DirectoryRef>
131131
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.1">
132-
<ComponentId="Runtime_Redist_2.3.5.1_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_2.3.5.1_FSharp.Core, $(var.LocaleCode)))">
132+
<ComponentId="Runtime_Redist_2.3.5.1_FSharp.Core"Transitive="yes"Guid="32033C8F-1065-453D-B97F-382FA8E47711">
133133
<FileId="Runtime_Redist_2.3.5.1_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.dll"KeyPath="yes" />
134134
<FileId="Runtime_Redist_2.3.5.1_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.xml" />
135135
<FileId="Runtime_Redist_2.3.5.1_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.sigdata" />
136136
<FileId="Runtime_Redist_2.3.5.1_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.optdata" />
137137
</Component>
138138
</DirectoryRef>
139139
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.3.1.0">
140-
<ComponentId="Runtime_Redist_3.3.1.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.3.1.0_FSharp.Core, $(var.LocaleCode)))">
140+
<ComponentId="Runtime_Redist_3.3.1.0_FSharp.Core"Transitive="yes"Guid="66247184-2DBA-45FC-8F6C-620DB406D01E">
141141
<FileId="Runtime_Redist_3.3.1.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.dll"KeyPath="yes" />
142142
<FileId="Runtime_Redist_3.3.1.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.xml" />
143143
<FileId="Runtime_Redist_3.3.1.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.sigdata" />
144144
<FileId="Runtime_Redist_3.3.1.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.optdata" />
145145
</Component>
146146
</DirectoryRef>
147147
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.78.3.1">
148-
<ComponentId="Runtime_Redist_3.78.3.1_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.78.3.1_FSharp.Core, $(var.LocaleCode)))">
148+
<ComponentId="Runtime_Redist_3.78.3.1_FSharp.Core"Transitive="yes"Guid="4E980E06-B1D8-4CE1-AA06-8BECA0CE042F">
149149
<FileId="Runtime_Redist_3.78.3.1_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.dll"KeyPath="yes" />
150150
<FileId="Runtime_Redist_3.78.3.1_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.xml" />
151151
<FileId="Runtime_Redist_3.78.3.1_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.sigdata" />
152152
<FileId="Runtime_Redist_3.78.3.1_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.optdata" />
153153
</Component>
154154
</DirectoryRef>
155155
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETCore_3.259.3.1">
156-
<ComponentId="Runtime_Redist_3.259.3.1_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_3.259.3.1_FSharp.Core, $(var.LocaleCode)))">
156+
<ComponentId="Runtime_Redist_3.259.3.1_FSharp.Core"Transitive="yes"Guid="F0C04DA6-86D2-49DF-9348-E8A69B95EA70">
157157
<FileId="Runtime_Redist_3.259.3.1_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.dll"KeyPath="yes" />
158158
<FileId="Runtime_Redist_3.259.3.1_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.xml" />
159159
<FileId="Runtime_Redist_3.259.3.1_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.sigdata" />
@@ -164,15 +164,15 @@
164164
<!-- F# 3.0-->
165165

166166
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.3.0.0">
167-
<ComponentId="Runtime_Redist_4.3.0.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_4.3.0.0_FSharp.Core, $(var.LocaleCode)))">
167+
<ComponentId="Runtime_Redist_4.3.0.0_FSharp.Core"Transitive="yes"Guid="A0608A0C-5B4A-439E-B058-5930433BF254">
168168
<FileId="Runtime_Redist_4.3.0.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll"KeyPath="yes" />
169169
<FileId="Runtime_Redist_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\FSharp.Core.xml" />
170170
<FileId="Runtime_Redist_4.3.0.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.sigdata" />
171171
<FileId="Runtime_Redist_4.3.0.0_FSharp.Core.optdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.optdata" />
172172
</Component>
173173
</DirectoryRef>
174174
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_2.3.5.0">
175-
<ComponentId="Runtime_Redist_2.3.5.0_FSharp.Core"Transitive="yes"Guid="$(fsharp.guid(Runtime_Redist_2.3.5.0_FSharp.Core, $(var.LocaleCode)))">
175+
<ComponentId="Runtime_Redist_2.3.5.0_FSharp.Core"Transitive="yes"Guid="AFE254E7-FC12-4F7D-A804-9DF009BFBD8E">
176176
<FileId="Runtime_Redist_2.3.5.0_FSharp.Core.dll"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.dll"KeyPath="yes" />
177177
<FileId="Runtime_Redist_2.3.5.0_FSharp.Core.xml"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.xml" />
178178
<FileId="Runtime_Redist_2.3.5.0_FSharp.Core.sigdata"Source="$(var.NugetPackagesDir)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.sigdata" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp