Skip to content

Update System versions #18616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 28, 2025
Merged

Update System versions #18616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
be6ba47
Update System versions
T-Gro May 27, 2025
926a0da
update version.details.xml (system packages from 8 to 9)
T-Gro May 27, 2025
dd1b70f
Adding diagsource
T-Gro May 27, 2025
e2c374d
Update Versions.props
T-Gro May 27, 2025
1ecf828
Update Versions.props
T-Gro May 27, 2025
8ab767c
Update Versions.props
T-Gro May 27, 2025
5337b86
Update Versions.props
T-Gro May 27, 2025
c895ba8
Update Version.Details.xml
T-Gro May 27, 2025
eadcd71
Update Versions.props
T-Gro May 27, 2025
b9a2008
roslyn+vs versions
T-Gro May 27, 2025
5da0fa6
nerdbank warnings...
T-Gro May 27, 2025
788576b
4 warnings only?!
T-Gro May 28, 2025
158e0cf
0 nuget warnings, rock halelujah
T-Gro May 28, 2025
031be1c
adjusting to API changes
T-Gro May 28, 2025
2c385ca
one more time ♫ ♪ ♬
T-Gro May 28, 2025
1c4beed
Fantom(as) of the opera ♫ ♪ ♬
T-Gro May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="17.13.26">
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25276-10">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="17.13.26">
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25276-10">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.26">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25276-10">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.26">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25276-10">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
<Sha>15d19b96cf826b99925c8e5fd75575f46c60dd4a</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
<Dependency Name="System.Collections.Immutable" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
<Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
41 changes: 21 additions & 20 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@
<!-- Dependencies from maintenance-packages, everything else -->
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
</PropertyGroup>
<PropertyGroup>
<!-- System.* packages -->
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
<SystemPackageVersionVersion>9.0.0</SystemPackageVersionVersion>
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
Expand All @@ -97,12 +97,13 @@
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
<!-- Versions for package groups -->
<RoslynVersion>4.11.0-2.24264.2</RoslynVersion>
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
<MicrosoftBuildVersion>17.13.26</MicrosoftBuildVersion>
<RoslynVersion>4.15.0-1.25171.14</RoslynVersion>
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
<MicrosoftBuildVersion>17.15.0-preview-25276-10</MicrosoftBuildVersion>
<!-- Roslyn packages -->
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
Expand All @@ -117,7 +118,7 @@
<!-- Visual Studio Shell packages -->
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
<MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
Expand All @@ -127,20 +128,20 @@
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
<MicrosoftVisualStudioManagedInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioManagedInterfacesVersion>
<MicrosoftVisualStudioProjectAggregatorVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioProjectAggregatorVersion>
<MicrosoftVisualStudioManagedInterfacesVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioManagedInterfacesVersion>
<MicrosoftVisualStudioProjectAggregatorVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioProjectAggregatorVersion>
<MicrosoftVisualStudioGraphModelVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioGraphModelVersion>
<MicrosoftVisualStudioImagingVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingVersion>
<MicrosoftVisualStudioImagingVersion>17.14.40270</MicrosoftVisualStudioImagingVersion>
<MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
<MicrosoftVisualStudioUtilitiesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioUtilitiesVersion>17.14.40270</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
<!-- -->
<!-- Microsoft Build packages -->
<MicrosoftBuildFrameworkVersion>17.13.26</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.13.26</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.13.26</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildFrameworkVersion>17.15.0-preview-25276-10</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.15.0-preview-25276-10</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.15.0-preview-25276-10</MicrosoftBuildUtilitiesCoreVersion>
<!-- -->
<!-- Visual Studio Editor packages -->
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
Expand All @@ -153,7 +154,7 @@
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
<MicrosoftVisualStudioComponentModelHostVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioComponentModelHostVersion>
<MicrosoftVisualStudioComponentModelHostVersion>17.14.106</MicrosoftVisualStudioComponentModelHostVersion>
<NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
Expand All @@ -168,7 +169,7 @@
<!-- -->
<!-- Misc. Visual Studio packages -->
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
<MicrosoftVisualStudioRpcContractsVersion>17.10.21</MicrosoftVisualStudioRpcContractsVersion>
<MicrosoftVisualStudioRpcContractsVersion>17.14.20</MicrosoftVisualStudioRpcContractsVersion>
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
Expand All @@ -195,8 +196,8 @@
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
<StreamJsonRpcVersion>2.18.48</StreamJsonRpcVersion>
<NerdbankStreamsVersion>2.10.69</NerdbankStreamsVersion>
<StreamJsonRpcVersion>2.22.11</StreamJsonRpcVersion>
<NerdbankStreamsVersion>2.12.87</NerdbankStreamsVersion>
<XUnitVersion>2.9.0</XUnitVersion>
<XUnitRunnerVersion>2.8.2</XUnitRunnerVersion>
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
Expand Down
83 changes: 42 additions & 41 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,64 +355,65 @@ type internal FSharpPackage() as this =
flushTelemetry ()
#endif

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

foregroundCancellableTask {
do! baseInitializeAsync
packageRegistrationTasks.AddTask(
true,
(fun progress _tasks cancellationToken ->
foregroundCancellableTask {
let! commandService = this.GetServiceAsync(typeof<IMenuCommandService>)
let commandService = commandService :?> OleMenuCommandService

let! commandService = this.GetServiceAsync(typeof<IMenuCommandService>)
let commandService = commandService :?> OleMenuCommandService
// Switch to UI thread
do! this.JoinableTaskFactory.SwitchToMainThreadAsync()

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

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

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

let workspace = this.ComponentModel.GetService<VisualStudioWorkspace>()
let _ =
this.ComponentModel.DefaultExportProvider.GetExport<HackCpsCommandLineChanges>()

let _ =
this.ComponentModel.DefaultExportProvider.GetExport<HackCpsCommandLineChanges>()
let optionsManager =
workspace.Services.GetService<IFSharpWorkspaceService>().FSharpProjectOptionsManager

let optionsManager =
workspace.Services.GetService<IFSharpWorkspaceService>().FSharpProjectOptionsManager

let metadataAsSource =
this.ComponentModel.DefaultExportProvider.GetExport<FSharpMetadataAsSourceService>().Value
let metadataAsSource =
this.ComponentModel.DefaultExportProvider.GetExport<FSharpMetadataAsSourceService>().Value

let! solution = this.GetServiceAsync(typeof<SVsSolution>)
let solution = solution :?> IVsSolution
let! solution = this.GetServiceAsync(typeof<SVsSolution>)
let solution = solution :?> IVsSolution

let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource)
let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource)

let! rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>)
let rdt = rdt :?> IVsRunningDocumentTable
let! rdt = this.GetServiceAsync(typeof<SVsRunningDocumentTable>)
let rdt = rdt :?> IVsRunningDocumentTable

solutionEventsOpt <- Some(solutionEvents)
solution.AdviseSolutionEvents(solutionEvents) |> ignore
solutionEventsOpt <- Some(solutionEvents)
solution.AdviseSolutionEvents(solutionEvents) |> ignore

let projectContextFactory =
this.ComponentModel.GetService<FSharpWorkspaceProjectContextFactory>()
let projectContextFactory =
this.ComponentModel.GetService<FSharpWorkspaceProjectContextFactory>()

let miscFilesWorkspace =
this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()
let miscFilesWorkspace =
this.ComponentModel.GetService<MiscellaneousFilesWorkspace>()

do
SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt)
|> ignore
do
SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt)
|> ignore

do
LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory)
|> ignore
do
LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory)
|> ignore

}
|> CancellableTask.startAsTask cancellationToken
}
|> CancellableTask.startAsTask cancellationToken)
)

override _.RoslynLanguageName = FSharpConstants.FSharpLanguageName
(*override this.CreateWorkspace() = this.ComponentModel.GetService<VisualStudioWorkspaceImpl>() *)
Expand Down
1 change: 1 addition & 0 deletions vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.Streams" Version="$(NerdbankStreamsVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
Expand Down
1 change: 1 addition & 0 deletions vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.Streams" Version="$(NerdbankStreamsVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="Microsoft.Composition" Version="$(MicrosoftCompositionVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
<PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
Expand Down
4 changes: 2 additions & 2 deletions vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace)
|> System.Collections.Concurrent.ConcurrentDictionary

let langServices =
TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)

override _.Workspace = workspace

Expand Down Expand Up @@ -199,7 +199,7 @@ type TestHostServices() =
inherit HostServices()

override this.CreateWorkspaceServices(workspace) =
TestHostWorkspaceServices(this, workspace)
new TestHostWorkspaceServices(this, workspace)

[<AbstractClass; Sealed>]
type RoslynTestHelpers private () =
Expand Down
4 changes: 2 additions & 2 deletions vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace)
|> Seq.distinctBy (fun x -> x.Key)
|> System.Collections.Concurrent.ConcurrentDictionary

let langServices = TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)
let langServices = new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider)

override _.Workspace = workspace

Expand Down Expand Up @@ -191,7 +191,7 @@ type TestHostServices() =
inherit HostServices()

override this.CreateWorkspaceServices(workspace) =
TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices
new TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices

[<AbstractClass;Sealed>]
type RoslynTestHelpers private () =
Expand Down
Loading