Merge branch 'openbullet:master' into issue-report

openbullet · Jul 4, 2024 · c0c11bc · c0c11bc
2 parents 9993866 + 995e81e
commit c0c11bc
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 79 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -14,7 +14,7 @@ jobs:
 
     # Checkout the repository
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -56,6 +56,7 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: '.release/*'
         file_glob: true
+        release_name: ${{ env.VERSION }}
         tag: ${{ env.VERSION }}
         overwrite: true
         prerelease: false

diff --git a/.github/workflows/build-staging.yml b/.github/workflows/build-staging.yml
@@ -14,7 +14,7 @@ jobs:
 
     # Checkout the repository
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -71,6 +71,7 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: '.release/*'
         file_glob: true
+        release_name: ${{ env.VERSION }}
         tag: ${{ env.VERSION }}
         overwrite: true
         prerelease: true

diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -0,0 +1,26 @@
+name: Merge Conflict Labeler
+
+on:
+  push:
+    branches:
+      - master
+  pull_request_target:
+    branches:
+      - master
+    types: [synchronize]
+
+jobs:
+  label:
+    name: Labeling
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'openbullet/OpenBullet2' }}
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Apply label
+        uses: eps1lon/actions-label-merge-conflict@v3
+        with:
+          dirtyLabel: 'merge-conflict'
+          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -10,12 +10,12 @@ name: .NET
 
 jobs:
   test:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Unittests
       run: dotnet test
diff --git a/OpenBullet2.Native.Updater/Helpers/FileSystemHelper.cs b/OpenBullet2.Native.Updater/Helpers/FileSystemHelper.cs
@@ -71,45 +71,12 @@ public static async Task CleanupInstallationFolderAsync()
                         }
                     }
                 });
-
         }
-        // If the file does not exist, we will delete everything except the whitelisted files and folders.
+        // If the file does not exist, skip the deletion
         else
         {
             AnsiConsole.MarkupLine(
-                "[yellow]build-files.txt not found, cleaning up everything not in the whitelist...[/]");
-
-            AnsiConsole.Status()
-                .Start("[yellow]Deleting...[/]", ctx =>
-                {
-                    foreach (var entry in Directory.EnumerateFileSystemEntries(Directory.GetCurrentDirectory()))
-                    {
-                        var isDirectory = (File.GetAttributes(entry) & FileAttributes.Directory) == FileAttributes.Directory;
-
-                        // If it's appsettings.json or the UserData folder, disregard it
-                        if (entry == "appsettings.json" || entry.StartsWith("UserData"))
-                        {
-                            continue;
-                        }
-
-                        // If it's the current executable, disregard it
-                        if (entry == Process.GetCurrentProcess().MainModule?.FileName)
-                        {
-                            continue;
-                        }
-
-                        ctx.Status($"Deleting {entry}...");
-
-                        if (isDirectory)
-                        {
-                            Directory.Delete(entry, true);
-                        }
-                        else
-                        {
-                            File.Delete(entry);
-                        }
-                    }
-                });
+                "[yellow]build-files.txt not found, skipping file deletion...[/]");
         }
     }
 

diff --git a/OpenBullet2.Native/OpenBullet2.Native.csproj b/OpenBullet2.Native/OpenBullet2.Native.csproj
@@ -103,7 +103,7 @@
         <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
         <PackageReference Include="HtmlSanitizer" Version="8.1.866-beta" />
         <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-        <PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
+        <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
         <PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
         <PackageReference Include="Markdig" Version="0.37.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6"/>

diff --git a/OpenBullet2.Web.Updater/Helpers/FileSystemHelper.cs b/OpenBullet2.Web.Updater/Helpers/FileSystemHelper.cs
@@ -71,45 +71,12 @@ public static async Task CleanupInstallationFolderAsync()
                         }
                     }
                 });
-
         }
-        // If the file does not exist, we will delete everything except the whitelisted files and folders.
+        // If the file does not exist, skip the deletion
         else
-        {
+        {   
             AnsiConsole.MarkupLine(
-                "[yellow]build-files.txt not found, cleaning up everything not in the whitelist...[/]");
-
-            AnsiConsole.Status()
-                .Start("[yellow]Deleting...[/]", ctx =>
-                {
-                    foreach (var entry in Directory.EnumerateFileSystemEntries(Directory.GetCurrentDirectory()))
-                    {
-                        var isDirectory = (File.GetAttributes(entry) & FileAttributes.Directory) == FileAttributes.Directory;
-
-                        // If it's appsettings.json or the UserData folder, disregard it
-                        if (entry == "appsettings.json" || entry.StartsWith("UserData"))
-                        {
-                            continue;
-                        }
-
-                        // If it's the current executable, disregard it
-                        if (entry == Process.GetCurrentProcess().MainModule?.FileName)
-                        {
-                            continue;
-                        }
-
-                        ctx.Status($"Deleting {entry}...");
-
-                        if (isDirectory)
-                        {
-                            Directory.Delete(entry, true);
-                        }
-                        else
-                        {
-                            File.Delete(entry);
-                        }
-                    }
-                });
+                "[yellow]build-files.txt not found, skipping file deletion...[/]");
         }
     }
 

diff --git a/README.md b/README.md
@@ -32,6 +32,9 @@ Found a bug or have a feature request? Please help us improve by submitting an i
 
 [![Open an issue](https://img.shields.io/badge/Bug-Report_a_bug-E74C3C.svg)](https://github.com/openbullet/OpenBullet2/issues/new?template=bug-report.yaml&title=%5BBug%5D%3A+) [![Request a feature](https://img.shields.io/badge/Feature-Request_a_feature-2292A4.svg)](https://github.com/openbullet/OpenBullet2/issues/new?template=feature_request.md&title=%5BREQUEST%5D)
 
+## 📊 Stats
+![Alt](https://repobeats.axiom.co/api/embed/c51394480e5e3da9259cae343f80dd1c53a8b263.svg "Repobeats analytics image")
+
 ## License
 This software is licensed under the MIT License.