Skip to content

Commit

Permalink
Merge main into release-cpptools (#1476)
Browse files Browse the repository at this point in the history
This merge two build fixes into release-cpptools
  • Loading branch information
gregg-miskelly authored Sep 27, 2024
2 parents 5513e19 + 074837e commit 7a111c9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion eng/Scripts/CI-Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down
5 changes: 3 additions & 2 deletions eng/pipelines/steps/CopyAndPublishSymbols.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/steps/PublishOpenDebugAD7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/templates/VSCode-release.template.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -28,6 +28,7 @@ steps:

- template: ../steps/CopyAndPublishSymbols.yml
parameters:
SourceFolder: '$(Build.StagingDirectory)\bin'
OneESPT: true

- script: |
Expand Down

0 comments on commit 7a111c9

Please sign in to comment.