Skip to content

Fixes #4787. Upgrade all nuget packages including the obsolete xunit v2 #4788

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
tig merged 33 commits into from
Mar 6, 2026
Merged

Fixes #4787. Upgrade all nuget packages including the obsolete xunit v2 #4788

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
98f0126
Upgrade nuget packages, rename TestContext to FluentTestContext and r…
BDisp Mar 3, 2026
75ab6b6
Fix recursive events
BDisp Mar 3, 2026
7504ef7
Fix unit tests
BDisp Mar 3, 2026
1a7484a
Upgrade ReportGenerator
BDisp Mar 4, 2026
54ee0ff
Code cleanup
BDisp Mar 4, 2026
6af30ef
Rename FluentTestContext to AppTestHelper
BDisp Mar 4, 2026
d65df27
Resolving merge conflicts
BDisp Mar 4, 2026
d5a7044
Fix TestContext.Current.CancellationToken warnings
BDisp Mar 4, 2026
217baeb
Add <OutputType>Exe</OutputType> in the unit tests projects
BDisp Mar 4, 2026
abf604b
Add <UseAppHost>true</UseAppHost>
BDisp Mar 4, 2026
be3e69e
Remove xunit.runner.visualstudio and Microsoft.NET.Test.Sdk nuget pac…
BDisp Mar 4, 2026
82e245d
Remove Microsoft.Net.Compilers.Toolset unused nuget package
BDisp Mar 4, 2026
7e4a8f0
Add <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
BDisp Mar 4, 2026
013a3a2
Trying to fix integrations tests
BDisp Mar 4, 2026
0f62080
Remove <IsTestProject>true</IsTestProject> to prevent ghost transitiv…
BDisp Mar 4, 2026
365e6bf
Keep parameter consistency with the generator
BDisp Mar 4, 2026
c8dbe87
Prevent UICatalog test fail in WSL using VS2026
BDisp Mar 4, 2026
d08381f
Resolving merge conflicts
BDisp Mar 4, 2026
fe3cc4a
Fix merge errors
BDisp Mar 4, 2026
bcc8eeb
Renamed to AppTestHelpers and AppTestHelpers.XunitHelpers
BDisp Mar 5, 2026
c0b3d70
Merge branch 'v2_develop' into v2_4787__upgrade-nuget-packages
BDisp Mar 5, 2026
839638f
Fix test discovery for dotnet test and ReSharper after xUnit v3 upgrade
tig Mar 5, 2026
f677a6d
Fix AppTestHelper XML doc summary
tig Mar 5, 2026
98fbbb3
Update CI workflows for Microsoft Testing Platform (MTP)
tig Mar 5, 2026
f40d7ad
Fix Linux/macOS CI: chmod +x test executables after artifact download
tig Mar 5, 2026
56d23aa
Remove --coverage flag (not supported by xUnit v3 MTP)
tig Mar 5, 2026
c529754
Build per-OS instead of sharing Linux artifacts across platforms
tig Mar 5, 2026
6101243
Add --diagnostic flag (required by --diagnostic-output-directory)
tig Mar 5, 2026
0a29c24
Update all docs to use MTP-compatible dotnet test syntax
tig Mar 5, 2026
1dce13f
Fix duplicate --diagnostic flag; update stale coverage docs
tig Mar 5, 2026
fead444
Merge branch 'v2_develop' into v2_4787__upgrade-nuget-packages
BDisp Mar 5, 2026
cf31f2a
Fix help arg
BDisp Mar 5, 2026
4bdfeb0
Microsoft.CodeAnalysis.CSharp is now consistent with version 4.14.0 a…
BDisp Mar 6, 2026
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
62 changes: 31 additions & 31 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,40 @@
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
Comment thread
BDisp marked this conversation as resolved.
Outdated
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.11.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="[8,9)" />
<PackageVersion Include="ColorHelper" Version="[1.8.1,2)" />
<PackageVersion Include="JetBrains.Annotations" Version="[2025.2.2,)" />
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
<PackageVersion Include="ColorHelper" Version="1.8.1" />
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[9.0.0,)" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
<PackageVersion Include="System.IO.Abstractions" Version="[22.0.16,23)" />
<PackageVersion Include="Wcwidth" Version="[4.0.0,)" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="[1.21.2,2)" />
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
Comment thread
BDisp marked this conversation as resolved.
Outdated
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
<PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />
<PackageVersion Include="Wcwidth" Version="4.0.1" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="Serilog" Version="4.3.1" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.11,4)" />
<PackageVersion Include="CsvHelper" Version="[33.0.1,34)" />
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="[3.1.6,4)" />
<PackageVersion Include="System.CommandLine" Version="[2.0.0-beta4.22272.1,3)" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="[8.4.0,9)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.2,)" />
<PackageVersion Include="ReactiveUI" Version="[20.1.63,21)" />
<PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="[1.3.1,2)" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="[2.1.8,3)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.13,18)" />
<PackageVersion Include="Moq" Version="[4.20.72,5)" />
<PackageVersion Include="ReportGenerator" Version="5.4.5" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
<PackageVersion Include="xunit" Version="[2.9.3,3)" />
<PackageVersion Include="Xunit.Combinatorial" Version="[1.6.24,2)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,3)" />
<PackageVersion Include="coverlet.collector" Version="[6.0.4,7)" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageVersion Include="CsvHelper" Version="33.1.0" />
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageVersion Include="System.CommandLine" Version="2.0.3" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
<PackageVersion Include="ReactiveUI" Version="23.1.8" />
<PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.6.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="ReportGenerator" Version="5.5.2" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PackageVersion Include="Terminal.Gui" Version="2.0.0" />
Expand Down
3 changes: 2 additions & 1 deletion Examples/ReactiveExample/LoginView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using ReactiveMarbles.ObservableEvents;
using ReactiveUI;
Expand Down Expand Up @@ -138,7 +139,7 @@ public LoginView (LoginViewModel viewModel)
ViewModel
.WhenAnyObservable (x => x.Login.IsExecuting)
.Select (executing => executing ? ProgressMessage : IdleMessage)
.ObserveOn (RxApp.MainThreadScheduler)
.ObserveOn (Program._rxApp.MainThreadScheduler!)
.BindTo (progress, x => x.Text)
.DisposeWith (_disposable);
});
Expand Down
13 changes: 8 additions & 5 deletions Examples/ReactiveExample/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
using System.Reactive.Concurrency;
using ReactiveUI;
using ReactiveUI.Builder;
using Terminal.Gui.App;
using Terminal.Gui.Configuration;

namespace ReactiveExample;

public static class Program
{
private static void Main (string [] args)
internal static ReactiveUIBuilder _rxApp;

private static void Main (string [] _)
{
ConfigurationManager.Enable (ConfigLocations.All);
using IApplication app = Application.Create ();
app.Init ();
RxApp.MainThreadScheduler = new TerminalScheduler (app);
RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
var loginView = new LoginView (new ());
_rxApp = RxAppBuilder.CreateReactiveUIBuilder ();
_rxApp.WithMainThreadScheduler (new TerminalScheduler (app));
_rxApp.WithTaskPoolScheduler (TaskPoolScheduler.Default);
var loginView = new LoginView (new LoginViewModel ());
app.Run (loginView);
loginView.Dispose ();
}
Expand Down
Loading
Loading