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

Commit04f3a36

Browse files
authored
Merge pull requestdotnet#5601 from Microsoft/merges/dev15.8-to-dev15.9
Merge dev15.8 to dev15.9
2 parentsdbc718c +78654a1 commit04f3a36

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,30 +4,38 @@ 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.Conversion.Core.dll"
2229
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.dll"
2330
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Engine.dll"
2431
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Framework.dll"
2532
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Tasks.Core.dll"
2633
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Utilities.Core.dll"
27-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
28-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
29-
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets"
3034
file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets"
3135
file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll"
3236
file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll"
3337
file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll"
38+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
39+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
40+
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Overrides.NetSdk.targets"
41+
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
@@ -36,62 +36,92 @@
3636
<Name>FSharp.Build</Name>
3737
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
3838
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
39+
<Ngen>true</Ngen>
40+
<NgenArchitecture>All</NgenArchitecture>
41+
<NgenPriority>2</NgenPriority>
3942
<Private>True</Private>
4043
</ProjectReference>
4144
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj">
4245
<Project>{649FA588-F02E-457C-9FCF-87E46407481E}</Project>
4346
<Name>FSharp.Compiler.Interactive.Settings</Name>
4447
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
4548
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
49+
<Ngen>true</Ngen>
50+
<NgenArchitecture>All</NgenArchitecture>
51+
<NgenPriority>2</NgenPriority>
4652
<Private>True</Private>
4753
</ProjectReference>
4854
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj">
4955
<Project>{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}</Project>
5056
<Name>FSharp.Compiler.Server.Shared</Name>
5157
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
5258
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
59+
<Ngen>true</Ngen>
60+
<NgenArchitecture>All</NgenArchitecture>
61+
<NgenPriority>2</NgenPriority>
5362
<Private>True</Private>
5463
</ProjectReference>
5564
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
5665
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
5766
<Name>FSharp.Compiler.Private</Name>
5867
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
5968
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
69+
<Ngen>true</Ngen>
70+
<NgenArchitecture>All</NgenArchitecture>
71+
<NgenPriority>2</NgenPriority>
6072
<Private>True</Private>
6173
</ProjectReference>
6274
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
6375
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
6476
<Name>FSharp.Core</Name>
6577
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
6678
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
79+
<Ngen>true</Ngen>
80+
<NgenArchitecture>All</NgenArchitecture>
81+
<NgenPriority>2</NgenPriority>
6782
<Private>True</Private>
6883
</ProjectReference>
6984
<ProjectReferenceInclude="..\..\..\src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj">
7085
<Project>{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}</Project>
7186
<Name>FsiAnyCPU</Name>
7287
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
7388
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
89+
<Ngen>true</Ngen>
90+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsiAnyCpu.exe</NgenApplication>
91+
<NgenArchitecture>X64</NgenArchitecture>
92+
<NgenPriority>2</NgenPriority>
7493
<Private>True</Private>
7594
</ProjectReference>
7695
<ProjectReferenceInclude="..\..\..\src\fsharp\fsi\Fsi.fsproj">
7796
<Project>{D0E98C0D-490B-4C61-9329-0862F6E87645}</Project>
7897
<Name>Fsi</Name>
7998
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
8099
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
100+
<Ngen>true</Ngen>
101+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsi.exe</NgenApplication>
102+
<NgenArchitecture>X86</NgenArchitecture>
103+
<NgenPriority>2</NgenPriority>
81104
<Private>True</Private>
82105
</ProjectReference>
83106
<ProjectReferenceInclude="..\..\..\src\fsharp\Fsc\Fsc.fsproj">
84107
<Project>{C94C257C-3C0A-4858-B5D8-D746498D1F08}</Project>
85108
<Name>fsc</Name>
86109
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
87110
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
111+
<Ngen>true</Ngen>
112+
<NgenApplication>[installDir]\Common7\IDE\CommonExtensions\Microsoft\FSharp\fsc.exe</NgenApplication>
113+
<NgenArchitecture>All</NgenArchitecture>
114+
<NgenPriority>2</NgenPriority>
88115
<Private>True</Private>
89116
</ProjectReference>
90117
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Editor\FSharp.Editor.fsproj">
91118
<Project>{65e0e82a-eace-4787-8994-888674c2fe87}</Project>
92119
<Name>FSharp.Editor</Name>
93120
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
94121
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
122+
<Ngen>true</Ngen>
123+
<NgenArchitecture>All</NgenArchitecture>
124+
<NgenPriority>2</NgenPriority>
95125
<Private>True</Private>
96126
</ProjectReference>
97127
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj">
@@ -106,43 +136,62 @@
106136
<Name>FSharp.LanguageService.Base</Name>
107137
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
108138
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
139+
<Ngen>true</Ngen>
140+
<NgenArchitecture>All</NgenArchitecture>
141+
<NgenPriority>2</NgenPriority>
109142
<Private>True</Private>
110143
</ProjectReference>
111144
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.LanguageService\FSharp.LanguageService.fsproj">
112145
<Project>{EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F}</Project>
113146
<Name>FSharp.LanguageService</Name>
114147
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
115148
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
149+
<Ngen>true</Ngen>
150+
<NgenArchitecture>All</NgenArchitecture>
151+
<NgenPriority>2</NgenPriority>
116152
<Private>True</Private>
117153
</ProjectReference>
118154
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj">
119155
<Project>{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}</Project>
120156
<Name>ProjectSystem.Base</Name>
121157
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
122158
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
159+
<Ngen>true</Ngen>
160+
<NgenArchitecture>All</NgenArchitecture>
161+
<NgenPriority>2</NgenPriority>
123162
<Private>True</Private>
124163
</ProjectReference>
125164
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj">
126165
<Project>{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}</Project>
127166
<Name>ProjectSystem</Name>
128167
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
129168
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
169+
<Ngen>true</Ngen>
170+
<NgenArchitecture>All</NgenArchitecture>
171+
<NgenPriority>2</NgenPriority>
130172
<Private>True</Private>
131173
</ProjectReference>
132174
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.ProjectSystem.PropertyPages\FSharp.PropertiesPages.vbproj">
133175
<Project>{FCFB214C-462E-42B3-91CA-FC557EFEE74F}</Project>
134176
<Name>FSharp.PropertiesPages</Name>
135177
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
136178
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
179+
<Ngen>true</Ngen>
180+
<NgenArchitecture>All</NgenArchitecture>
181+
<NgenPriority>2</NgenPriority>
137182
<Private>True</Private>
138183
</ProjectReference>
139184
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.VS.FSI\FSharp.VS.FSI.fsproj">
140185
<Project>{991DCF75-C2EB-42B6-9A0D-AA1D2409D519}</Project>
141186
<Name>FSharp.VS.FSI</Name>
142187
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bPkgDefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
143188
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
189+
<Ngen>true</Ngen>
190+
<NgenArchitecture>All</NgenArchitecture>
191+
<NgenPriority>2</NgenPriority>
144192
<Private>True</Private>
145193
</ProjectReference>
194+
146195
<ProjectReferenceInclude="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\AppConfig\AppConfig.csproj">
147196
<Project>{6ba13aa4-c25f-480f-856b-8e8000299a72}</Project>
148197
<Name>AppConfig</Name>

0 commit comments

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