From 6fbb81f304588e46a1fde3f5ca9f5910f0c899a5 Mon Sep 17 00:00:00 2001
From: GuyWhoChad <105840356+GuyWhoChad@users.noreply.github.com>
Date: Thu, 14 Mar 2024 03:18:18 +0530
Subject: [PATCH 1/2] Adding a string to tell the user to disable antivirus if
 install failed (#492)

Many people have made issues regarding this despite it being mentioned in the discord #FAQ. therefore i have decided to add a string to suggest this aswell.

Co-authored-by: Misha <106913236+MishaProductions@users.noreply.github.com>
---
 Rectify11Installer/Strings/Rectify11.resx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rectify11Installer/Strings/Rectify11.resx b/Rectify11Installer/Strings/Rectify11.resx
index f15438e19..c8a46522a 100644
--- a/Rectify11Installer/Strings/Rectify11.resx
+++ b/Rectify11Installer/Strings/Rectify11.resx
@@ -440,7 +440,7 @@
     <value>Rectify11 has finished installing. Please restart your PC to complete the changes.</value>
   </data>
   <data name="r11InstallErrorPart1" xml:space="preserve">
-    <value>Installation of Rectify11 has failed. Please send </value>
+    <value>Installation of Rectify11 has failed. Please try disabling your Antivirus Software. If that does not work, then Please Send </value>
   </data>
   <data name="r11InstallErrorPart2" xml:space="preserve">
     <value> and open an issue on GitHub or send it on the Rectify11 Discord server for help.</value>
@@ -454,4 +454,4 @@
   <data name="tooNewBuild" xml:space="preserve">
 	<value>You are running a build of Windows that is too new to be fully supported by Rectify11.</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 7f68551e64d95bf16dd664c1d4e762dad55f7ec5 Mon Sep 17 00:00:00 2001
From: Mukul Kedia <mukulkedia11@gmail.com>
Date: Thu, 14 Mar 2024 19:59:30 -0400
Subject: [PATCH 2/2] Update build.yml Node versions and remove redundant git
 submodules command (#488)

* Update build.yml Node versions and remove redundant git submodules command

---------

Co-authored-by: Misha <106913236+MishaProductions@users.noreply.github.com>
---
 .github/workflows/build.yml | 25 +++++++++++++------------
 .github/workflows/sync.yml  | 20 ++++++--------------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb3cafd49..62be7d3bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 name: Rectify11
 
 on:
+  workflow_dispatch:
   push:
     branches: [ master ]
   pull_request:
@@ -15,30 +16,30 @@ jobs:
     runs-on: windows-latest
     env:
       NUGET_CERT_REVOCATION_MODE: offline
+      
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout
+      uses: actions/checkout@v4.1.1
       with: 
         token: ${{ secrets.GITHUB_TOKEN }}
-        submodules: true
+        submodules: recursive
         lfs: true
-    - name: Git Sumbodule Update
-      run: |
-        git submodule update --init --recursive
-        git submodule update --recursive --remote
+
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.1.3
+      uses: microsoft/setup-msbuild@v2
+      
     - name: Restore NuGet Packages
-      run: |
-        nuget restore Rectify11Installer.sln
+      run: nuget restore Rectify11Installer.sln
+
     - name: Build
       run: msbuild Rectify11Installer.sln /p:Configuration=Release /p:platform=x64
+      
     - name: Create single exe
-      run: Rectify11Installer\ILRepack.exe Rectify11Installer\bin\Release\Rectify11Installer.exe /out:Rectify11Installer\bin\output\Release\Rectify11Installer.exe Rectify11Installer\bin\Release\libmsstyle.dll Rectify11Installer\bin\Release\TaskDialog.dll 
+      run: Rectify11Installer\ILRepack.exe Rectify11Installer\bin\Release\Rectify11Installer.exe /out:Rectify11Installer\bin\output\Release\Rectify11Installer.exe Rectify11Installer\bin\Release\libmsstyle.dll Rectify11Installer\bin\Release\TaskDialog.dll
+      
     - name: Upload Rectify11Installer
       uses: actions/upload-artifact@v4.3.1
       with:
-        # Artifact name
         name: Rectify11Installer (x64)
-        # A file, directory or wildcard pattern that describes what to upload
         path: Rectify11Installer\bin\output\Release\Rectify11Installer.exe
         compression-level: 0
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index 1e479873c..ac18ba4e1 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -1,28 +1,20 @@
-name: 'Submodules Sync'
+name: Submodules Sync
 
 on:
-  # Allows you to run this workflow manually from the Actions tab or through HTTP API
   workflow_dispatch:
 
 jobs:
   sync:
-    name: 'Submodules Sync'
+    name: Submodules Sync
     runs-on: ubuntu-latest
 
-    # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest
-    defaults:
-      run:
-        shell: bash
-
     steps:
-    # Checkout the repository to the GitHub Actions runner
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
-        submodules: true
+        submodules: recursive
 
-    # Update references
     - name: Git Sumbodule Update
       run: |
         git pull --recurse-submodules
@@ -30,7 +22,7 @@ jobs:
 
     - name: Commit update
       run: |
-        git config --global user.name 'Github'
-        git config --global user.email 'bot@noreply.github.com'
+        git config --global user.name "Github"
+        git config --global user.email "bot@noreply.github.com"
         git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
         git commit -am "Updated submodule references" && git push || echo "No changes to commit"