From 40fdcd07c5b3d0bb61d8940b4c5c97505ffb3409 Mon Sep 17 00:00:00 2001 From: Gregg Miskelly Date: Fri, 27 Sep 2024 11:55:34 -0700 Subject: [PATCH 1/2] Fix VS Code Builds (#1475) The MIEngine_VSCode_Release pipeline was failing. This addresses it. Fix was authored by Andrew Wang --- eng/Scripts/CI-Build.ps1 | 2 +- eng/pipelines/steps/CopyAndPublishSymbols.yml | 5 +++-- eng/pipelines/templates/VSCode-release.template.yml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Scripts/CI-Build.ps1 b/eng/Scripts/CI-Build.ps1 index 4347ebcb7..9c47c0293 100644 --- a/eng/Scripts/CI-Build.ps1 +++ b/eng/Scripts/CI-Build.ps1 @@ -3,7 +3,7 @@ param( [Alias("c")] [string]$Configuration="Debug", -[ValidateSet("win-x86", "win10-arm64")] +[ValidateSet("win-x86", "win-arm64")] [Alias("r")] [string]$RID="win-x86", diff --git a/eng/pipelines/steps/CopyAndPublishSymbols.yml b/eng/pipelines/steps/CopyAndPublishSymbols.yml index 1788f9695..faa7a2121 100644 --- a/eng/pipelines/steps/CopyAndPublishSymbols.yml +++ b/eng/pipelines/steps/CopyAndPublishSymbols.yml @@ -2,13 +2,14 @@ --- parameters: OneESPT: false + SourceFolder: '$(Build.StagingDirectory)\drop' steps: - template: ../tasks/CopyFiles.yml parameters: displayName: 'Collect build symbols' - SourceFolder: '$(Build.StagingDirectory)\drop' - Contents: '$(Build.StagingDirectory)\drop\**\*.+(pdb|exe|dll)' + SourceFolder: ${{ parameters.SourceFolder }} + Contents: '${{ parameters.SourceFolder }}\**\*.+(pdb|exe|dll)' TargetFolder: '$(Build.ArtifactStagingDirectory)/symbols' CleanTargetFolder: true diff --git a/eng/pipelines/templates/VSCode-release.template.yml b/eng/pipelines/templates/VSCode-release.template.yml index 061e08130..3fafe6094 100644 --- a/eng/pipelines/templates/VSCode-release.template.yml +++ b/eng/pipelines/templates/VSCode-release.template.yml @@ -1,6 +1,6 @@ --- parameters: - rids: ["win-x86", "win10-arm64", "osx-x64", "osx-arm64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ] + rids: ["win-x86", "win-arm64", "osx-x64", "osx-arm64", "linux-x64", "linux-arm", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ] steps: - checkout: self @@ -28,6 +28,7 @@ steps: - template: ../steps/CopyAndPublishSymbols.yml parameters: + SourceFolder: '$(Build.StagingDirectory)\bin' OneESPT: true - script: | From 074837ed159e41a3e550b41eb99cdc22d97ab519 Mon Sep 17 00:00:00 2001 From: Gregg Miskelly Date: Fri, 27 Sep 2024 12:57:41 -0700 Subject: [PATCH 2/2] Ship signed version of Newtonsoft.Json.dll (#1474) The packages that ship MIEngine with the C++ extension didn't include the signed version of Newtonsoft.Json.dll. This fixes it so they do. --- eng/pipelines/steps/PublishOpenDebugAD7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/steps/PublishOpenDebugAD7.yml b/eng/pipelines/steps/PublishOpenDebugAD7.yml index 094cbf4d5..4e1d42c67 100644 --- a/eng/pipelines/steps/PublishOpenDebugAD7.yml +++ b/eng/pipelines/steps/PublishOpenDebugAD7.yml @@ -8,6 +8,7 @@ steps: dotnet publish $(Build.SourcesDirectory)\src\OpenDebugAD7\OpenDebugAD7.csproj -c ${{ parameters.Configuration }} -r ${{ parameters.RuntimeID }} --self-contained -o $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\OpenDebugAD7.dll "$(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\. copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\Microsoft.DebugEngineHost.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\. + copy ${{ parameters.SignedBinariesFolder }}\Release\vscode\Newtonsoft.Json.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\. copy ${{ parameters.SignedBinariesFolder }}\Release\Microsoft.MIDebugEngine.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\. copy ${{ parameters.SignedBinariesFolder }}\Release\Microsoft.MICore.dll $(Build.StagingDirectory)\${{ parameters.RuntimeID }}\debugAdapters\bin\. displayName: "Publish OpenDebugAD7 ${{ parameters.RuntimeID }}"