diff --git a/appveyor.yml b/appveyor.yml index e19dca58..9b1103c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,7 @@ skip_commits: - '**/*.xml' environment: + COVERITY_SCAN_EMAIL: "pete@akeo.ie" COVERITY_SCAN_TOKEN: secure: XZADvwlRFo57sBA54pBH2oVT/eR/OytZYY/sCKq61io= global: @@ -80,7 +81,17 @@ build_script: return; } cov-build.exe --dir cov-int msbuild rufus.sln /m /p:Configuration=$env:CONFIGURATION,Platform=$env:PLATFORM /l:$APPVEYOR_LOGGER; - 7z a cov-int.zip cov-int - curl.exe --form token=$env:COVERITY_SCAN_TOKEN --form email=pete@akeo.ie --form file=cov-int.zip --form version="$env:APPVEYOR_BUILD_VERSION" --form description="Appveyor build" https://scan.coverity.com/builds?project=pbatard%2Frufus + 7z a -r cov-int.zip cov-int + $curlArguments = @( + '--form email=%COVERITY_SCAN_EMAIL%', + '--form token=%COVERITY_SCAN_TOKEN%', + '--form file=cov-int.zip', + '--form version="%APPVEYOR_BUILD_VERSION%"', + '--form description="Rufus"', + 'https://scan.coverity.com/builds?project=pbatard%2Frufus' + ) + $curlArgumentList = [System.Environment]::ExpandEnvironmentVariables($curlArguments) + # MUST use 'curl.exe' since 'curl' is a PowerShell alias to Invoke-Webrequest + curl.exe $curlArgumentList } } diff --git a/src/rufus.c b/src/rufus.c index 57e4a77a..171a0e30 100755 --- a/src/rufus.c +++ b/src/rufus.c @@ -22,7 +22,6 @@ #include #endif - #include #include #include diff --git a/src/rufus.rc b/src/rufus.rc index 206f9444..24afda2a 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.11.1680" +CAPTION "Rufus 3.11.1681" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,11,1680,0 - PRODUCTVERSION 3,11,1680,0 + FILEVERSION 3,11,1681,0 + PRODUCTVERSION 3,11,1681,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.11.1680" + VALUE "FileVersion", "3.11.1681" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.11.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.11.1680" + VALUE "ProductVersion", "3.11.1681" END END BLOCK "VarFileInfo"