Skip to content

Commit 13fbacd

Browse files
T-GroT-Gro
authored
Update System+Roslyn+VS versions (#18616)
1 parent ceb0350 commit 13fbacd

File tree

7 files changed

+87
-79
lines changed

7 files changed

+87
-79
lines changed

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Build" Version="17.13.26">
4+
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25276-10">
55
<Uri>https://github.com/dotnet/msbuild</Uri>
6-
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
6+
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Build.Framework" Version="17.13.26">
8+
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25276-10">
99
<Uri>https://github.com/dotnet/msbuild</Uri>
10-
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
10+
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.26">
12+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25276-10">
1313
<Uri>https://github.com/dotnet/msbuild</Uri>
14-
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
14+
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.26">
16+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25276-10">
1717
<Uri>https://github.com/dotnet/msbuild</Uri>
18-
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
18+
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
20+
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
22+
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
2323
</Dependency>
24-
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
24+
<Dependency Name="System.Collections.Immutable" Version="9.0.0">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
26+
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
2727
</Dependency>
28-
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
28+
<Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.0">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
30+
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
31+
</Dependency>
32+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0">
33+
<Uri>https://github.com/dotnet/runtime</Uri>
34+
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
3135
</Dependency>
3236
</ProductDependencies>
3337
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@
8080
<!-- Dependencies from maintenance-packages, everything else -->
8181
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
8282
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
83-
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
83+
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
8484
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
8585
</PropertyGroup>
8686
<PropertyGroup>
8787
<!-- System.* packages -->
8888
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
8989
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
90-
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
90+
<SystemPackageVersionVersion>9.0.0</SystemPackageVersionVersion>
9191
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
9292
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
9393
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
@@ -97,12 +97,13 @@
9797
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
9898
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9999
<!-- Versions for package groups -->
100-
<RoslynVersion>4.11.0-2.24264.2</RoslynVersion>
101-
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
102-
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
103-
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
104-
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
105-
<MicrosoftBuildVersion>17.13.26</MicrosoftBuildVersion>
100+
<RoslynVersion>4.15.0-1.25171.14</RoslynVersion>
101+
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
102+
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
103+
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
104+
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
105+
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
106+
<MicrosoftBuildVersion>17.15.0-preview-25276-10</MicrosoftBuildVersion>
106107
<!-- Roslyn packages -->
107108
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
108109
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -117,7 +118,7 @@
117118
<!-- Visual Studio Shell packages -->
118119
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
119120
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
120-
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
121+
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
121122
<MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
122123
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
123124
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
@@ -127,20 +128,20 @@
127128
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
128129
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
129130
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
130-
<MicrosoftVisualStudioManagedInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioManagedInterfacesVersion>
131-
<MicrosoftVisualStudioProjectAggregatorVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioProjectAggregatorVersion>
131+
<MicrosoftVisualStudioManagedInterfacesVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioManagedInterfacesVersion>
132+
<MicrosoftVisualStudioProjectAggregatorVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioProjectAggregatorVersion>
132133
<MicrosoftVisualStudioGraphModelVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioGraphModelVersion>
133-
<MicrosoftVisualStudioImagingVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingVersion>
134+
<MicrosoftVisualStudioImagingVersion>17.14.40270</MicrosoftVisualStudioImagingVersion>
134135
<MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
135-
<MicrosoftVisualStudioUtilitiesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
136+
<MicrosoftVisualStudioUtilitiesVersion>17.14.40270</MicrosoftVisualStudioUtilitiesVersion>
136137
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
137138
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
138139
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
139140
<!-- -->
140141
<!-- Microsoft Build packages -->
141-
<MicrosoftBuildFrameworkVersion>17.13.26</MicrosoftBuildFrameworkVersion>
142-
<MicrosoftBuildTasksCoreVersion>17.13.26</MicrosoftBuildTasksCoreVersion>
143-
<MicrosoftBuildUtilitiesCoreVersion>17.13.26</MicrosoftBuildUtilitiesCoreVersion>
142+
<MicrosoftBuildFrameworkVersion>17.15.0-preview-25276-10</MicrosoftBuildFrameworkVersion>
143+
<MicrosoftBuildTasksCoreVersion>17.15.0-preview-25276-10</MicrosoftBuildTasksCoreVersion>
144+
<MicrosoftBuildUtilitiesCoreVersion>17.15.0-preview-25276-10</MicrosoftBuildUtilitiesCoreVersion>
144145
<!-- -->
145146
<!-- Visual Studio Editor packages -->
146147
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
@@ -153,7 +154,7 @@
153154
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
154155
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
155156
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
156-
<MicrosoftVisualStudioComponentModelHostVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioComponentModelHostVersion>
157+
<MicrosoftVisualStudioComponentModelHostVersion>17.14.106</MicrosoftVisualStudioComponentModelHostVersion>
157158
<NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
158159
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
159160
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
@@ -168,7 +169,7 @@
168169
<!-- -->
169170
<!-- Misc. Visual Studio packages -->
170171
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
171-
<MicrosoftVisualStudioRpcContractsVersion>17.10.21</MicrosoftVisualStudioRpcContractsVersion>
172+
<MicrosoftVisualStudioRpcContractsVersion>17.14.20</MicrosoftVisualStudioRpcContractsVersion>
172173
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
173174
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
174175
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
@@ -195,8 +196,8 @@
195196
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
196197
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
197198
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
198-
<StreamJsonRpcVersion>2.18.48</StreamJsonRpcVersion>
199-
<NerdbankStreamsVersion>2.10.69</NerdbankStreamsVersion>
199+
<StreamJsonRpcVersion>2.22.11</StreamJsonRpcVersion>
200+
<NerdbankStreamsVersion>2.12.87</NerdbankStreamsVersion>
200201
<XUnitVersion>2.9.0</XUnitVersion>
201202
<XUnitRunnerVersion>2.8.2</XUnitRunnerVersion>
202203
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>

‎vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -355,64 +355,65 @@ type internal FSharpPackage() as this =
355355
flushTelemetry ()
356356
#endif
357357

358-
override this.InitializeAsync(cancellationToken: CancellationToken, progress: IProgress<ServiceProgressData>) : Tasks.Task =
359-
// `base.` methods can't be called in the `async` builder, so we have to cache it
360-
let baseInitializeAsync = base.InitializeAsync(cancellationToken, progress)
358+
override this.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) : unit =
359+
base.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks)
361360

362-
foregroundCancellableTask {
363-
do! baseInitializeAsync
361+
packageRegistrationTasks.AddTask(
362+
true,
363+
(fun progress _tasks cancellationToken ->
364+
foregroundCancellableTask {
365+
let! commandService = this.GetServiceAsync(typeof<IMenuCommandService>)
366+
let commandService = commandService :?> OleMenuCommandService
364367

365-
let! commandService = this.GetServiceAsync(typeof<IMenuCommandService>)
366-
let commandService = commandService :?> OleMenuCommandService
368+
// Switch to UI thread
369+
do! this.JoinableTaskFactory.SwitchToMainThreadAsync()
367370

368-
// Switch to UI thread
369-
do! this.JoinableTaskFactory.SwitchToMainThreadAsync()
371+
// FSI-LINKAGE-POINT: sited init
372+
FSharp.Interactive.Hooks.fsiConsoleWindowPackageInitializeSited (this :> Package) commandService
370373

371-
// FSI-LINKAGE-POINT: sited init
372-
FSharp.Interactive.Hooks.fsiConsoleWindowPackageInitializeSited (this :> Package) commandService
374+
// FSI-LINKAGE-POINT: private method GetDialogPage forces fsi options to be loaded
375+
let _fsiPropertyPage =
376+
this.GetDialogPage(typeof<FSharp.Interactive.FsiPropertyPage>)
373377

374-
// FSI-LINKAGE-POINT: private method GetDialogPage forces fsi options to be loaded
375-
let _fsiPropertyPage =
376-
this.GetDialogPage(typeof<FSharp.Interactive.FsiPropertyPage>)
378+
let workspace = this.ComponentModel.GetService<VisualStudioWorkspace>()
377379

378-
let workspace = this.ComponentModel.GetService<VisualStudioWorkspace>()
380+
let _ =
381+
this.ComponentModel.DefaultExportProvider.GetExport<HackCpsCommandLineChanges>()
379382

380-
let _ =
381-
this.ComponentModel.DefaultExportProvider.GetExport<HackCpsCommandLineChanges>()
383+
let optionsManager =
384+
workspace.Services.GetService<IFSharpWorkspaceService>().FSharpProjectOptionsManager
382385

383-
let optionsManager =
384-
workspace.Services.GetService<IFSharpWorkspaceService>().FSharpProjectOptionsManager
385-
386-
let metadataAsSource =
387-
this.ComponentModel.DefaultExportProvider.GetExport<FSharpMetadataAsSourceService>().Value
386+
let metadataAsSource =
387+
this.ComponentModel.DefaultExportProvider.GetExport<FSharpMetadataAsSourceService>().Value
388388

389-
let! solution = this.GetServiceAsync(typeof<SVsSolution>)
390-
let solution = solution :?> IVsSolution
389+
let! solution = this.GetServiceAsync(typeof<SVsSolution>)
390+
let solution = solution :?> IVsSolution
391391

392-
let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource)
392+
let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource)
393393

394-
let! rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>)
395-
let rdt = rdt :?> IVsRunningDocumentTable
394+
let! rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>)
395+
let rdt = rdt :?> IVsRunningDocumentTable
396396

397-
solutionEventsOpt <- Some(solutionEvents)
398-
solution.AdviseSolutionEvents(solutionEvents) |> ignore
397+
solutionEventsOpt <- Some(solutionEvents)
398+
solution.AdviseSolutionEvents(solutionEvents) |> ignore
399399

400-
let projectContextFactory =
401-
this.ComponentModel.GetService<FSharpWorkspaceProjectContextFactory>()
400+
let projectContextFactory =
401+
this.ComponentModel.GetService<FSharpWorkspaceProjectContextFactory>()
402402

403-
let miscFilesWorkspace =
404-
this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()
403+
let miscFilesWorkspace =
404+
this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()
405405

406-
do
407-
SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt)
408-
|> ignore
406+
do
407+
SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt)
408+
|> ignore
409409

410-
do
411-
LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory)
412-
|> ignore
410+
do
411+
LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory)
412+
|> ignore
413413

414-
}
415-
|> CancellableTask.startAsTask cancellationToken
414+
}
415+
|> CancellableTask.startAsTask cancellationToken)
416+
)
416417

417418
override _.RoslynLanguageName = FSharpConstants.FSharpLanguageName
418419
(*override this.CreateWorkspace() = this.ComponentModel.GetService<VisualStudioWorkspaceImpl>() *)

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49+
<PackageReference Include="Nerdbank.Streams" Version="$(NerdbankStreamsVersion)" />
4950
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
5051
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
5152
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

‎vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60+
<PackageReference Include="Nerdbank.Streams" Version="$(NerdbankStreamsVersion)" />
6061
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6162
<PackageReference Include="Microsoft.Composition" Version="$(MicrosoftCompositionVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6263
<PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />

‎vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace)
171171
|> System.Collections.Concurrent.ConcurrentDictionary
172172

173173
let langServices =
174-
TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
174+
new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
175175

176176
override _.Workspace = workspace
177177

@@ -199,7 +199,7 @@ type TestHostServices() =
199199
inherit HostServices()
200200

201201
override this.CreateWorkspaceServices(workspace) =
202-
TestHostWorkspaceServices(this, workspace)
202+
new TestHostWorkspaceServices(this, workspace)
203203

204204
[<AbstractClass; Sealed>]
205205
type RoslynTestHelpers private () =

‎vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace)
160160
|> Seq.distinctBy (fun x -> x.Key)
161161
|> System.Collections.Concurrent.ConcurrentDictionary
162162

163-
let langServices = TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
163+
let langServices = new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
164164

165165
override _.Workspace = workspace
166166

@@ -191,7 +191,7 @@ type TestHostServices() =
191191
inherit HostServices()
192192

193193
override this.CreateWorkspaceServices(workspace) =
194-
TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices
194+
new TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices
195195

196196
[<AbstractClass;Sealed>]
197197
type RoslynTestHelpers private () =

0 commit comments

Comments
 (0)