File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed
vsintegration/src/FSharp.Editor Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 97
97
<SystemThreadingTasksDataflow >$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow >
98
98
<MicrosoftDiaSymReaderPortablePdbVersion >1.6.0</MicrosoftDiaSymReaderPortablePdbVersion >
99
99
<!-- Versions for package groups -->
100
- <RoslynVersion >4.15 .0-1.25171.14 </RoslynVersion >
100
+ <RoslynVersion >5.0 .0-1.25276.102 </RoslynVersion >
101
101
<VisualStudioEditorPackagesVersion >17.14.188</VisualStudioEditorPackagesVersion >
102
102
<MicrosoftVisualStudioShellPackagesVersion >17.14.40268</MicrosoftVisualStudioShellPackagesVersion >
103
103
<VisualStudioProjectSystemPackagesVersion >17.14.79</VisualStudioProjectSystemPackagesVersion >
104
104
<VisualStudioShellProjectsPackages >17.14.40254</VisualStudioShellProjectsPackages >
105
105
<MicrosoftVisualStudioThreadingPackagesVersion >17.14.15</MicrosoftVisualStudioThreadingPackagesVersion >
106
106
<MicrosoftBuildVersion >17.15.0-preview-25278-01</MicrosoftBuildVersion >
107
107
<!-- Roslyn packages -->
108
+ <MicrosoftCodeAnalysisFeaturesVersion >$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion >
108
109
<MicrosoftCodeAnalysisEditorFeaturesVersion >$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion >
109
110
<MicrosoftCodeAnalysisEditorFeaturesTextVersion >$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion >
110
- <MicrosoftCodeAnalysisEditorFeaturesWpfVersion >$(RoslynVersion) </MicrosoftCodeAnalysisEditorFeaturesWpfVersion >
111
+ <MicrosoftCodeAnalysisEditorFeaturesWpfVersion >5.0.0-1.25275.2 </MicrosoftCodeAnalysisEditorFeaturesWpfVersion >
111
112
<MicrosoftCodeAnalysisExternalAccessFSharpVersion >$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion >
112
113
<MicrosoftCodeAnalysisVersion >$(RoslynVersion)</MicrosoftCodeAnalysisVersion >
113
114
<MicrosoftCodeAnalysisCSharpVersion >$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion >
Original file line number Diff line number Diff line change 6
6
<OutputType >Library</OutputType >
7
7
<NoWarn >$(NoWarn);75</NoWarn >
8
8
<NoWarn >$(NoWarn);44</NoWarn ><!-- warning about Roslyn API only for F# and TypeScript -->
9
+ <NoWarn >$(NoWarn);NU1608</NoWarn > <!-- warning about package downgrade -->
9
10
<DisableImplicitFSharpCoreReference >true</DisableImplicitFSharpCoreReference >
10
11
<OtherFlags >$(OtherFlags) --subsystemversion:6.00</OtherFlags >
11
12
<EnableDefaultEmbeddedResourceItems >false</EnableDefaultEmbeddedResourceItems >
172
173
</ItemGroup >
173
174
174
175
<ItemGroup >
176
+ <PackageReference Include =" Microsoft.CodeAnalysis.Features" Version =" $(MicrosoftCodeAnalysisFeaturesVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
175
177
<PackageReference Include =" Microsoft.VisualStudio.Interop" Version =" $(MicrosoftVisualStudioInteropVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
176
178
<PackageReference Include =" Microsoft.Internal.VisualStudio.Interop" Version =" $(MicrosoftInternalVisualStudioInteropVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
177
179
<PackageReference Include =" Microsoft.CodeAnalysis.EditorFeatures.Text" Version =" $(MicrosoftCodeAnalysisEditorFeaturesTextVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
178
- <PackageReference Include =" Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version =" $(MicrosoftCodeAnalysisEditorFeaturesWpfVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
180
+ <PackageReference Include =" Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version =" $(MicrosoftCodeAnalysisEditorFeaturesWpfVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" NoWarn = " NU1608 " />
179
181
<PackageReference Include =" Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version =" $(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
180
182
<PackageReference Include =" Microsoft.Composition" Version =" $(MicrosoftCompositionVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
181
183
<PackageReference Include =" Microsoft.VisualStudio.ComponentModelHost" Version =" $(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets =" all" ExcludeAssets =" runtime;contentFiles;build;analyzers;native" />
Original file line number Diff line number Diff line change @@ -355,12 +355,12 @@ type internal FSharpPackage() as this =
355
355
flushTelemetry ()
356
356
#endif
357
357
358
- override this.RegisterInitializationWork ( packageRegistrationTasks : PackageRegistrationTasks ) : unit =
359
- base .RegisterInitializationWork ( packageRegistrationTasks: PackageRegistrationTasks )
358
+ override this.RegisterInitializeAsyncWork ( packageRegistrationTasks : PackageLoadTasks ) : unit =
359
+ base .RegisterInitializeAsyncWork ( packageRegistrationTasks)
360
360
361
361
packageRegistrationTasks.AddTask(
362
362
true ,
363
- ( fun progress _tasks cancellationToken ->
363
+ ( fun _tasks cancellationToken ->
364
364
foregroundCancellableTask {
365
365
let! commandService = this.GetServiceAsync( typeof< IMenuCommandService>)
366
366
let commandService = commandService :?> OleMenuCommandService
You can’t perform that action at this time.
0 commit comments