Updated dependency versions

RolandKoenig · Dec 30, 2023 · bd82582 · bd82582
1 parent 35b7d6e
commit bd82582
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 37 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -11,13 +11,12 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.0.x
     - name: Build and test
       shell: pwsh
       working-directory: ./scripts

diff --git a/...ons.DependencyInjection.Tests/RolandK.AvaloniaExtensions.DependencyInjection.Tests.csproj b/...ons.DependencyInjection.Tests/RolandK.AvaloniaExtensions.DependencyInjection.Tests.csproj
@@ -8,17 +8,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="xunit" Version="2.6.4" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="Avalonia.Headless" Version="11.0.6" />
     </ItemGroup>
 

diff --git a/...loniaExtensions.DependencyInjection/RolandK.AvaloniaExtensions.DependencyInjection.csproj b/...loniaExtensions.DependencyInjection/RolandK.AvaloniaExtensions.DependencyInjection.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/RolandK.AvaloniaExtensions.TestApp/RolandK.AvaloniaExtensions.TestApp.csproj b/src/RolandK.AvaloniaExtensions.TestApp/RolandK.AvaloniaExtensions.TestApp.csproj
@@ -23,9 +23,9 @@
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
         <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.6" />
-        <PackageReference Include="Bogus" Version="34.0.2" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
+        <PackageReference Include="Bogus" Version="35.2.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs
@@ -61,7 +61,7 @@ await UnitTestApplication.RunInApplicationContextAsync(() =>
     [Fact]
     public async Task Attach_MvvmWindow_to_ViewModel_then_close_using_ViewModel_with_dialog_result()
     {
-        await UnitTestApplication.RunInApplicationContextAsync(() =>
+        await UnitTestApplication.RunInApplicationContextAsync(async Task () =>
         {
             // Arrange
             var testViewModel = new TestViewModel();
@@ -76,9 +76,11 @@ await UnitTestApplication.RunInApplicationContextAsync(() =>
             var dialogResult = new object();
             testViewModel.TriggerCloseWindowRequest(dialogResult);
 
+            var showDialogTaskResult = await showDialogTask;
+
             // Assert
             Assert.Equal(TaskStatus.RanToCompletion, showDialogTask.Status);
-            Assert.Equal(dialogResult, showDialogTask.Result);
+            Assert.Equal(dialogResult, showDialogTaskResult);
             Assert.False(mvvmWindow.IsVisible);
             Assert.Null(testViewModel.AssociatedView);
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/RolandK.AvaloniaExtensions.Tests.csproj b/src/RolandK.AvaloniaExtensions.Tests/RolandK.AvaloniaExtensions.Tests.csproj
@@ -9,15 +9,15 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia.Headless" Version="11.0.6" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-        <PackageReference Include="NSubstitute" Version="5.0.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="xunit" Version="2.6.4" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.2.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Util/UnitTestApplication.cs b/src/RolandK.AvaloniaExtensions.Tests/Util/UnitTestApplication.cs
@@ -19,25 +19,27 @@ public static async Task RunInApplicationContextAsync(Action? action = null)
             return;
         }
 
-        var taskComplSource = new TaskCompletionSource();
-        var uiThread = new Thread(_ =>
-        {
-            AppBuilder.Configure<UnitTestApplication>()
-                .LogToTrace()
-                .UseHeadless(new AvaloniaHeadlessPlatformOptions())
-                .AfterSetup(_ => taskComplSource.SetResult())
-                .StartWithClassicDesktopLifetime(Array.Empty<string>(), ShutdownMode.OnExplicitShutdown);
-        });
-        uiThread.Start();
-
-        await taskComplSource.Task;
-
+        await StartApplicationAsync();
+
         if (action != null)
         {
             await Dispatcher.UIThread.InvokeAsync(action);
         }
     }
 
+    public static async Task RunInApplicationContextAsync(Func<Task> asyncAction)
+    {
+        if (Application.Current != null)
+        {
+            await Dispatcher.UIThread.InvokeAsync(asyncAction);
+            return;
+        }
+
+        await StartApplicationAsync();
+
+        await Dispatcher.UIThread.InvokeAsync(asyncAction);
+    }
+
     public static async Task StopAsync()
     {
         var application = Application.Current;
@@ -48,4 +50,20 @@ public static async Task StopAsync()
 
         await Dispatcher.UIThread.InvokeAsync(() => appLifetime.Shutdown());
     }
+
+    private static async Task StartApplicationAsync()
+    {
+        var taskComplSource = new TaskCompletionSource();
+        var uiThread = new Thread(_ =>
+        {
+            AppBuilder.Configure<UnitTestApplication>()
+                .LogToTrace()
+                .UseHeadless(new AvaloniaHeadlessPlatformOptions())
+                .AfterSetup(_ => taskComplSource.SetResult())
+                .StartWithClassicDesktopLifetime(Array.Empty<string>(), ShutdownMode.OnExplicitShutdown);
+        });
+        uiThread.Start();
+
+        await taskComplSource.Task;
+    }
 }
diff --git a/src/RolandK.AvaloniaExtensions/RolandK.AvaloniaExtensions.csproj b/src/RolandK.AvaloniaExtensions/RolandK.AvaloniaExtensions.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>