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

Commitbb689f9

Browse files
authored
Cherry pick: Fix ngen of compiler into master (dotnet#5533)
* Fix ngen of compiler* merge issue
1 parent15463f0 commitbb689f9

File tree

2 files changed

+71
-14
lines changed

2 files changed

+71
-14
lines changed

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

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,36 @@ package name=Microsoft.FSharp.Compiler
44
version=$(FSharpPackageVersion)
55

66
folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
7-
file source="$(BinariesFolder)\net40\bin\fsc.exe" vs.file.ngen=yes
7+
8+
file source=$(BinariesFolder)\net40\bin\fsc.exe vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe"
89
file source="$(BinariesFolder)\net40\bin\fsc.exe.config"
9-
file source="$(BinariesFolder)\net40\bin\FSharp.Build.dll" vs.file.ngen=yes
10-
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes
11-
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Private.dll" vs.file.ngen=yes
12-
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes
13-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes
14-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
15-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
16-
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Type.Providers.Redist.$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll" vs.file.ngen=yes
17-
file source="$(BinariesFolder)\net40\bin\fsi.exe" vs.file.ngen=yes
10+
11+
file source=$(BinariesFolder)\net40\bin\fsi.exe vs.file.ngen=yes vs.file.ngenArchitecture=X86 vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsi.exe"
1812
file source="$(BinariesFolder)\net40\bin\fsi.exe.config"
19-
file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe" vs.file.ngen=yes
13+
14+
file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe" vs.file.ngen=yes vs.file.ngenArchitecture=X64 vs.file.ngenPriority=2 vs.file.ngenApplication="[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsiAnyCpu.exe"
2015
file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe.config"
16+
17+
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
18+
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Private.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
19+
file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
20+
21+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
22+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
23+
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
24+
25+
file source="$(BinariesFolder)\net40\bin\FSharp.Build.dll" vs.file.ngen=yes vs.file.ngenArchitecture=All vs.file.ngenPriority=2
26+
27+
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Type.Providers.Redist.$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll"
2128
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.dll"
2229
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Framework.dll"
2330
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Tasks.Core.dll"
2431
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Utilities.Core.dll"
25-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
26-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
27-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets"
2832
file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets"
2933
file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll"
3034
file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll"
3135
file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll"
36+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
37+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
38+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Overrides.NetSdk.targets"
39+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets"

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,62 +40,92 @@
4040
<Name>FSharp.Build</Name>
4141
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
4242
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
43+
<Ngen>true</Ngen>
44+
<NgenArchitecture>All</NgenArchitecture>
45+
<NgenPriority>2</NgenPriority>
4346
<Private>True</Private>
4447
</ProjectReference>
4548
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
4649
<Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
4750
<Name>FSharp.Compiler.Interactive.Settings</Name>
4851
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
4952
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
53+
<Ngen>true</Ngen>
54+
<NgenArchitecture>All</NgenArchitecture>
55+
<NgenPriority>2</NgenPriority>
5056
<Private>True</Private>
5157
</ProjectReference>
5258
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
5359
<Project>{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}</Project>
5460
<Name>FSharp.Compiler.Server.Shared</Name>
5561
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
5662
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
63+
<Ngen>true</Ngen>
64+
<NgenArchitecture>All</NgenArchitecture>
65+
<NgenPriority>2</NgenPriority>
5766
<Private>True</Private>
5867
</ProjectReference>
5968
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
6069
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
6170
<Name>FSharp.Compiler.Private</Name>
6271
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
6372
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
73+
<Ngen>true</Ngen>
74+
<NgenArchitecture>All</NgenArchitecture>
75+
<NgenPriority>2</NgenPriority>
6476
<Private>True</Private>
6577
</ProjectReference>
6678
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
6779
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
6880
<Name>FSharp.Core</Name>
6981
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
7082
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
83+
<Ngen>true</Ngen>
84+
<NgenArchitecture>All</NgenArchitecture>
85+
<NgenPriority>2</NgenPriority>
7186
<Private>True</Private>
7287
</ProjectReference>
7388
<ProjectReferenceInclude="..\..\..\src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj">
7489
<Project>{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}</Project>
7590
<Name>FsiAnyCPU</Name>
7691
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
7792
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
93+
<Ngen>true</Ngen>
94+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsiAnyCpu.exe</NgenApplication>
95+
<NgenArchitecture>X64</NgenArchitecture>
96+
<NgenPriority>2</NgenPriority>
7897
<Private>True</Private>
7998
</ProjectReference>
8099
<ProjectReferenceInclude="..\..\..\src\fsharp\fsi\Fsi.fsproj">
81100
<Project>{D0E98C0D-490B-4C61-9329-0862F6E87645}</Project>
82101
<Name>Fsi</Name>
83102
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
84103
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
104+
<Ngen>true</Ngen>
105+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsi.exe</NgenApplication>
106+
<NgenArchitecture>X86</NgenArchitecture>
107+
<NgenPriority>2</NgenPriority>
85108
<Private>True</Private>
86109
</ProjectReference>
87110
<ProjectReferenceInclude="..\..\..\src\fsharp\Fsc\Fsc.fsproj">
88111
<Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
89112
<Name>fsc</Name>
90113
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
91114
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
115+
<Ngen>true</Ngen>
116+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe</NgenApplication>
117+
<NgenArchitecture>All</NgenArchitecture>
118+
<NgenPriority>2</NgenPriority>
92119
<Private>True</Private>
93120
</ProjectReference>
94121
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj">
95122
<Project>{65e0e82a-eace-4787-8994-888674c2fe87}</Project>
96123
<Name>FSharp.Editor</Name>
97124
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
98125
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
126+
<Ngen>true</Ngen>
127+
<NgenArchitecture>All</NgenArchitecture>
128+
<NgenPriority>2</NgenPriority>
99129
<Private>True</Private>
100130
</ProjectReference>
101131
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj">
@@ -110,43 +140,62 @@
110140
<Name>FSharp.LanguageService.Base</Name>
111141
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
112142
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
143+
<Ngen>true</Ngen>
144+
<NgenArchitecture>All</NgenArchitecture>
145+
<NgenPriority>2</NgenPriority>
113146
<Private>True</Private>
114147
</ProjectReference>
115148
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj">
116149
<Project>{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}</Project>
117150
<Name>FSharp.LanguageService</Name>
118151
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
119152
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
153+
<Ngen>true</Ngen>
154+
<NgenArchitecture>All</NgenArchitecture>
155+
<NgenPriority>2</NgenPriority>
120156
<Private>True</Private>
121157
</ProjectReference>
122158
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj">
123159
<Project>{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}</Project>
124160
<Name>ProjectSystem.Base</Name>
125161
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
126162
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
163+
<Ngen>true</Ngen>
164+
<NgenArchitecture>All</NgenArchitecture>
165+
<NgenPriority>2</NgenPriority>
127166
<Private>True</Private>
128167
</ProjectReference>
129168
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj">
130169
<Project>{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}</Project>
131170
<Name>ProjectSystem</Name>
132171
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
133172
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
173+
<Ngen>true</Ngen>
174+
<NgenArchitecture>All</NgenArchitecture>
175+
<NgenPriority>2</NgenPriority>
134176
<Private>True</Private>
135177
</ProjectReference>
136178
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj">
137179
<Project>{FCFB214C-462E-42B3-91CA-FC557EFEE74F}</Project>
138180
<Name>FSharp.PropertiesPages</Name>
139181
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
140182
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
183+
<Ngen>true</Ngen>
184+
<NgenArchitecture>All</NgenArchitecture>
185+
<NgenPriority>2</NgenPriority>
141186
<Private>True</Private>
142187
</ProjectReference>
143188
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj">
144189
<Project>{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}</Project>
145190
<Name>FSharp.VS.FSI</Name>
146191
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
147192
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
193+
<Ngen>true</Ngen>
194+
<NgenArchitecture>All</NgenArchitecture>
195+
<NgenPriority>2</NgenPriority>
148196
<Private>True</Private>
149197
</ProjectReference>
198+
150199
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\AppConfig\AppConfig.csproj">
151200
<Project>{6ba13aa4-c25f-480f-856b-8e8000299a72}</Project>
152201
<Name>AppConfig</Name>

0 commit comments

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