Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26319.105</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26319.105</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
<!-- microsoft-clrmd dependencies -->
<MicrosoftDiagnosticsRuntimePackageVersion>4.1.735601</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.1.735601</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
<MicrosoftDiagnosticsRuntimePackageVersion>4.1.735801</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.1.735801</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="b756a8d8a0e64905e16c81911bb09a8110bc3395" BarId="319511" />
<ProductDependencies>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.1.735601">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.1.735801">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>5113e5f022c3171d2763a728fa3613c1af04fef9</Sha>
<Sha>e33245a1964d196e911c5578741842ed52d22e12</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.1.735601">
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.1.735801">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>5113e5f022c3171d2763a728fa3613c1af04fef9</Sha>
<Sha>e33245a1964d196e911c5578741842ed52d22e12</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/testassets/rebuild/TestAssets.Linux.arm64.3.1.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.arm64.3.1\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.arm64.3.1\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Linux.arm64.5.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.arm64.5.0\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.arm64.5.0\1.0.257801\content\LineNums\*.*" target="content/LineNums" />
<file src="TestAssets.Linux.arm64.5.0\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.arm64.5.0\1.0.351101\content\LineNums\*.*" target="content/LineNums" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Linux.arm64.6.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.arm64.6.0\1.0.257801\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Linux.arm64.6.0\1.0.257801\content\WebApp3\*.*" target="content/WebApp3" />
<file src="TestAssets.Linux.arm64.6.0\1.0.351101\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Linux.arm64.6.0\1.0.351101\content\WebApp3\*.*" target="content/WebApp3" />
</files>
</package>
2 changes: 1 addition & 1 deletion eng/testassets/rebuild/TestAssets.Linux.x64.3.1.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.x64.3.1\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.x64.3.1\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Linux.x64.5.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.x64.5.0\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.x64.5.0\1.0.257801\content\LineNums\*.*" target="content/LineNums" />
<file src="TestAssets.Linux.x64.5.0\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Linux.x64.5.0\1.0.351101\content\LineNums\*.*" target="content/LineNums" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Linux.x64.6.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Linux.x64.6.0\1.0.257801\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Linux.x64.6.0\1.0.257801\content\WebApp3\*.*" target="content/WebApp3" />
<file src="TestAssets.Linux.x64.6.0\1.0.351101\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Linux.x64.6.0\1.0.351101\content\WebApp3\*.*" target="content/WebApp3" />
</files>
</package>
2 changes: 1 addition & 1 deletion eng/testassets/rebuild/TestAssets.Windows.x64.3.1.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x64.3.1\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x64.3.1\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
</files>
</package>
6 changes: 3 additions & 3 deletions eng/testassets/rebuild/TestAssets.Windows.x64.5.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x64.5.0\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x64.5.0\1.0.257801\content\DualRuntimes\*.*" target="content/DualRuntimes" />
<file src="TestAssets.Windows.x64.5.0\1.0.257801\content\LineNums\*.*" target="content/LineNums" />
<file src="TestAssets.Windows.x64.5.0\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x64.5.0\1.0.351101\content\DualRuntimes\*.*" target="content/DualRuntimes" />
<file src="TestAssets.Windows.x64.5.0\1.0.351101\content\LineNums\*.*" target="content/LineNums" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Windows.x64.6.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x64.6.0\1.0.257801\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Windows.x64.6.0\1.0.257801\content\WebApp3\*.*" target="content/WebApp3" />
<file src="TestAssets.Windows.x64.6.0\1.0.351101\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Windows.x64.6.0\1.0.351101\content\WebApp3\*.*" target="content/WebApp3" />
</files>
</package>
2 changes: 1 addition & 1 deletion eng/testassets/rebuild/TestAssets.Windows.x86.3.1.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x86.3.1\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x86.3.1\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
</files>
</package>
6 changes: 3 additions & 3 deletions eng/testassets/rebuild/TestAssets.Windows.x86.5.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x86.5.0\1.0.257801\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x86.5.0\1.0.257801\content\DualRuntimes\*.*" target="content/DualRuntimes" />
<file src="TestAssets.Windows.x86.5.0\1.0.257801\content\LineNums\*.*" target="content/LineNums" />
<file src="TestAssets.Windows.x86.5.0\1.0.351101\content\SymbolTestApp\*.*" target="content/SymbolTestApp" />
<file src="TestAssets.Windows.x86.5.0\1.0.351101\content\DualRuntimes\*.*" target="content/DualRuntimes" />
<file src="TestAssets.Windows.x86.5.0\1.0.351101\content\LineNums\*.*" target="content/LineNums" />
</files>
</package>
4 changes: 2 additions & 2 deletions eng/testassets/rebuild/TestAssets.Windows.x86.6.0.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<copyright>Copyright 2021</copyright>
</metadata>
<files>
<file src="TestAssets.Windows.x86.6.0\1.0.257801\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Windows.x86.6.0\1.0.257801\content\WebApp3\*.*" target="content/WebApp3" />
<file src="TestAssets.Windows.x86.6.0\1.0.351101\content\DivZero\*.*" target="content/DivZero" />
<file src="TestAssets.Windows.x86.6.0\1.0.351101\content\WebApp3\*.*" target="content/WebApp3" />
</files>
</package>
2 changes: 1 addition & 1 deletion eng/testassets/rebuild/rewritexml.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setlocal
set ORIGINAL_VERSION=1.0.257801
set ORIGINAL_VERSION=1.0.351101
call ..\writexml.cmd %USERPROFILE%\.nuget\packages\testassets.linux.arm64.3.1\%ORIGINAL_VERSION%\content\SymbolTestApp\SOS.StackAndOtherTests.Heap.portable.dmp %USERPROFILE%\.nuget\packages\testassets.linux.arm64.3.1\%ORIGINAL_VERSION%\content\SymbolTestApp
call ..\writexml.cmd %USERPROFILE%\.nuget\packages\testassets.linux.arm64.5.0\%ORIGINAL_VERSION%\content\LineNums\SOS.LineNums.Heap.dmp %USERPROFILE%\.nuget\packages\testassets.linux.arm64.5.0\%ORIGINAL_VERSION%\content\LineNums
call ..\writexml.cmd %USERPROFILE%\.nuget\packages\testassets.linux.arm64.5.0\%ORIGINAL_VERSION%\content\SymbolTestApp\SOS.StackAndOtherTests.Heap.portable.dmp %USERPROFILE%\.nuget\packages\testassets.linux.arm64.5.0\%ORIGINAL_VERSION%\content\SymbolTestApp
Expand Down
4 changes: 2 additions & 2 deletions eng/testassets/writexml.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ set _REPOROOT_=%~dp0..\..
set _DUMPPATH_=%1
set _XMLPATH_=%1.xml
set _DEBUGGEEPATH_=%2
set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll
%_REPOROOT_%\.dotnet\dotnet.exe --fx-version 6.0.8 %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\netcoreapp3.1\publish\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit"
set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net8.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll
%_REPOROOT_%\.dotnet\dotnet.exe %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\net8.0\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit"

4 changes: 2 additions & 2 deletions eng/testassets/writexml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ _REPOROOT_=../..
_DUMPPATH_=$1
_XMLPATH_=$1.xml
_DEBUGGEEPATH_=$2
export DOTNET_DIAGNOSTIC_EXTENSIONS=$_REPOROOT_/artifacts/bin/Microsoft.Diagnostics.DebugServices.UnitTests/Debug/net6.0/Microsoft.Diagnostics.DebugServices.UnitTests.dll
$_REPOROOT_/.dotnet/dotnet --fx-version 6.0.8 $_REPOROOT_/artifacts/bin/dotnet-dump/Debug/netcoreapp3.1/publish/dotnet-dump.dll analyze $_DUMPPATH_ -c "setsymbolserver -directory $_DEBUGGEEPATH_" -c "writetestdata $_XMLPATH_" -c "exit"
export DOTNET_DIAGNOSTIC_EXTENSIONS=$_REPOROOT_/artifacts/bin/Microsoft.Diagnostics.DebugServices.UnitTests/Debug/net8.0/Microsoft.Diagnostics.DebugServices.UnitTests.dll
$_REPOROOT_/.dotnet/dotnet $_REPOROOT_/artifacts/bin/dotnet-dump/Debug/net8.0/dotnet-dump.dll analyze $_DUMPPATH_ -c "setsymbolserver -directory $_DEBUGGEEPATH_" -c "writetestdata $_XMLPATH_" -c "exit"

2 changes: 1 addition & 1 deletion src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>$(NetCoreAppMinTargetFramework)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DbgShimConfigFileName>$(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt</DbgShimConfigFileName>
<TestAssetsVersion>1.0.351101</TestAssetsVersion>
<TestAssetsVersion>1.0.736301</TestAssetsVersion>
<CopyDebuggeeSourcesToArtifacts>true</CopyDebuggeeSourcesToArtifacts>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>$(NetCoreAppMinTargetFramework)</TargetFramework>
<DebugServicesConfigFileName>$(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt</DebugServicesConfigFileName>
<TestAssetsVersion>1.0.351101</TestAssetsVersion>
<TestAssetsVersion>1.0.736301</TestAssetsVersion>
<!-- Controls the test asset package restore and the tests that use them -->
<RunTests>true</RunTests>
</PropertyGroup>
Expand Down
Loading