Skip to content

Commit ee3e8c5

Browse files
max-charlambmax-charlamb
committed
Squashed commit of the following:
commit 5de3340 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri Dec 5 11:36:00 2025 -0500 move native SOS test helpers to test folder (dotnet#5652) * Moves `runcommand` and `DesktopClrHost` from under the SOS package to `src/tests/` commit d1421e4 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri Dec 5 11:35:14 2025 -0500 add MiniDumpLocalVarLookup test (dotnet#5579) * Adds SOS test for minidump local var lookup commit 848b19c Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 22:37:26 2025 -0500 Simplify test `csproj` files (dotnet#5653) * MSBuild property: `$(SrcDir) -> $(RepoRoot)/src/` * MSBuild property: `$(TestDir) -> $(ReporRoot/src/tests/` * Tests `.csproj` files to use these properties to simplify imports. This also allows us to move around the test/src directories without modifying each project individually. * `Microsoft.FileFormats.UnitTests.csproj` and `Microsoft.SymbolStore.UnitTests.csproj` both copy test binary assets from the source tree into the artifacts tree. This was handled individually for each item with some inconsistencies. I simplified this process using globbing. There are a couple more files that are copied now, but I believe this shouldn't have any appreciable impact. commit bc69097 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu Dec 4 16:20:38 2025 -0800 [main] Update dependencies from dotnet/dotnet (dotnet#5650) This pull request updates the following dependencies [marker]: <> (Begin:9c7d85bb-274e-4ad6-970a-48ffc448929b) - **Subscription**: [9c7d85bb-274e-4ad6-970a-48ffc448929b](https://maestro.dot.net/subscriptions?search=9c7d85bb-274e-4ad6-970a-48ffc448929b) - **Build**: [20251203.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2852778) ([293194](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/293194)) - **Date Produced**: December 3, 2025 7:24:47 PM UTC - **Commit**: [5ddd0ddc0ebadca21645a05c419ed5a034454605](dotnet/dotnet@5ddd0dd) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [10.0.2-servicing.25601.110 to 10.0.2-servicing.25603.103][1] - runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport - runtime.linux-x64.Microsoft.DotNet.Cdac.Transport - runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport - runtime.osx-x64.Microsoft.DotNet.Cdac.Transport - runtime.win-arm64.Microsoft.DotNet.Cdac.Transport - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.NETCore.Platforms - runtime.win-x64.Microsoft.DotNet.Cdac.Transport - From [10.0.2 to 10.0.2][1] - Microsoft.AspNetCore.App.Ref - Microsoft.NETCore.App.Ref - From [5.0.0-2.25601.110 to 5.0.0-2.25603.103][1] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - From [10.0.102 to 10.0.102][1] - Microsoft.CodeAnalysis.NetAnalyzers - From [10.0.0-beta.25601.110 to 10.0.0-beta.25603.103][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.CodeAnalysis - From [10.0.102-servicing.25601.110 to 10.0.102-servicing.25603.103][1] - Microsoft.NET.Sdk [1]: dotnet/dotnet@7dedd35...5ddd0dd [DependencyUpdate]: <> (End) [marker]: <> (End:9c7d85bb-274e-4ad6-970a-48ffc448929b) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> commit 4ba3f42 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 18:53:44 2025 -0500 Remove references to $(RepoRoot) in testing scripts (dotnet#5614) This brings us closer to sending the tests to helix commit a81816d Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 13:29:25 2025 -0500 move lldbplugin.tests to test folder (dotnet#5651) commit 94caedf Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 13:07:42 2025 -0500 Remove `FreeLibrary` invocations in managed SOS host (dotnet#5586) * Fixes intermittent failures when using the cDAC * Prepares SOS to consume NativeAOT packages
1 parent a135cb7 commit ee3e8c5

30 files changed

Lines changed: 209 additions & 230 deletions

File tree

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
-->
3737

3838
<PropertyGroup>
39+
<SrcDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src'))</SrcDir>
40+
<TestDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'tests'))</TestDir>
3941
<ArtifactsDotnetTestDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'dotnet-test'))</ArtifactsDotnetTestDir>
4042
</PropertyGroup>
4143

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-pub-dotnet-dotnet-7dedd35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7dedd353/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-dotnet-5ddd0dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5ddd0ddc/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-dotnet -->
1212
<!-- Begin: Package sources from dotnet-aspnetcore -->
1313
<!-- End: Package sources from dotnet-aspnetcore -->

‎eng/Version.Details.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ This file should be imported by eng/Versions.props
1414
<XamarinAndroidToolsAndroidSdkPackageVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkPackageVersion>
1515
<!-- dotnet/dotnet dependencies -->
1616
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.2</MicrosoftAspNetCoreAppRefPackageVersion>
17-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25601.110</MicrosoftAspNetCoreAppRefInternalPackageVersion>
18-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisPackageVersion>
19-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisAnalyzersPackageVersion>
20-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25601.110</MicrosoftCodeAnalysisCSharpPackageVersion>
17+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25603.103</MicrosoftAspNetCoreAppRefInternalPackageVersion>
18+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisPackageVersion>
19+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisAnalyzersPackageVersion>
20+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisCSharpPackageVersion>
2121
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
22-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetArcadeSdkPackageVersion>
23-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetCodeAnalysisPackageVersion>
24-
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25601.110</MicrosoftNETSdkPackageVersion>
22+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetArcadeSdkPackageVersion>
23+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetCodeAnalysisPackageVersion>
24+
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25603.103</MicrosoftNETSdkPackageVersion>
2525
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
26-
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25601.110</MicrosoftNETCorePlatformsPackageVersion>
27-
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
28-
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
29-
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
30-
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
31-
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
32-
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25601.110</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
26+
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftNETCorePlatformsPackageVersion>
27+
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
28+
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
29+
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
30+
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
31+
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
32+
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
3333
<!-- dotnet/arcade dependencies -->
3434
<MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
3535
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,88 +19,88 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25601.110">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.103">
2323
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
24+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25601.110">
26+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25603.103">
2727
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
28+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
3232
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
3333
</Dependency>
3434
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
35-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25601.110">
35+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25603.103">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
37+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
3838
</Dependency>
3939
<!-- Latest shared aspnetcore version updated by darc -->
40-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.2-servicing.25601.110">
40+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.2-servicing.25603.103">
4141
<Uri>https://github.com/dotnet/dotnet</Uri>
42-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
42+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.2">
4545
<Uri>https://github.com/dotnet/dotnet</Uri>
46-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
46+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
4747
</Dependency>
4848
<!-- Latest shared runtime version updated by darc -->
4949
<!-- We use platforms for the unstable package version and
5050
the ref pack as the stable version. We need them as download links
5151
use the unstable version, but the installed assets are all stable. -->
5252
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
5353
<Uri>https://github.com/dotnet/dotnet</Uri>
54-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
54+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25601.110">
56+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25603.103">
5757
<Uri>https://github.com/dotnet/dotnet</Uri>
58-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
58+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
5959
</Dependency>
60-
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
60+
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
6161
<Uri>https://github.com/dotnet/dotnet</Uri>
62-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
62+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
6363
</Dependency>
64-
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
64+
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
6565
<Uri>https://github.com/dotnet/dotnet</Uri>
66-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
66+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
6767
</Dependency>
68-
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
68+
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
6969
<Uri>https://github.com/dotnet/dotnet</Uri>
70-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
70+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
7171
</Dependency>
72-
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
72+
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
7373
<Uri>https://github.com/dotnet/dotnet</Uri>
74-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
74+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
7575
</Dependency>
76-
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
76+
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
7777
<Uri>https://github.com/dotnet/dotnet</Uri>
78-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
78+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
7979
</Dependency>
80-
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25601.110">
80+
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="10.0.2-servicing.25603.103">
8181
<Uri>https://github.com/dotnet/dotnet</Uri>
82-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
82+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
8383
</Dependency>
8484
<!--
8585
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
8686
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
8787
they do not break the local dev experience.
8888
-->
89-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25601.110">
89+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25603.103">
9090
<Uri>https://github.com/dotnet/dotnet</Uri>
91-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
91+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25601.110">
93+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25603.103">
9494
<Uri>https://github.com/dotnet/dotnet</Uri>
95-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
95+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25601.110">
97+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25603.103">
9898
<Uri>https://github.com/dotnet/dotnet</Uri>
99-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
99+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.102">
102102
<Uri>https://github.com/dotnet/dotnet</Uri>
103-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
103+
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
104104
</Dependency>
105105
</ToolsetDependencies>
106106
</Dependencies>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
"msbuild-sdks": {
1919
"Microsoft.Build.NoTargets": "3.5.0",
2020
"Microsoft.Build.Traversal": "3.4.0",
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25601.110"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103"
2222
}
2323
}

‎src/SOS/SOS.Hosting/RuntimeWrapper.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,13 @@ protected override void Destroy()
158158
}
159159
if (_dacHandle != IntPtr.Zero)
160160
{
161-
DataTarget.PlatformFunctions.FreeLibrary(_dacHandle);
161+
// Previously, the DAC was freed here, but as we transition to the cDAC which uses NativeAOT,
162+
// it is no longer possible to free the DAC library when it is using the shimmed cDAC.
162163
_dacHandle = IntPtr.Zero;
163164
}
164165
if (_cdacHandle != IntPtr.Zero)
165166
{
166-
DataTarget.PlatformFunctions.FreeLibrary(_cdacHandle);
167+
// cDAC can not be freed because it is a NativeAOT dll.
167168
_cdacHandle = IntPtr.Zero;
168169
}
169170
if (_dbiHandle != IntPtr.Zero)

‎src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/MiniDumpLocalVarLookup.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
5+
<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(SupportedSubProcessTargetFrameworks)</TargetFrameworks>
6+
</PropertyGroup>
7+
</Project>

‎src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/Program.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
using System.Diagnostics;
6+
7+
namespace MiniDumpLocalVarLookup;
8+
9+
internal class Program
10+
{
11+
static public void Main()
12+
{
13+
int intValue = 42;
14+
string stringValue = "Hello, World!";
15+
16+
PrintValues(intValue, stringValue);
17+
}
18+
19+
static void PrintValues(int intValue, string stringValue)
20+
{
21+
int length = stringValue.Length;
22+
Debugger.Break();
23+
Console.WriteLine($"intValue: {intValue}");
24+
Console.WriteLine($"stringValue: {stringValue} (length = {length})");
25+
}
26+
}

‎src/tests/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include(${CLR_SHARED_DIR}/shared.cmake)
22

33
if(CLR_CMAKE_HOST_WIN32)
4+
# test helpers used by SOS tests
45
add_subdirectory(runcommand)
56
if(NOT CLR_CMAKE_TARGET_ARCH_ARM)
67
add_subdirectory(DesktopClrHost)

‎src/tests/CommonTestRunner/CommonTestRunner.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="$(MSBuildThisFileDirectory)..\Microsoft.Diagnostics.TestHelpers\Microsoft.Diagnostics.TestHelpers.csproj" />
15+
<ProjectReference Include="$(SrcDir)Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)