diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2d487b4145b..7f1b1758e1c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -34,7 +34,7 @@ env: jobs: CodeQL-Build: - runs-on: windows-latest + runs-on: windows-2025-vs2026 permissions: security-events: write @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v6 - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@v3 with: languages: cpp @@ -52,9 +52,11 @@ jobs: uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 + vs-version: '[18.0,19.0)' - name: Build - run: msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }} + shell: cmd + run: msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }},PlatformToolset=v145 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index a34ebb9c97a..5ea68f82601 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -14,6 +14,18 @@ on: - '**.sh' - '**.txt' - '**.xml' + pull_request: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' env: SOLUTION_FILE_PATH: ./rufus.sln @@ -24,7 +36,7 @@ env: jobs: Coverity-Build: - runs-on: windows-latest + runs-on: windows-2025-vs2026 steps: - name: Checkout repository @@ -46,11 +58,15 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 + with: + msbuild-architecture: x64 + vs-version: '[18.0,19.0)' - name: Build with Coverity + shell: cmd run: | cov-configure --msvc - cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }} + cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }},PlatformToolset=v145 - name: Publish Coverity artifacts uses: actions/upload-artifact@v6 @@ -62,4 +78,3 @@ jobs: run: | 7z a -r cov-int.zip cov-int curl --form email=${{ env.EMAIL }} --form token=${{ secrets.COVERITY_SCAN_TOKEN }} --form file=@cov-int.zip --form version="${{ env.GITHUB_SHA }}" --form description="Automated build" https://scan.coverity.com/builds?project=${{ env.COVERITY_PROJECT_NAME }} - diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index d737d74f3b3..1750cdabfee 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -10,8 +10,8 @@ env: BUILD_CONFIGURATION: Release jobs: - VS2022-Build: - runs-on: windows-latest + VS2026-Build: + runs-on: windows-2025-vs2026 strategy: matrix: @@ -25,11 +25,12 @@ jobs: uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 + vs-version: '[18.0,19.0)' - name: Build shell: cmd run: | - 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 }},PlatformToolset=v145 move .\res\setup\${{ matrix.TARGET_PLATFORM }}\Release\setup.exe .\setup_${{ matrix.TARGET_PLATFORM }}.exe - name: Display SHA-256 @@ -42,11 +43,11 @@ jobs: path: ./*.exe Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: - runs-on: windows-latest - needs: VS2022-Build + runs-on: windows-2025-vs2026 + needs: VS2026-Build steps: - name: Merge Artifacts - uses: actions/upload-artifact/merge@v5 + uses: actions/upload-artifact/merge@v6 with: name: setup delete-merged: true diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2026.yml similarity index 92% rename from .github/workflows/vs2022.yml rename to .github/workflows/vs2026.yml index ac7b41fab70..63bd4556fa3 100644 --- a/.github/workflows/vs2022.yml +++ b/.github/workflows/vs2026.yml @@ -1,4 +1,4 @@ -name: VS2022 +name: VS2026 on: push: @@ -31,8 +31,8 @@ env: BUILD_CONFIGURATION: Release jobs: - VS2022-Build: - runs-on: windows-latest + VS2026-Build: + runs-on: windows-2025-vs2026 strategy: matrix: @@ -43,12 +43,14 @@ jobs: uses: actions/checkout@v6 with: fetch-depth: 0 + fetch-tags: true submodules: recursive - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 + vs-version: '[18.0,19.0)' - name: Install UPX uses: crazy-max/ghaction-upx@v3 @@ -59,8 +61,8 @@ jobs: id: set_version shell: bash run: | - version=$(git describe --tags) - version=${version:1} + version=$(git describe --tags --always) + version=${version#v} version=${version%%-*} echo "version=$version" >> $GITHUB_OUTPUT @@ -86,7 +88,7 @@ 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 }},ForceImportBeforeCppTargets=%GITHUB_WORKSPACE%\.vs\Generate.PDB.props + msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ matrix.TARGET_PLATFORM }},PlatformToolset=v145,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 @@ -135,12 +137,12 @@ jobs: ./*.pdb Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: - runs-on: windows-latest - needs: VS2022-Build + runs-on: windows-2025-vs2026 + needs: VS2026-Build steps: - name: Merge Artifacts uses: actions/upload-artifact/merge@v6 if: ${{ github.event_name == 'push' }} with: - name: VS2022 + name: VS2026 delete-merged: true diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index 12050177630..b80db25283a 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -110,49 +110,49 @@ StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true diff --git a/.vs/ext2fs.vcxproj b/.vs/ext2fs.vcxproj index 521437b2942..d382bb77027 100644 --- a/.vs/ext2fs.vcxproj +++ b/.vs/ext2fs.vcxproj @@ -122,49 +122,49 @@ StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index 767adf07382..ff0efc2c4a3 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -44,39 +44,39 @@ StaticLibrary Unicode true - v143 + v145 StaticLibrary Unicode true - v143 + v145 true StaticLibrary Unicode true - v143 + v145 true StaticLibrary Unicode - v143 + v145 true StaticLibrary Unicode - v143 + v145 true true StaticLibrary Unicode - v143 + v145 true true @@ -84,12 +84,12 @@ StaticLibrary Unicode true - v143 + v145 StaticLibrary Unicode - v143 + v145 true diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 1e8b35c7a78..e4d4bc7bc6f 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -76,53 +76,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index beadf8e611d..6679c7f94d3 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -69,53 +69,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index 60ce04b778c..15b56694d1a 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -62,53 +62,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index 1679bf4ff19..eee36bc07e9 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -105,53 +105,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index 843705b438c..362aaef5f2a 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -46,39 +46,39 @@ Application Unicode true - v143 + v145 Application Unicode true - v143 + v145 true Application Unicode true - v143 + v145 true Application Unicode - v143 + v145 true Application Unicode - v143 + v145 true true Application Unicode - v143 + v145 true true @@ -86,12 +86,12 @@ Application Unicode true - v143 + v145 Application Unicode - v143 + v145 true diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index 732904b0ddb..b5c380e80a0 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -59,53 +59,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index 8af6845140a..1b5a17a3c59 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -58,53 +58,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 5e77cea3602..3c127eed326 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -52,53 +52,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/.vs/wimlib.vcxproj b/.vs/wimlib.vcxproj index d82bbb864e2..4e8866fbc10 100644 --- a/.vs/wimlib.vcxproj +++ b/.vs/wimlib.vcxproj @@ -184,53 +184,53 @@ StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 true StaticLibrary true Unicode - v143 + v145 StaticLibrary true Unicode - v143 + v145 diff --git a/res/setup/setup.vcxproj b/res/setup/setup.vcxproj index b4043bc7a0e..39f3853bd1e 100644 --- a/res/setup/setup.vcxproj +++ b/res/setup/setup.vcxproj @@ -37,40 +37,40 @@ Application true Unicode - v143 + v145 Application false true Unicode - v143 + v145 Application true Unicode - v143 + v145 Application true Unicode - v143 + v145 Application false true Unicode - v143 + v145 Application false true Unicode - v143 + v145