Skip to content
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

Merge 'main' into 'release_mdd' #1486

Merged
merged 4 commits into from
Dec 27, 2024
Merged

Merge 'main' into 'release_mdd' #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15173ad
Archive drop folder and dont publish Symbol Folder (#1472)
WardenGnaw Sep 13, 2024
40fdcd0
Fix VS Code Builds (#1475)
gregg-miskelly Sep 27, 2024
074837e
Ship signed version of Newtonsoft.Json.dll (#1474)
gregg-miskelly Sep 27, 2024
4aef1f4
Merge pull request #1485 from microsoft/dev/waan/complianceFixes
WardenGnaw Dec 20, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/Build-And-Test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
path: ${{ github.workspace }}/bin/DebugAdapterProtocolTests/Debug/CppTests/results.trx

osx_build:
runs-on: macos-12
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -168,8 +168,10 @@ jobs:
- run: |
${{ github.workspace }}/eng/Scripts/CI-Build.sh
- run: |
${{ github.workspace }}/eng/Scripts/CI-Test.sh
# Disabling lldb-mi tests since DownloadLldbMI.sh will obtain
# an x64 version instead of an arm64 and test will fail.
# - run: |
# ${{ github.workspace }}/eng/Scripts/CI-Test.sh

- name: 'Upload Test Results'
uses: actions/upload-artifact@v4
Expand Down
10 changes: 0 additions & 10 deletions build/Analyzers.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Disable Legacy FxCop -->
<RunCodeAnalysis>false</RunCodeAnalysis>
<EnableNETAnalyzers>true</EnableNETAnalyzers>

<!-- Point to ruleset -->
<CodeAnalysisRuleSet>..\IDECodeAnalysis.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="3.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NetCore.Analyzers" Version="3.3.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.3.0" PrivateAssets="all" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions build/package_versions.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
<Microsoft_VisualStudio_Interop_Version>17.11.40262</Microsoft_VisualStudio_Interop_Version>
<Microsoft_VisualStudio_Interop_Version>17.12.40391</Microsoft_VisualStudio_Interop_Version>
<Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>

<!-- Test Packages -->
<Microsoft_NET_Test_Sdk_Version>16.7.1</Microsoft_NET_Test_Sdk_Version>
<xunit_Version>2.4.1</xunit_Version>
<xunit_runner_visualstudio_Version>2.4.3</xunit_runner_visualstudio_Version>
<xunit_Version>2.9.2</xunit_Version>
<xunit_runner_visualstudio_Version>3.0.0</xunit_runner_visualstudio_Version>
<coverlet_collector_Version>1.3.0</coverlet_collector_Version>
<MSTest_TestFramework_Version>2.1.2</MSTest_TestFramework_Version>

Expand All @@ -25,19 +25,19 @@
<Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
<Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
<Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
<Microsoft_VisualStudio_Shell_15_0_Version>17.11.40262</Microsoft_VisualStudio_Shell_15_0_Version>
<Microsoft_VisualStudio_Shell_Framework_Version>17.11.40262</Microsoft_VisualStudio_Shell_Framework_Version>
<Microsoft_VisualStudio_Threading_Version>17.11.20</Microsoft_VisualStudio_Threading_Version>
<Microsoft_VisualStudio_Utilities_Version>17.11.40262</Microsoft_VisualStudio_Utilities_Version>
<Microsoft_VisualStudio_Shell_15_0_Version>17.12.40392</Microsoft_VisualStudio_Shell_15_0_Version>
<Microsoft_VisualStudio_Shell_Framework_Version>17.12.40391</Microsoft_VisualStudio_Shell_Framework_Version>
<Microsoft_VisualStudio_Threading_Version>17.12.19</Microsoft_VisualStudio_Threading_Version>
<Microsoft_VisualStudio_Utilities_Version>17.12.40391</Microsoft_VisualStudio_Utilities_Version>
<Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
<Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
<Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
<Microsoft_VisualStudio_TextManager_Interop_Version>17.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
<Microsoft_VisualStudio_TextManager_Interop_Version>17.12.40391</Microsoft_VisualStudio_TextManager_Interop_Version>
<Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
<System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>

<!-- For Component Governance -->
<Microsoft_IO_Redist_Version>6.0.1</Microsoft_IO_Redist_Version>
<System_Text_Json_Version>8.0.4</System_Text_Json_Version>
<System_Text_Json_Version>8.0.5</System_Text_Json_Version>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/Scripts/CI-Build.ps1
View file
Open in desktop
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
14 changes: 4 additions & 10 deletions eng/pipelines/steps/CopyAndPublishSymbols.yml
View file
Open in desktop
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.SourcesDirectory)'
Contents: '$(Build.SourcesDirectory)\bin\**\*.+(pdb|exe|dll)'
SourceFolder: ${{ parameters.SourceFolder }}
Contents: '${{ parameters.SourceFolder }}\**\*.+(pdb|exe|dll)'
TargetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
CleanTargetFolder: true

Expand All @@ -19,16 +20,9 @@ steps:
SymbolsFeatureName: MIEngine
SymbolsProject: VS
SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\Symbols\'
ExcludeAgentFolders: '$(Build.ArtifactStagingDirectory)\Symbols\bin\Debug;$(Build.ArtifactStagingDirectory)\Symbols\bin\Lab.Debug'
ExcludeAgentFolders: '$(Build.ArtifactStagingDirectory)\Symbols\Debug;$(Build.ArtifactStagingDirectory)\Symbols\Lab.Debug'
${{ if parameters.OneESPT }}:
ExpirationInDays: 3650 # Expire in 10 years for release builds
${{ else }}:
ExpirationInDays: 1 # Expire in 1 day if used for testing

- template: ../tasks/1ES/PublishPipelineArtifact.yml
parameters:
displayName: 'Publish Symbols Artifact'
targetPath: '$(Build.ArtifactStagingDirectory)/symbols'
artifactName: 'Symbols'
OneESPT: ${{ parameters.OneESPT }}
...
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 @@ -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
View file
Open in desktop
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
Loading