Merge branch 'main' of https://github.com/CleverCodeCravers/VisualPairCoding

Author: naseif

.github/workflows/dotnet.yml

@@ -48,13 +48,7 @@ jobs:
         run: dotnet test
         working-directory: Source/${{ env.SOLUTION_DIR }}
 
-      - name: Publish (Linux)
-        if: runner.os == 'Linux'
-        run: dotnet publish ${{ env.PROJECT }} -c Release -o ${{matrix.OUTPUTDIR}} -r ${{matrix.RUNTIMEID}}
-        working-directory: Source/${{ env.SOLUTION_DIR }}
-
-      - name: Publish (Windows)
-        if: runner.os == 'Windows'
+      - name: Publish
         run: dotnet publish ${{ env.PROJECT }} -c Release -o ${{matrix.OUTPUTDIR}} -p:PublishReadyToRun=true --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:UseAppHost=true -r ${{matrix.RUNTIMEID}}
         working-directory: Source/${{ env.SOLUTION_DIR }}
 

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/EnterNamesWindow.axaml.cs

@@ -32,7 +32,7 @@ private void OnActivated(object? sender, EventArgs e)
             if (_autostart)
             {
                 RoutedEventArgs? args = e as RoutedEventArgs;
-                this.StartForm(sender, args);
+                this.StartForm(sender, args!);
             }
         }
 
@@ -68,7 +68,7 @@ public async void StartForm(object? sender, RoutedEventArgs args)
                 sessionForm.Hide();
 
                 var tcs = new TaskCompletionSource<object>();
-                sessionForm.Closed += (s, e) => tcs.SetResult(null);
+                sessionForm.Closed += (s, e) => tcs.SetResult(null!);
                 sessionForm.Show();
                 await tcs.Task;
             }
@@ -154,7 +154,7 @@ private void RandomizeParticipants(object? sender, RoutedEventArgs args)
         }
 
 
-        private static Random random = new();
+        private static readonly Random random = new();
 
         public static void Shuffle<T>(IList<T> list)
         {
@@ -163,9 +163,7 @@ public static void Shuffle<T>(IList<T> list)
             {
                 n--;
                 int k = random.Next(n + 1);
-                T value = list[k];
-                list[k] = list[n];
-                list[n] = value;
+                (list[n], list[k]) = (list[k], list[n]);
             }
         }
 
@@ -194,7 +192,7 @@ private List<string> GetParticipants()
 
         public async void LoadSessionConfiguration(object? sender, RoutedEventArgs args)
         {
-            OpenFileDialog openFileDialog = new OpenFileDialog
+            OpenFileDialog openFileDialog = new()
             {
                 Title = "Open VPC Session",
                 Filters = new List<FileDialogFilter>
@@ -226,7 +224,7 @@ public async void SaveSessionConfiguration(object? sender, RoutedEventArgs args)
             var participants = GetParticipants();
 
 
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            SaveFileDialog saveFileDialog = new();
             saveFileDialog.Filters?.Add(new FileDialogFilter { Name = "VPC Session", Extensions = { "vpcsession" } });
             saveFileDialog.InitialFileName = string.Join("_", participants);
 

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/RunSessionForm.axaml.cs

@@ -133,7 +133,7 @@ private async void ChooseAnotherPairAndStartNewTurn()
                 );
 
             var tcs = new TaskCompletionSource<object>();
-            form.Closed += (s, e) => tcs.SetResult(null);
+            form.Closed += (s, e) => tcs.SetResult(null!);
 
             form.Show();
             form.Topmost = true;

Source/VisualPairCoding/VisualPairCoding.AvaloniaUI/VisualPairCoding.AvaloniaUI.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net7.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>
-    <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
@@ -29,7 +29,7 @@
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\VisualPairCoding.BL.Tests\VisualPairCoding.BL.Tests.csproj" />
+    <!--<ProjectReference Include="..\VisualPairCoding.BL.Tests\VisualPairCoding.BL.Tests.csproj" />-->
     <ProjectReference Include="..\VisualPairCoding.BL\VisualPairCoding.BL.csproj" />
     <ProjectReference Include="..\VisualPairCoding.Infrastructure\VisualPairCoding.Infrastructure.csproj" />
     <ProjectReference Include="..\VisualPairCoding.Interfaces\VisualPairCoding.Interfaces.csproj" />

Source/VisualPairCoding/VisualPairCoding.Infrastructure/AutoUpdater.cs

@@ -23,27 +23,25 @@ public AutoUpdater(
 
     public GithubAPIResponse[] GetReleaseList() 
     {
-        using (var client = new HttpClient())
-        {
-            var webRequest = new HttpRequestMessage(HttpMethod.Get, _githubUrl);
-            client.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:103.0) Gecko/20100101 Firefox/103.0");
+        using var client = new HttpClient();
+        var webRequest = new HttpRequestMessage(HttpMethod.Get, _githubUrl);
+        client.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:103.0) Gecko/20100101 Firefox/103.0");
 
-            var response = client.Send(webRequest);
+        var response = client.Send(webRequest);
 
-            string result = response.Content.ReadAsStringAsync().Result.Trim();
+        string result = response.Content.ReadAsStringAsync().Result.Trim();
 
-            GithubAPIResponse[] releases = JsonConvert.DeserializeObject<GithubAPIResponse[]>(result);
+        GithubAPIResponse[] releases = JsonConvert.DeserializeObject<GithubAPIResponse[]>(result)!;
 
-            return releases;
-        }
+        return releases!;
     }
 
 
     public void Update()
     {
         GithubAPIResponse[] releases = GetReleaseList();
 
-        using (WebClient downloadClient = new WebClient())
+        using (WebClient downloadClient = new())
         {
             downloadClient.DownloadFile(releases[0].Assets[0].Browser_download_url, releases[0].Assets[0].Name);
         }