Skip to content

Commit 47bdb71

Browse files
authored
Fix roslyn versions to resolve NGEN issues (#18678)
1 parent b4f3728 commit 47bdb71

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

eng/Versions.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,18 @@
9797
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
9898
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9999
<!-- Versions for package groups -->
100-
<RoslynVersion>4.15.0-1.25171.14</RoslynVersion>
100+
<RoslynVersion>5.0.0-1.25276.102</RoslynVersion>
101101
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
102102
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
103103
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
104104
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
105105
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
106106
<MicrosoftBuildVersion>17.15.0-preview-25278-01</MicrosoftBuildVersion>
107107
<!-- Roslyn packages -->
108+
<MicrosoftCodeAnalysisFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion>
108109
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
109110
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
110-
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
111+
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>5.0.0-1.25275.2</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
111112
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
112113
<MicrosoftCodeAnalysisVersion>$(RoslynVersion)</MicrosoftCodeAnalysisVersion>
113114
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<OutputType>Library</OutputType>
77
<NoWarn>$(NoWarn);75</NoWarn>
88
<NoWarn>$(NoWarn);44</NoWarn><!-- warning about Roslyn API only for F# and TypeScript -->
9+
<NoWarn>$(NoWarn);NU1608</NoWarn> <!-- warning about package downgrade -->
910
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1011
<OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
1112
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -172,10 +173,11 @@
172173
</ItemGroup>
173174

174175
<ItemGroup>
176+
<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisFeaturesVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
175177
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
176178
<PackageReference Include="Microsoft.Internal.VisualStudio.Interop" Version="$(MicrosoftInternalVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
177179
<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" />
179181
<PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="$(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
180182
<PackageReference Include="Microsoft.Composition" Version="$(MicrosoftCompositionVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
181183
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

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

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

358-
override this.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) : unit =
359-
base.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks)
358+
override this.RegisterInitializeAsyncWork(packageRegistrationTasks: PackageLoadTasks) : unit =
359+
base.RegisterInitializeAsyncWork(packageRegistrationTasks)
360360

361361
packageRegistrationTasks.AddTask(
362362
true,
363-
(fun progress _tasks cancellationToken ->
363+
(fun _tasks cancellationToken ->
364364
foregroundCancellableTask {
365365
let! commandService = this.GetServiceAsync(typeof<IMenuCommandService>)
366366
let commandService = commandService :?> OleMenuCommandService

0 commit comments

Comments
 (0)