From 43c6290143f6008d309693527bf000c223ca86de Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 30 Jan 2023 19:21:08 +0000
Subject: [PATCH] [misc] generate PDBs for Visual Studio builds

* Even if this makes the resulting executable slightly larger, this should help
  with troubleshooting, especially for the Windows Store releases.
* Also drop the "since 2019" from the Downloads badge, since once you reach 100M
  the start date for the counter becomes a bit meaningless...
---
 .github/workflows/vs2022.yml |  7 +++++--
 .vs/Generate.PDB.props       |  8 ++++++++
 README.md                    |  2 +-
 src/rufus.rc                 | 10 +++++-----
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 .vs/Generate.PDB.props

diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml
index 56ff170b..66f2d5bb 100644
--- a/.github/workflows/vs2022.yml
+++ b/.github/workflows/vs2022.yml
@@ -67,8 +67,9 @@ jobs:
       shell: cmd
       run: |
         set ExternalCompilerOptions=${{ steps.set_alpha.outputs.option }} ${{ steps.set_beta.outputs.option }}
-        msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ matrix.TARGET_PLATFORM }}
+        msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ matrix.TARGET_PLATFORM }},ForceImportBeforeCppTargets=%GITHUB_WORKSPACE%\.vs\Generate.PDB.props
         move .\${{ matrix.TARGET_PLATFORM }}\Release\rufus.exe .\rufus_${{ matrix.TARGET_PLATFORM }}.exe
+        move .\${{ matrix.TARGET_PLATFORM }}\Release\rufus.pdb .\rufus_${{ matrix.TARGET_PLATFORM }}.pdb
 
     - name: Display SHA-256
       run: sha256sum ./rufus_${{ matrix.TARGET_PLATFORM }}.exe
@@ -85,4 +86,6 @@ jobs:
       if: ${{ github.event_name == 'push' }}
       with:
         name: VS2022
-        path: ./*.exe
+        path: |
+          ./*.exe
+          ./*.pdb
diff --git a/.vs/Generate.PDB.props b/.vs/Generate.PDB.props
new file mode 100644
index 00000000..61e016b8
--- /dev/null
+++ b/.vs/Generate.PDB.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <Link>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/README.md b/README.md
index 0faa65dd..60868c2a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Rufus: The Reliable USB Formatting Utility
 [![Coverity Scan Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square&label=Coverity%20Analysis)](https://scan.coverity.com/projects/pbatard-rufus)  
 [![Latest Release](https://img.shields.io/github/release-pre/pbatard/rufus.svg?style=flat-square&label=Latest%20Release)](https://github.com/pbatard/rufus/releases)
 [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square&label=License)](https://www.gnu.org/licenses/gpl-3.0.en.html)
-[![Download Stats](https://img.shields.io/github/downloads/pbatard/rufus/total.svg?label=Downloads%20%28since%202019%29&style=flat-square)](https://github.com/pbatard/rufus/releases)
+[![Download Stats](https://img.shields.io/github/downloads/pbatard/rufus/total.svg?label=Downloads&style=flat-square)](https://github.com/pbatard/rufus/releases)
 [![Contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square&label=Contributors)](https://github.com/pbatard/rufus/graphs/contributors)
 
 ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png)
diff --git a/src/rufus.rc b/src/rufus.rc
index 9c499d11..31f0f4a0 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.22.1959"
+CAPTION "Rufus 3.22.1960"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -396,8 +396,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,22,1959,0
- PRODUCTVERSION 3,22,1959,0
+ FILEVERSION 3,22,1960,0
+ PRODUCTVERSION 3,22,1960,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -415,13 +415,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.22.1959"
+            VALUE "FileVersion", "3.22.1960"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.22.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.22.1959"
+            VALUE "ProductVersion", "3.22.1960"
         END
     END
     BLOCK "VarFileInfo"