diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6ae75853f0..522ded68d5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,8 +30,8 @@ This file should be imported by eng/Versions.props 11.0.0-preview.6.26319.105 11.0.0-preview.6.26319.105 - 4.1.735601 - 4.1.735601 + 4.1.735801 + 4.1.735801 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6076166185..8ba1e8fece 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/microsoft/clrmd - 5113e5f022c3171d2763a728fa3613c1af04fef9 + e33245a1964d196e911c5578741842ed52d22e12 - + https://github.com/microsoft/clrmd - 5113e5f022c3171d2763a728fa3613c1af04fef9 + e33245a1964d196e911c5578741842ed52d22e12 https://github.com/dotnet/command-line-api diff --git a/eng/testassets/rebuild/TestAssets.Linux.arm64.3.1.nuspec b/eng/testassets/rebuild/TestAssets.Linux.arm64.3.1.nuspec index 792ebb6088..462c103c18 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.arm64.3.1.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.arm64.3.1.nuspec @@ -20,6 +20,6 @@ Copyright 2021 - + diff --git a/eng/testassets/rebuild/TestAssets.Linux.arm64.5.0.nuspec b/eng/testassets/rebuild/TestAssets.Linux.arm64.5.0.nuspec index a589284bbe..e5bbb16980 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.arm64.5.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.arm64.5.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/TestAssets.Linux.arm64.6.0.nuspec b/eng/testassets/rebuild/TestAssets.Linux.arm64.6.0.nuspec index 67da884ec4..75c12b09e2 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.arm64.6.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.arm64.6.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/TestAssets.Linux.x64.3.1.nuspec b/eng/testassets/rebuild/TestAssets.Linux.x64.3.1.nuspec index 332938528e..972fbfc82c 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.x64.3.1.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.x64.3.1.nuspec @@ -20,6 +20,6 @@ Copyright 2021 - + diff --git a/eng/testassets/rebuild/TestAssets.Linux.x64.5.0.nuspec b/eng/testassets/rebuild/TestAssets.Linux.x64.5.0.nuspec index 00e7b69afa..ee6f6e0034 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.x64.5.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.x64.5.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/TestAssets.Linux.x64.6.0.nuspec b/eng/testassets/rebuild/TestAssets.Linux.x64.6.0.nuspec index 7df3711cb6..dd9db218ab 100644 --- a/eng/testassets/rebuild/TestAssets.Linux.x64.6.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Linux.x64.6.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x64.3.1.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x64.3.1.nuspec index e482b5d26c..4ec230edd1 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x64.3.1.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x64.3.1.nuspec @@ -20,6 +20,6 @@ Copyright 2021 - + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x64.5.0.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x64.5.0.nuspec index e5388d5f93..11e065a0e1 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x64.5.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x64.5.0.nuspec @@ -20,8 +20,8 @@ Copyright 2021 - - - + + + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x64.6.0.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x64.6.0.nuspec index db21dde2a1..ee9ef18456 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x64.6.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x64.6.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x86.3.1.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x86.3.1.nuspec index 9cef5a47a9..10b10b9a55 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x86.3.1.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x86.3.1.nuspec @@ -20,6 +20,6 @@ Copyright 2021 - + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x86.5.0.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x86.5.0.nuspec index 4c7b5fb62e..1e311bda07 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x86.5.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x86.5.0.nuspec @@ -20,8 +20,8 @@ Copyright 2021 - - - + + + diff --git a/eng/testassets/rebuild/TestAssets.Windows.x86.6.0.nuspec b/eng/testassets/rebuild/TestAssets.Windows.x86.6.0.nuspec index b9533bf609..d8e4234482 100644 --- a/eng/testassets/rebuild/TestAssets.Windows.x86.6.0.nuspec +++ b/eng/testassets/rebuild/TestAssets.Windows.x86.6.0.nuspec @@ -20,7 +20,7 @@ Copyright 2021 - - + + diff --git a/eng/testassets/rebuild/rewritexml.cmd b/eng/testassets/rebuild/rewritexml.cmd index 7ec50c2ea1..a8afc78dc5 100644 --- a/eng/testassets/rebuild/rewritexml.cmd +++ b/eng/testassets/rebuild/rewritexml.cmd @@ -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 diff --git a/eng/testassets/writexml.cmd b/eng/testassets/writexml.cmd index 03eaa8969e..2b0e457f37 100644 --- a/eng/testassets/writexml.cmd +++ b/eng/testassets/writexml.cmd @@ -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" diff --git a/eng/testassets/writexml.sh b/eng/testassets/writexml.sh index 88665fc6fd..09f1546446 100755 --- a/eng/testassets/writexml.sh +++ b/eng/testassets/writexml.sh @@ -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" diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index c931e79852..b279910858 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -4,7 +4,7 @@ $(NetCoreAppMinTargetFramework) true $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt - 1.0.351101 + 1.0.736301 true diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index 9a4014149c..d41a424e15 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -3,7 +3,7 @@ $(NetCoreAppMinTargetFramework) $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt - 1.0.351101 + 1.0.736301 true