Skip to content

Commit c921606

Browse files
edgarfgpedgarfgp
committed
Merge branch 'allow-and-bang-typed-bindings' of github.com:edgarfgp/fsharp into allow-and-bang-typed-bindings
2 parents dce81de + 1ba22bf commit c921606

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

‎.config/feature-lsp-branch-merge.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/workflows/copilot-setup-steps.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,15 @@ jobs:
1818
- uses: actions/setup-dotnet@v4
1919
with:
2020
global-json-file: global.json
21-
- name: Restore solution
21+
- name: Restore the compiler service solution
2222
env:
2323
CI: false
2424
run: dotnet build ./FSharp.Compiler.Service.sln --verbosity quiet
25+
- name: Restore the language server solution
26+
env:
27+
CI: false
28+
run: dotnet build ./VSFSharpExtension.sln --verbosity quiet
29+
- name: Restore dotnet tools
30+
env:
31+
CI: false
32+
run: dotnet tool restore

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,25 @@
3939
<Uri>https://github.com/dotnet/arcade</Uri>
4040
<Sha>12d3a9f5d6138e22270694574e73e4c58a815795</Sha>
4141
</Dependency>
42-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25302.1">
42+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
4343
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
44-
<Sha>5be52292950378f4737c2330406ffa4df9ef43f0</Sha>
44+
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
4545
</Dependency>
46-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25302.1">
46+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
4747
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
48-
<Sha>5be52292950378f4737c2330406ffa4df9ef43f0</Sha>
48+
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
4949
</Dependency>
50-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25302.1">
50+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
5151
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
52-
<Sha>5be52292950378f4737c2330406ffa4df9ef43f0</Sha>
52+
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
5353
</Dependency>
54-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25302.1">
54+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
5555
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
56-
<Sha>5be52292950378f4737c2330406ffa4df9ef43f0</Sha>
56+
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
5757
</Dependency>
58-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25302.1">
58+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
5959
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
60-
<Sha>5be52292950378f4737c2330406ffa4df9ef43f0</Sha>
60+
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
6161
</Dependency>
6262
</ToolsetDependencies>
6363
</Dependencies>

‎eng/Versions.props

Lines changed: 8 additions & 7 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>
@@ -204,10 +205,10 @@
204205
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
205206
<!-- -->
206207
<!-- MIBC profile packages -->
207-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25302.1</optimizationwindows_ntx64MIBCRuntimeVersion>
208-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25302.1</optimizationwindows_ntx86MIBCRuntimeVersion>
209-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25302.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
210-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25302.1</optimizationlinuxx64MIBCRuntimeVersion>
211-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25302.1</optimizationlinuxarm64MIBCRuntimeVersion>
208+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntx64MIBCRuntimeVersion>
209+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntx86MIBCRuntimeVersion>
210+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
211+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationlinuxx64MIBCRuntimeVersion>
212+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationlinuxarm64MIBCRuntimeVersion>
212213
</PropertyGroup>
213214
</Project>

‎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)