diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 4e495a6..10cfec6 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -6,7 +6,6 @@ on: pull_request: branches: [ "main" ] - permissions: contents: read @@ -47,11 +46,10 @@ jobs: name: shell-${{matrix.platform}} path: | ${{env.BIN_PATH}}\* - !${{env.BIN_PATH}}\${{matrix.platform}}\*.lib - !${{env.BIN_PATH}}\${{matrix.platform}}\*.exp - !${{env.BIN_PATH}}\${{matrix.platform}}\ca.dll + !${{env.BIN_PATH}}\*.lib + !${{env.BIN_PATH}}\*.exp !${{env.BIN_PATH}}\*.wixpdb - !${{env.BIN_PATH}}\debug.cmd + !${{env.BIN_PATH}}\ca.dll if-no-files-found: warn retention-days: 0 compression-level: 6 diff --git a/src/bin/debug.cmd b/src/bin/debug.cmd deleted file mode 100644 index 59fb143..0000000 --- a/src/bin/debug.cmd +++ /dev/null @@ -1,53 +0,0 @@ -@echo off -title dija debug -cls -set TH=%time:~0,2% -set TM=%time:~3,2% -set TS=%time:~6,2% - -set MM=%date:~4,2% -set DD=%date:~7,2% -set YYYY=%date:~10,4% - -set PLATFORM=x64 - -set dt=%YYYY%%MM%%DD%%TH%%TM%%TS% -set build=%YYYY%%MM%%DD% - -:: Validate administrative permissions... -:: https://stackoverflow.com/questions/4051883/batch-script-how-to-check-for-admin-rights -::echo Administrative permissions required for unregistering the Shell Extension. -:: Unregistering the Shell Extension. -::echo Proceeding with the Shell Extension unregistration. -echo. -echo Shell version 1.9 build 19 %date% %time% -echo. - -cd /d %~dp0 - -IF EXIST "%PLATFORM%\shell.dll" ( - - IF EXIST "shell.dll" ( - move "shell.dll" "deleted\shell-%dt%.dll" >nul - ) - - copy /Y "%PLATFORM%\shell.dll" "shell.dll" >nul - - IF EXIST "%PLATFORM%\shell.exe" ( - copy /Y "%PLATFORM%\shell.exe" "shell.exe" >nul - timeout 1 >nul - ) - - shell.exe -restart - - IF EXIST "shell.log" ( - del /s /q "shell.log" >nul - ) - - timeout 2 >nul - - del deleted\*.dll>nul - - rem start %~dp0 -) - diff --git a/src/dll/Shell.vcxproj b/src/dll/Shell.vcxproj index b980feb..2b17f61 100644 --- a/src/dll/Shell.vcxproj +++ b/src/dll/Shell.vcxproj @@ -25,7 +25,7 @@ shell .dll false - $(SolutionDir)bin\$(Platform.ToLower().Replace('win32', 'x86'))\ + $(SolutionDir)bin\ $(ProjectDir)obj\$(Configuration.ToLower())\ DynamicLibrary v143 diff --git a/src/exe/exe.vcxproj b/src/exe/exe.vcxproj index 512b660..189f153 100644 --- a/src/exe/exe.vcxproj +++ b/src/exe/exe.vcxproj @@ -27,7 +27,7 @@ Application v143 Unicode - $(SolutionDir)bin\$(Platform.ToLower().Replace('win32', 'x86'))\ + $(SolutionDir)bin\ $(ProjectDir)obj\$(Configuration.ToLower())\ false diff --git a/src/setup/ca/ca.vcxproj b/src/setup/ca/ca.vcxproj index 8c36c71..afb34fb 100644 --- a/src/setup/ca/ca.vcxproj +++ b/src/setup/ca/ca.vcxproj @@ -22,7 +22,7 @@ ca.def WiX Toolset CustomAction 10.0 - $(SolutionDir)bin\$(Platform.ToLower().Replace('win32', 'x86'))\ + $(SolutionDir)bin\\ $(ProjectDir)obj\$(Configuration.ToLower())\ diff --git a/src/setup/wix/setup.wxs b/src/setup/wix/setup.wxs index 380ab15..8abefce 100644 --- a/src/setup/wix/setup.wxs +++ b/src/setup/wix/setup.wxs @@ -8,7 +8,6 @@ -