[build] 0.3.0

Removed file deletion if build-files.txt not found
openbullet · Jul 1, 2024 · bc5c022 · bc5c022
1 parent 9c97e9d
commit bc5c022
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 71 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -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
@@ -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/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 even contains appsettings.json or UserData, disregard it (prevent accidental deletion)
-                        if (entry.Contains("appsettings.json") || entry.Contains("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.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 even contains appsettings.json or UserData, disregard it (prevent accidental deletion)
-                        if (entry.Contains("appsettings.json") || entry.Contains("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...[/]");
         }
     }