Skip to content

Merge 'main' into 'release/cpptools' #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WardenGnaw merged 5 commits into from
Feb 3, 2026
Merged

Merge 'main' into 'release/cpptools' #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac2ac74
Disable SBOM for non-folder publish and fix SymbolUpload Warning (#1540)
WardenGnaw Jan 20, 2026
f5d2dfb
Update BasicCallStack Test Frame lines for CppVsDbg (#1541)
WardenGnaw Jan 28, 2026
454c3e2
Refactor DebuggerTesting pipeline for 1ES Compliance (#1542)
WardenGnaw Jan 28, 2026
c427f6f
DebuggerTesting-Release updates (#1543)
WardenGnaw Feb 2, 2026
4212dea
Remove branch trigger and CI check for releases (#1544)
WardenGnaw Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions eng/pipelines/DebuggerTesting-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,42 @@
---
name: $(Date:yyyMMdd).$(Rev:r)

variables:
- name: SignType
value: test
- name: TeamName
value: MDDDebugger
jobs:
- template: ./jobs/VSEngSS-MicroBuild2022-1ES.job.yml

resources:
repositories:
- repository: MicroBuildTemplate
type: git
name: 1ESPipelineTemplates/MicroBuildTemplate
ref: refs/tags/release

extends:
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
parameters:
DisplayName: DebuggerTesting
JobTemplate:
- template: ../templates/DebuggerTesting-release.template.yml
pool:
name: VSEngSS-MicroBuild2022-1ES
os: windows
sdl:
sourceAnalysisPool:
name: VSEngSS-MicroBuild2022-1ES
os: windows
stages:
- stage: DebuggerTesting
jobs:
- job:
displayName: Windows
timeoutInMinutes: 180
cancelTimeoutInMinutes: 1
templateContext:
mb:
signing:
enabled: true
signType: test
zipSources: false
localization:
enabled: true
steps:
- template: /eng/pipelines/templates/DebuggerTesting-release.template.yml@self
...
12 changes: 3 additions & 9 deletions eng/pipelines/VS-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
---
name: $(Date:yyyMMdd).$(Rev:r)

trigger:
branches:
include:
- release_mdd
trigger: none

variables:
- name: TeamName
Expand Down Expand Up @@ -39,11 +36,8 @@ extends:
mb:
signing:
enabled: true
${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
signType: real
signWithProd: true
${{ else }}:
signType: test
signType: real
signWithProd: true
zipSources: false
localization:
enabled: true
Expand Down
12 changes: 3 additions & 9 deletions eng/pipelines/VSCode-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
---
name: $(Date:yyyMMdd).$(Rev:r)

trigger:
branches:
include:
- release-cpptools
trigger: none

variables:
- name: TeamName
Expand Down Expand Up @@ -38,11 +35,8 @@ extends:
mb:
signing:
enabled: true
${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
signType: real
signWithProd: true
${{ else }}:
signType: test
signType: real
signWithProd: true
zipSources: false
localization:
enabled: true
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/steps/BuildSolution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ steps:
artifactName: '${{ parameters.Configuration }}_binlog'
condition: ne(variables['System.Debug'], '')
OneESPT: ${{ parameters.OneESPT }}
sbomEnabled: false # Disable SBOM for binlogs

- template: ../tasks/1ES/PublishPipelineArtifact.yml
parameters:
Expand All @@ -47,4 +48,5 @@ steps:
artifactName: '${{ parameters.Configuration }}_debug_bin'
condition: ne(variables['System.Debug'], '')
OneESPT: ${{ parameters.OneESPT }}
sbomEnabled: false # Disable SBOM for binaries for System.Debug runs
...
2 changes: 1 addition & 1 deletion eng/pipelines/steps/CopyAndPublishSymbols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\Symbols\'
ExcludeAgentFolders: '$(Build.ArtifactStagingDirectory)\Symbols\Debug;$(Build.ArtifactStagingDirectory)\Symbols\Lab.Debug'
${{ if parameters.OneESPT }}:
ExpirationInDays: 3650 # Expire in 10 years for release builds
ExpirationInDays: 5475 # Expire in 10 years for release builds
${{ else }}:
ExpirationInDays: 1 # Expire in 1 day if used for testing
env:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/steps/PublishOpenDebugAD7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ steps:
targetPath: '$(Build.StagingDirectory)\zips\${{ parameters.RuntimeID }}.zip'
artifactName: '${{ parameters.RuntimeID }}_zip'
OneESPT: true
sbomEnabled: false # Disable SBOM for zipped files
1 change: 1 addition & 0 deletions eng/pipelines/steps/PublishVSPackages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ steps:
targetPath: '$(Build.SourcesDirectory)\obj\Lab.Release\NugetPackageVersion.txt'
artifactName: 'PackageVersion'
OneESPT: true
sbomEnabled: false # Disable SBOM for version file

- task: CopyFiles@2
inputs:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/tasks/1ES/PublishPipelineArtifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ parameters:
artifactName: 'drop'
condition: 'succeeded()'
OneESPT: false # Indicates that this is running under the 1ES Pipeline Template
sbomEnabled: true

steps:
- ${{ if eq(parameters['OneESPT'], true) }}:
Expand All @@ -13,6 +14,7 @@ steps:
inputs:
targetPath: ${{ parameters.targetPath }}
artifactName: '${{ parameters.artifactName }}'
sbomEnabled: ${{ parameters.sbomEnabled }}
condition: ${{ parameters.condition }}
- ${{ else }}:
- template: ../PublishPipelineArtifact.yml
Expand Down
28 changes: 23 additions & 5 deletions eng/pipelines/templates/DebuggerTesting-release.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ steps:

- template: ../tasks/NuGetToolInstaller.yml

- template: ../tasks/MicroBuildSigningPlugin.yml

- template: ../tasks/NuGetCommand.yml
parameters:
Command: 'restore'
Expand All @@ -21,7 +19,7 @@ steps:
configuration: 'Release'
msbuildArguments: /p:NuGetPath=$(NuGetExeToolPath) /p:NuGetPrerelease=false
env: {
"SIGN_TYPE": "$(SignType)"
"SIGN_TYPE": "real"
}

- template: ../tasks/SignVerify.yml
Expand All @@ -31,12 +29,32 @@ steps:
- template: ../steps/CopyAndPublishSymbols.yml
parameters:
SourceFolder: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
OneESPT: true

- template: ../tasks/PublishPipelineArtifact.yml
- template: ../tasks/1ES/PublishPipelineArtifact.yml
parameters:
displayName: 'Publish Nupkgs'
path: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
targetPath: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
artifactName: 'nupkgs'
OneESPT: true

- task: 1ES.PublishNuget@1
displayName: 'NuGet push'
inputs:
packageParentPath: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop\'
packagesToPush: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop\*.nupkg'
publishVstsFeed: 'cf33e8db-bbb9-4205-82ee-e1cd159cce99'

# Retain the pipeline run for 2 years so we can compare future builds against it
- powershell: |
$contentType = 'application/json';
$headers = @{ Authorization = 'Bearer $(System.AccessToken)' };
$rawRequest = @{ daysValid = 365 * 2; definitionId = $(System.DefinitionId); ownerId = 'User:$(Build.RequestedForId)'; protectPipeline = $false; runId = $(Build.BuildId) };
$request = ConvertTo-Json @($rawRequest);
Write-Host $request
$uri = "$(System.CollectionUri)$(System.TeamProject)/_apis/build/retention/leases?api-version=6.0-preview.1";
Invoke-RestMethod -uri $uri -method POST -Headers $headers -ContentType $contentType -Body $request;
displayName: Retain build

- template: ../tasks/MicroBuildCleanup.yml
...
1 change: 1 addition & 0 deletions eng/pipelines/templates/VSCode-codesign-osx.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ steps:
targetPath: '$(Pipeline.Workspace)/${{ rid }}.zip'
artifactName: 'unsigned_${{ rid }}_zip'
OneESPT: true
sbomEnabled: false # Disable SBOM for zipped files
...
1 change: 1 addition & 0 deletions eng/pipelines/templates/VSCode-esrp-sign-osx.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ steps:
targetPath: '$(Pipeline.Workspace)\Artifacts\${{ rid }}.zip'
artifactName: '${{ rid }}_zip'
OneESPT: true
sbomEnabled: false # Disable SBOM for zipped files
...
52 changes: 15 additions & 37 deletions test/CppTests/Tests/ExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,43 +523,21 @@ private static StackFrame[] GenerateFramesList(IDebuggerSettings debugger)
// VsDbg moves the stack pointer to the return address which is not necessarily the calling address
if (debugger.DebuggerType == SupportedDebugger.VsDbg)
{
// Visual C++ compiler for x64 and x86 generate symbols differently which means that the line numbers will be different.
if (debugger.DebuggeeArchitecture == SupportedArchitecture.x64)
{
return new[] {
new StackFrame(10, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(20, "func(", "expression.cpp", null),
new StackFrame(81, "Expression::checkCallStack(", "expression.cpp", null),
new StackFrame(74, "Expression::checkPrettyPrinting(", "expression.cpp", null),
new StackFrame(63, "Expression::checkSpecialValues(", "expression.cpp", null),
new StackFrame(53, "Expression::checkClassOnStackAndHeap(", "expression.cpp", null),
new StackFrame(40, "Expression::checkArrayAndPointers(", "expression.cpp", null),
new StackFrame(32, "Expression::checkPrimitiveTypes(", "expression.cpp", null),
new StackFrame(86, "Expression::CoreRun(", "expression.cpp", null),
new StackFrame(23, "Feature::Run(", "feature.cpp", null),
new StackFrame(45, "main", "main.cpp", null)
};
}
else
{
return new[] {
new StackFrame(10, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(19, "func(", "expression.cpp", null),
new StackFrame(81, "Expression::checkCallStack(", "expression.cpp", null),
new StackFrame(75, "Expression::checkPrettyPrinting(", "expression.cpp", null),
new StackFrame(63, "Expression::checkSpecialValues(", "expression.cpp", null),
new StackFrame(54, "Expression::checkClassOnStackAndHeap(", "expression.cpp", null),
new StackFrame(40, "Expression::checkArrayAndPointers(", "expression.cpp", null),
new StackFrame(32, "Expression::checkPrimitiveTypes(", "expression.cpp", null),
new StackFrame(86, "Expression::CoreRun(", "expression.cpp", null),
new StackFrame(23, "Feature::Run(", "feature.cpp", null),
new StackFrame(46, "main", "main.cpp", null)
};
}
return new[] {
new StackFrame(10, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(12, "accumulate(", "expression.cpp", null),
new StackFrame(19, "func(", "expression.cpp", null),
new StackFrame(80, "Expression::checkCallStack(", "expression.cpp", null),
new StackFrame(74, "Expression::checkPrettyPrinting(", "expression.cpp", null),
new StackFrame(62, "Expression::checkSpecialValues(", "expression.cpp", null),
new StackFrame(53, "Expression::checkClassOnStackAndHeap(", "expression.cpp", null),
new StackFrame(39, "Expression::checkArrayAndPointers(", "expression.cpp", null),
new StackFrame(31, "Expression::checkPrimitiveTypes(", "expression.cpp", null),
new StackFrame(85, "Expression::CoreRun(", "expression.cpp", null),
new StackFrame(22, "Feature::Run(", "feature.cpp", null),
new StackFrame(45, "main", "main.cpp", null)
};
}
else
{
Expand Down
Loading