update auf .net 9, Bugfix für "single user bug"

stho32 · stho32 · commit 4c61b2cf8bef · 2025-01-11T19:22:21.000+01:00
diff --git a/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/EnterNamesWindow.axaml.cs b/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/EnterNamesWindow.axaml.cs
@@ -34,7 +34,7 @@ public EnterNamesForm(bool autostart, string configPath)
             }
         }
 
-        private MenuItem GetRecentMenuItem()
+        private MenuItem? GetRecentMenuItem()
         {
             return this.FindControl<MenuItem>("recentMenuItem");
         }
diff --git a/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/RunSessionForm.axaml.cs b/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/RunSessionForm.axaml.cs
@@ -129,7 +129,6 @@ private async void Timer_Tick(object? sender, EventArgs e)
 
         private async void ChooseAnotherPairAndStartNewTurn()
         {
-
             timer.Stop();
 
             _currentTime = new TimeSpan(0, _pairCodingSession.MinutesPerTurn, 0);
@@ -140,7 +139,11 @@ private async void ChooseAnotherPairAndStartNewTurn()
                 _currentParticipant = 0;
             }
 
-            ChooseRandomNavigatorFromListWithout();
+            var navigator = GetRandomNavigatorFromListWithout(
+                _pairCodingSession.Participants[_currentParticipant],
+                _pairCodingSession.Participants,
+                random);
+            recommendedNavigator.Text = navigator;
 
             activeParticipnat.Text = _pairCodingSession.Participants[_currentParticipant];
 
@@ -149,23 +152,25 @@ private async void ChooseAnotherPairAndStartNewTurn()
                 _explicitlyConfirmTurnChange
                 );
 
-            var tcs = new TaskCompletionSource<object>();
-            form.Closed += (s, e) => tcs.SetResult(null!);
+            var taskCompletionSource = new TaskCompletionSource<object>();
+            form.Closed += (s, e) => taskCompletionSource.SetResult(null!);
 
             form.Show();
             form.Topmost = true;
-            await tcs.Task;
+            await taskCompletionSource.Task;
             timer.Start();
             Topmost = true;
         }
 
-        private void ChooseRandomNavigatorFromListWithout()
+        private static string GetRandomNavigatorFromListWithout(string currentlyActiveParticipant, string[] participants, Random random)
         {
-            var potentialNavigators =
-                _pairCodingSession.Participants.ToArray();
+            if (participants.Length == 1)
+                return "";
 
+            var potentialNavigators = participants.Where((s) => s != currentlyActiveParticipant).ToArray();
             var randomEntry = potentialNavigators[random.Next(0, potentialNavigators.Length)];
-            recommendedNavigator.Text = randomEntry;
+
+            return randomEntry;
         }
 
         private void PauseButton_Click(object? sender, RoutedEventArgs args)
diff --git a/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/VisualPairCoding.AvaloniaUI.csproj b/Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/VisualPairCoding.AvaloniaUI.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
     <TrimMode>copyused</TrimMode>
@@ -23,11 +23,11 @@
   <ItemGroup>
 	<AvaloniaResource Include="Assets\\*" />
 	<Content Include="Assets\coworkers.ico" />
-    <PackageReference Include="Avalonia" Version="11.0.4" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
+    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
     <PackageReference Include="MessageBox.Avalonia-mainthread" Version="2.0.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/VisualPairCoding/VisualPairCoding.BL.Tests/VisualPairCoding.BL.Tests.csproj b/Source/VisualPairCoding/VisualPairCoding.BL.Tests/VisualPairCoding.BL.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="8.6.68" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="altcover" Version="9.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Source/VisualPairCoding/VisualPairCoding.BL/VisualPairCoding.BL.csproj b/Source/VisualPairCoding/VisualPairCoding.BL/VisualPairCoding.BL.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Source/VisualPairCoding/VisualPairCoding.Infrastructure/VisualPairCoding.Infrastructure.csproj b/Source/VisualPairCoding/VisualPairCoding.Infrastructure/VisualPairCoding.Infrastructure.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Source/VisualPairCoding/VisualPairCoding.Interfaces/VisualPairCoding.Interfaces.csproj b/Source/VisualPairCoding/VisualPairCoding.Interfaces/VisualPairCoding.Interfaces.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public EnterNamesForm(bool autostart, string configPath)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- private MenuItem GetRecentMenuItem()`
	`37`	`+ private MenuItem? GetRecentMenuItem()`
`38`	`38`	`{`
`39`	`39`	`return this.FindControl<MenuItem>("recentMenuItem");`
`40`	`40`	`}`