Skip to content

Commit a8ec342

Browse files
andyleejordanCopilotCopilot
authored
One more round of package updates (#2275)
* One more round of package updates * Update test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix flaky Emacs e2e test: replace fixed sleep with diagnostic polling loop (#2276) * Initial plan * Fix timing issue in Emacs test by polling for flymake diagnostics Agent-Logs-Url: https://github.com/PowerShell/PowerShellEditorServices/sessions/19f2e25d-3a5e-4570-97bf-ce36493b9795 Co-authored-by: andyleejordan <2226434+andyleejordan@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: andyleejordan <2226434+andyleejordan@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
1 parent 00b71f1 commit a8ec342

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
4-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.3" />
5-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
6-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.3" />
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
5+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
6+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
88
<PackageVersion Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
9-
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.13" />
9+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.14" />
1010
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1111
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.9" />
1212
<PackageVersion Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.9" />
@@ -29,7 +29,7 @@
2929
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
3030
<PackageVersion Include="System.Security.Principal" Version="4.3.0" />
3131
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
32-
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
32+
<PackageVersion Include="System.ValueTuple" Version="4.6.2" />
3333
<PackageVersion Include="xunit" Version="2.9.3" />
3434
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
3535
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<!-- PowerShell 7.4.x -->
2020
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
21-
<PackageReference Include="Microsoft.PowerShell.SDK" VersionOverride="7.4.7" />
21+
<PackageReference Include="Microsoft.PowerShell.SDK" />
2222
</ItemGroup>
2323

2424
<!-- Windows PowerShell 5.1 -->

test/emacs-test.el

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,12 @@
6161
(let ((lsp (eglot-current-server)))
6262
(should (string= (eglot--project-nickname lsp) "PowerShellEditorServices"))
6363
(should (member (cons 'powershell-mode "powershell") (eglot--languages lsp))))
64-
(sleep-for 5) ; TODO: Wait for "textDocument/publishDiagnostics" instead
6564
(flymake-start)
65+
;; Wait for diagnostics to arrive instead of sleeping a fixed duration
66+
(let ((deadline (time-add (current-time) 30)))
67+
(while (and (time-less-p (current-time) deadline)
68+
(null (flymake-diagnostics)))
69+
(sleep-for 0.5)))
6670
(goto-char (point-min))
6771
(flymake-goto-next-error)
6872
(should (eq 'flymake-warning (face-at-point))))))

0 commit comments

Comments
 (0)