From 0cd336d1d91d39a4f2afc7a36b04f8cbc0812e46 Mon Sep 17 00:00:00 2001 From: Pavel Minaev Date: Wed, 13 Dec 2023 14:28:15 -0800 Subject: [PATCH 1/2] Fix linker flags for attach-to-process binaries to comply with APIScan requirements. --- .../windows/compile_windows.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat index 1fb8a2274..a7f313531 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/windows/compile_windows.bat @@ -8,29 +8,29 @@ setlocal call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86 -vcvars_spectre_libs=spectre -cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:attach_x86.dll +cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_x86.dll copy attach_x86.dll ..\attach_x86.dll /Y copy attach_x86.pdb ..\attach_x86.pdb /Y -cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_32 /Qspectre run_code_on_dllmain.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:run_code_on_dllmain_x86.dll +cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_32 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /out:run_code_on_dllmain_x86.dll copy run_code_on_dllmain_x86.dll ..\run_code_on_dllmain_x86.dll /Y copy run_code_on_dllmain_x86.pdb ..\run_code_on_dllmain_x86.pdb /Y -cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_x86.exe +cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_x86.exe copy inject_dll_x86.exe ..\inject_dll_x86.exe /Y copy inject_dll_x86.pdb ..\inject_dll_x86.pdb /Y call "%VSDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 -vcvars_spectre_libs=spectre -cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:attach_amd64.dll +cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /Qspectre attach.cpp /link /PROFILE /GUARD:CF /out:attach_amd64.dll copy attach_amd64.dll ..\attach_amd64.dll /Y copy attach_amd64.pdb ..\attach_amd64.pdb /Y -cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_64 /Qspectre run_code_on_dllmain.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:run_code_on_dllmain_amd64.dll +cl -DUNICODE -D_UNICODE /EHsc /Zi /O1 /W3 /LD /MD /D BITS_64 /Qspectre run_code_on_dllmain.cpp /link /PROFILE /GUARD:CF /out:run_code_on_dllmain_amd64.dll copy run_code_on_dllmain_amd64.dll ..\run_code_on_dllmain_amd64.dll /Y copy run_code_on_dllmain_amd64.pdb ..\run_code_on_dllmain_amd64.pdb /Y -cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_amd64.exe +cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /DEBUG /OPT:REF /OPT:ICF /GUARD:CF /out:inject_dll_amd64.exe copy inject_dll_amd64.exe ..\inject_dll_amd64.exe /Y copy inject_dll_amd64.pdb ..\inject_dll_amd64.pdb /Y From 60d9d486905b15dcf2994feb1cb5ea67fce3784a Mon Sep 17 00:00:00 2001 From: Pavel Minaev Date: Wed, 13 Dec 2023 16:25:09 -0800 Subject: [PATCH 2/2] Fix ruff command line arguments. --- azure-pipelines/pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/pipelines.yaml b/azure-pipelines/pipelines.yaml index 4a28e2a18..13e9f70ae 100644 --- a/azure-pipelines/pipelines.yaml +++ b/azure-pipelines/pipelines.yaml @@ -39,7 +39,7 @@ jobs: - script: "python3 -m pip install -U ruff" displayName: "Install ruff" - - script: "python3 -m ruff check --format=junit --output-file=$(Build.ArtifactStagingDirectory)/lint-ruff.xml ." + - script: "python3 -m ruff check --output-format=junit --output-file=$(Build.ArtifactStagingDirectory)/lint-ruff.xml ." displayName: "Run ruff" - task: "PublishTestResults@2"