diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 524d329..3e050d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,7 @@ jobs: working-directory: build/Release if: github.ref == 'refs/heads/master' && github.event.inputs.ref == '' run: | - MY_STRING=$(./ep_generate_release_description.exe ${{ steps.vars.outputs.sha_short }} ${{ steps.vars.outputs.branch }}) + MY_STRING=$(./ep_generate_release_description.exe ${{ steps.vars.outputs.sha_short }} ${{ steps.vars.outputs.branch }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) MY_STRING="${MY_STRING//'%'/'%25'}" MY_STRING="${MY_STRING//$'\n'/'%0A'}" MY_STRING="${MY_STRING//$'\r'/'%0D'}" diff --git a/ep_generate_release_description/ep_generate_release_description.c b/ep_generate_release_description/ep_generate_release_description.c index 288cc29..800a2d3 100644 --- a/ep_generate_release_description/ep_generate_release_description.c +++ b/ep_generate_release_description/ep_generate_release_description.c @@ -57,12 +57,14 @@ int main(int argc, char** argv) free(line); printf( "Please consult the [README](https://github.com/valinet/ExplorerPatcher/blob/master/README.md) for more details.\n" - "A detailed change log is available [here](https://github.com/valinet/ExplorerPatcher/blob/master/CHANGELOG.md).\n\n" + "A detailed change log is available [here](https://github.com/valinet/ExplorerPatcher/blob/master/CHANGELOG.md).\n" + "An archive containing all the files generated during the build process (including `dxgi.dll` and symbol files) is available [here](%s).\n\n" "*This release has been published automatically from %s %s in branch [%s](https://github.com/valinet/ExplorerPatcher/tree/%s/).*", - argc == 3 ? "commits up to and including" : "the latest commits", - argc == 3 ? argv[1] : "", - argc == 3 ? argv[2] : "master", - argc == 3 ? argv[2] : "master" + argv == 4 ? argv[3] : "https://github.com/valinet/ExplorerPatcher/actions", + argc == 4 ? "commits up to and including" : "the latest commits", + argc == 4 ? argv[1] : "", + argc == 4 ? argv[2] : "master", + argc == 4 ? argv[2] : "master" ); fclose(f); } diff --git a/ep_generate_release_description/ep_generate_release_description.vcxproj b/ep_generate_release_description/ep_generate_release_description.vcxproj index 5ffa01d..5f684cd 100644 --- a/ep_generate_release_description/ep_generate_release_description.vcxproj +++ b/ep_generate_release_description/ep_generate_release_description.vcxproj @@ -157,9 +157,6 @@ - - - diff --git a/ep_generate_release_description/ep_generate_release_description.vcxproj.filters b/ep_generate_release_description/ep_generate_release_description.vcxproj.filters index 43b78f3..53534d1 100644 --- a/ep_generate_release_description/ep_generate_release_description.vcxproj.filters +++ b/ep_generate_release_description/ep_generate_release_description.vcxproj.filters @@ -35,7 +35,4 @@ Resource Files - - - \ No newline at end of file diff --git a/ep_setup/ep_setup.c b/ep_setup/ep_setup.c index 8aa765c..4b1b9e4 100644 --- a/ep_setup/ep_setup.c +++ b/ep_setup/ep_setup.c @@ -502,14 +502,14 @@ int WINAPI wWinMain( { MessageBoxW( NULL, - L"An error has occured while servicing this product.\n" - L"Most likely, this is caused by one or more of the backup files still being in use (from" - L"a previous update). Unlocking the files will most likely fix this issue.\n\n" + L"An error has occurred while servicing this product.\n" + L"This is most likely caused by one or more of the backup files from a previous update still being in use. " + L"Unlocking the files will most likely fix this issue.\n\n" L"Troubleshooting steps:\n" - L"* Close and reopen the \"Properties\" dialog, if you have it currently open.\n" + L"* Close and reopen the \"Properties\" dialog if it is currently open.\n" L"* Kill and restart all \"explorer.exe\" processes.\n" - L"* If you have registered this as shell extension, restarting the computer will probably fix this.\n" - L"* After everything else, reboot the computer and try again.", + L"* If you have registered this application as a shell extension, then restarting the computer will probably fix this.\n" + L"* Lastly, reboot the computer and try this operation again.", _T(PRODUCT_NAME), MB_ICONERROR | MB_OK | MB_DEFBUTTON1 );