Skip to content

Commit fcc7aa0

Browse files
WardenGnawWardenGnaw
authored
Merge pull request #1535 from microsoft/main
Merge 'main' into 'release-cpptools'
2 parents 7a111c9 + edfe8eb commit fcc7aa0

File tree

55 files changed

+757
-3370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+757
-3370
lines changed

‎.github/workflows/Build-And-Test.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
path: ${{ github.workspace }}/bin/DebugAdapterProtocolTests/Debug/CppTests/results.trx
151151

152152
osx_build:
153-
runs-on: macos-12
153+
runs-on: macos-latest
154154
steps:
155155
- name: Checkout
156156
uses: actions/checkout@v4
@@ -168,8 +168,10 @@ jobs:
168168
- run: |
169169
${{ github.workspace }}/eng/Scripts/CI-Build.sh
170170
171-
- run: |
172-
${{ github.workspace }}/eng/Scripts/CI-Test.sh
171+
# Disabling lldb-mi tests since DownloadLldbMI.sh will obtain
172+
# an x64 version instead of an arm64 and test will fail.
173+
# - run: |
174+
# ${{ github.workspace }}/eng/Scripts/CI-Test.sh
173175

174176
- name: 'Upload Test Results'
175177
uses: actions/upload-artifact@v4

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ This repo also includes:
2121

2222
### Debug Multiple Platforms
2323

24-
* Support for debugging C/C++ on [Android](http://blogs.msdn.com/b/vcblog/archive/2014/12/12/debug-jni-android-applications-using-visual-c-cross-platform-mobile.aspx) and [iOS](http://blogs.msdn.com/b/vcblog/archive/2015/04/29/debugging-c-code-on-ios-with-visual-studio-2015.aspx).
25-
* Debug on any platform that supports GDB, such as Linux and even [Raspberry Pi](http://blogs.msdn.com/b/vcblog/archive/2015/04/29/debug-c-code-on-linux-from-visual-studio.aspx).
24+
* Support for debugging C/C++ on [Android](http://blogs.msdn.com/b/vcblog/archive/2014/12/12/debug-jni-android-applications-using-visual-c-cross-platform-mobile.aspx) ~~and [iOS](http://blogs.msdn.com/b/vcblog/archive/2015/04/29/debugging-c-code-on-ios-with-visual-studio-2015.aspx).~~
25+
* Note: iOS support is not available after Visual Studio 2022.
26+
* * Debug on any platform that supports GDB, such as Linux and even [Raspberry Pi](http://blogs.msdn.com/b/vcblog/archive/2015/04/29/debug-c-code-on-linux-from-visual-studio.aspx).
2627

2728
### Prerequisites
2829
MIEngine can be built with either [Visual Studio](https://visualstudio.microsoft.com/downloads/) or with the [.NET CLI](https://dotnet.microsoft.com/download/dotnet).

‎build/Analyzers.targets‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<!-- Disable Legacy FxCop -->
4-
<RunCodeAnalysis>false</RunCodeAnalysis>
53
<EnableNETAnalyzers>true</EnableNETAnalyzers>
64

75
<!-- Point to ruleset -->
86
<CodeAnalysisRuleSet>..\IDECodeAnalysis.ruleset</CodeAnalysisRuleSet>
97
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" PrivateAssets="all" />
14-
<PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="3.3.0" PrivateAssets="all" />
15-
<PackageReference Include="Microsoft.NetCore.Analyzers" Version="3.3.0" PrivateAssets="all" />
16-
<PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.3.0" PrivateAssets="all" />
17-
</ItemGroup>
188
</Project>

‎build/package_versions.settings.targets‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
4-
<Microsoft_VisualStudio_Interop_Version>17.11.40262</Microsoft_VisualStudio_Interop_Version>
4+
<Microsoft_VisualStudio_Interop_Version>17.13.40008</Microsoft_VisualStudio_Interop_Version>
55
<Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
6-
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
6+
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.14.10225.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
77

88
<!-- Test Packages -->
99
<Microsoft_NET_Test_Sdk_Version>16.7.1</Microsoft_NET_Test_Sdk_Version>
10-
<xunit_Version>2.4.1</xunit_Version>
11-
<xunit_runner_visualstudio_Version>2.4.3</xunit_runner_visualstudio_Version>
10+
<xunit_Version>2.9.2</xunit_Version>
11+
<xunit_runner_visualstudio_Version>3.0.0</xunit_runner_visualstudio_Version>
1212
<coverlet_collector_Version>1.3.0</coverlet_collector_Version>
1313
<MSTest_TestFramework_Version>2.1.2</MSTest_TestFramework_Version>
1414

@@ -25,19 +25,19 @@
2525
<Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
2626
<Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
2727
<Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
28-
<Microsoft_VisualStudio_Shell_15_0_Version>17.11.40262</Microsoft_VisualStudio_Shell_15_0_Version>
29-
<Microsoft_VisualStudio_Shell_Framework_Version>17.11.40262</Microsoft_VisualStudio_Shell_Framework_Version>
30-
<Microsoft_VisualStudio_Threading_Version>17.11.20</Microsoft_VisualStudio_Threading_Version>
31-
<Microsoft_VisualStudio_Utilities_Version>17.11.40262</Microsoft_VisualStudio_Utilities_Version>
28+
<Microsoft_VisualStudio_Shell_15_0_Version>17.12.40392</Microsoft_VisualStudio_Shell_15_0_Version>
29+
<Microsoft_VisualStudio_Shell_Framework_Version>17.13.40008</Microsoft_VisualStudio_Shell_Framework_Version>
30+
<Microsoft_VisualStudio_Threading_Version>17.13.2</Microsoft_VisualStudio_Threading_Version>
31+
<Microsoft_VisualStudio_Utilities_Version>17.13.40008</Microsoft_VisualStudio_Utilities_Version>
3232
<Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
3333
<Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
3434
<Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
35-
<Microsoft_VisualStudio_TextManager_Interop_Version>17.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
35+
<Microsoft_VisualStudio_TextManager_Interop_Version>17.13.40008</Microsoft_VisualStudio_TextManager_Interop_Version>
3636
<Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
3737
<System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>
3838

3939
<!-- For Component Governance -->
4040
<Microsoft_IO_Redist_Version>6.0.1</Microsoft_IO_Redist_Version>
41-
<System_Text_Json_Version>8.0.4</System_Text_Json_Version>
41+
<System_Text_Json_Version>8.0.5</System_Text_Json_Version>
4242
</PropertyGroup>
4343
</Project>

‎eng/pipelines/VS-release.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
---
22
name: $(Date:yyyMMdd).$(Rev:r)
33

4+
trigger:
5+
branches:
6+
include:
7+
- release_mdd
8+
49
variables:
510
- name: TeamName
611
value: MDDDebugger
@@ -34,7 +39,11 @@ extends:
3439
mb:
3540
signing:
3641
enabled: true
37-
signType: real
42+
${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
43+
signType: real
44+
signWithProd: true
45+
${{ else }}:
46+
signType: test
3847
zipSources: false
3948
localization:
4049
enabled: true
@@ -59,7 +68,7 @@ extends:
5968
Write-Host "##vso[task.setvariable variable=MDDPackageVersion;]$version"
6069
displayName: 'Set MDDPackage Version'
6170
62-
- task: ms-vseng.MicroBuildShipTasks.55100717-a81d-45ea-a363-b8fe3ec375ad.MicroBuildInsertVsPayload@4
71+
- task: ms-vseng.MicroBuildShipTasks.55100717-a81d-45ea-a363-b8fe3ec375ad.MicroBuildInsertVsPayload@5
6372
displayName: 'Insert VS Payload'
6473
inputs:
6574
TargetBranch: $(TargetBranch)
@@ -68,6 +77,6 @@ extends:
6877
DefaultConfigValues: 'VS.Redist.Debugger.MDD.MIEngine=$(MDDPackageVersion)'
6978
RevisionTextFiles: 'src/SetupPackages/VC/IDE/MDD/core/revision.txt,src/SetupPackages/VC/IDE/MDD/res/revision.txt'
7079
InsertionPayloadName: 'MIEngine $(MDDPackageVersion)'
71-
InsertionDescription: 'Updating MIEngine to $(MDDPackageVersion). See $(Release.Artifacts.MIEngine_MDD.BuildURI)'
80+
InsertionDescription: 'Updating MIEngine to $(MDDPackageVersion).'
7281
InsertionReviewers: $(InsertionReviewers)
7382
...

‎eng/pipelines/VSCode-release.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
---
22
name: $(Date:yyyMMdd).$(Rev:r)
33

4+
trigger:
5+
branches:
6+
include:
7+
- release-cpptools
8+
49
variables:
510
- name: TeamName
611
value: MDDDebugger
@@ -33,7 +38,11 @@ extends:
3338
mb:
3439
signing:
3540
enabled: true
36-
signType: real
41+
${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
42+
signType: real
43+
signWithProd: true
44+
${{ else }}:
45+
signType: test
3746
zipSources: false
3847
localization:
3948
enabled: true

‎eng/pipelines/resources/TSAConfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"notificationAliases": ["vsdbgnft@microsoft.com"],
44
"instanceUrl": "https://devdiv.visualstudio.com",
55
"projectName": "DevDiv",
6-
"areaPath": "DevDiv\\VS Diagnostics\\Debugger - XPlat\\Cpp",
6+
"areaPath": "DevDiv\\VS Diagnostics\\Debugger\\VSCode and XPlat\\Cpp",
77
"iterationPath": "DevDiv",
88
"allTools": true
99
}

‎eng/pipelines/templates/DebuggerTesting-release.template.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ steps:
2929
TargetFolders: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
3030

3131
- template: ../steps/CopyAndPublishSymbols.yml
32+
parameters:
33+
SourceFolder: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
3234

3335
- template: ../tasks/PublishPipelineArtifact.yml
3436
parameters:

‎loc/MIDebugEngine.lsproj‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)