diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b20a1b00..ca466d78 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -28,7 +28,7 @@ jobs: languages: cpp - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v1 with: msbuild-architecture: x64 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index fff94a13..f2f93327 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -44,7 +44,7 @@ jobs: run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v1 - name: Build with Coverity run: | diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index ed189fd2..5b4a2cfb 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -60,13 +60,17 @@ jobs: - name: Set ALPHA id: set_alpha + shell: bash if: ${{ !startsWith(github.ref, 'refs/tags/') }} - run: echo "::set-output name=option::--enable-alpha" + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: echo "option=--enable-alpha" >> $GITHUB_OUTPUT - name: Set BETA id: set_beta + shell: bash if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }} - run: echo "::set-output name=option::--enable-beta" + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: echo "option=--enable-beta" >> $GITHUB_OUTPUT - name: Build run: | diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml index 4187f8be..56ff170b 100644 --- a/.github/workflows/vs2022.yml +++ b/.github/workflows/vs2022.yml @@ -45,19 +45,23 @@ jobs: submodules: recursive - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v1 with: msbuild-architecture: x64 - name: Set ALPHA id: set_alpha + shell: bash if: ${{ !startsWith(github.ref, 'refs/tags/') }} - run: echo "::set-output name=option::/DALPHA" + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: echo "option=/DALPHA" >> $GITHUB_OUTPUT - name: Set BETA id: set_beta + shell: bash if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }} - run: echo "::set-output name=option::/DBETA" + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: echo "option=/DBETA" >> $GITHUB_OUTPUT - name: Build shell: cmd diff --git a/src/format.c b/src/format.c index ee40fd06..238b7d0d 100644 --- a/src/format.c +++ b/src/format.c @@ -1447,7 +1447,7 @@ DWORD WINAPI FormatThread(void* param) // Find out if we need to add any extra partitions if ((windows_to_go) && (target_type == TT_UEFI) && (partition_type == PARTITION_STYLE_GPT)) // According to Microsoft, every GPT disk (we RUN Windows from) must have an MSR due to not having hidden sectors - // http://msdn.microsoft.com/en-us/library/windows/hardware/dn640535.aspx#gpt_faq_what_disk_require_msr + // https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/windows-and-gpt-faq#disks-that-require-an-msr extra_partitions = XP_ESP | XP_MSR; else if ( ((fs_type == FS_NTFS) || (fs_type == FS_EXFAT)) && ((boot_type == BT_UEFI_NTFS) || ((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) && diff --git a/src/rufus.rc b/src/rufus.rc index 98b3191f..0d5fe122 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.1952" +CAPTION "Rufus 3.22.1953" 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,1952,0 - PRODUCTVERSION 3,22,1952,0 + FILEVERSION 3,22,1953,0 + PRODUCTVERSION 3,22,1953,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.1952" + VALUE "FileVersion", "3.22.1953" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2022 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.1952" + VALUE "ProductVersion", "3.22.1953" END END BLOCK "VarFileInfo"