Merge branch 'master' of https://github.com/Rectify11/Installer

.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/[email protected]
       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/[email protected]
+      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/[email protected]
       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

.github/workflows/sync.yml

@@ -1,36 +1,28 @@
-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
         git submodule update --remote --recursive
 
     - name: Commit update
       run: |
-        git config --global user.name 'Github'
-        git config --global user.email '[email protected]'
+        git config --global user.name "Github"
+        git config --global user.email "[email protected]"
         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"

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>
+</root>