Skip to content

Commit fa4e3e6

Browse files
Upgrade debugger and .NET nugets 202604 (#165)
* Upgrade debugger and .NET nugets 202604 * Align assembly binding throughout solution
1 parent 80f94bd commit fa4e3e6

7 files changed

Lines changed: 36 additions & 29 deletions

File tree

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* The DIA SDK files - msdia140.dll and msdia140.dll.manifest - are components of Visual Studio 2022 used under the terms as published [here](https://docs.microsoft.com/en-us/visualstudio/releases/2022/redistribution).
66
* [XELite](https://www.nuget.org/packages/Microsoft.SqlServer.XEvent.XELite/) is used for importing Microsoft SQL Extended Event (XEL) files.
77
* Other packages from Microsoft .NET family are used as well.
8-
* Tests are implemented using [MSTest v2](https://docs.microsoft.com/en-us/visualstudio/test/mstest-update-to-mstestv2?view=vs-2022#why-upgrade-to-mstestv2). Please try to ensure all the tests are passing before submitting a PR.
8+
* Tests are implemented using [MSTest v3](https://learn.microsoft.com/en-us/dotnet/core/testing/unit-testing-mstest-intro). Please try to ensure all the tests are passing before submitting a PR.
99
* Prior to running tests, you need to execute the [downloadsyms.ps1](./Tests/TestCases/downloadsyms.ps1) file once as shown below:
1010
``` cmd
1111
cd .\SQLCallStackResolver\Tests\TestCases

Engine/SQLCallStackResolver.Engine.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@
5555
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5656
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
5757
</Reference>
58-
<Reference Include="System.Collections.Immutable, Version=10.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59-
<HintPath>..\packages\System.Collections.Immutable.10.0.3\lib\net462\System.Collections.Immutable.dll</HintPath>
58+
<Reference Include="System.Collections.Immutable, Version=10.0.0.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59+
<HintPath>..\packages\System.Collections.Immutable.10.0.6\lib\net462\System.Collections.Immutable.dll</HintPath>
6060
</Reference>
61-
<Reference Include="System.IO.Hashing, Version=10.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62-
<HintPath>..\packages\System.IO.Hashing.10.0.3\lib\net462\System.IO.Hashing.dll</HintPath>
61+
<Reference Include="System.IO.Hashing, Version=10.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
62+
<HintPath>..\packages\System.IO.Hashing.10.0.6\lib\net462\System.IO.Hashing.dll</HintPath>
6363
</Reference>
6464
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
6565
<HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
@@ -69,8 +69,8 @@
6969
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7070
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
7171
</Reference>
72-
<Reference Include="System.Reflection.Metadata, Version=10.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73-
<HintPath>..\packages\System.Reflection.Metadata.10.0.3\lib\net462\System.Reflection.Metadata.dll</HintPath>
72+
<Reference Include="System.Reflection.Metadata, Version=10.0.0.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73+
<HintPath>..\packages\System.Reflection.Metadata.10.0.6\lib\net462\System.Reflection.Metadata.dll</HintPath>
7474
</Reference>
7575
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7676
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
@@ -112,12 +112,12 @@
112112
</ContentWithTargetPath>
113113
</ItemGroup>
114114
<ItemGroup>
115-
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\content\amd64\dbghelp.dll">
115+
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\content\amd64\dbghelp.dll">
116116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117117
<TargetPath>dbghelp.dll</TargetPath>
118118
<Link>DebuggerFiles\dbghelp.dll</Link>
119119
</ContentWithTargetPath>
120-
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\content\amd64\symsrv.dll">
120+
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\content\amd64\symsrv.dll">
121121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
122122
<TargetPath>symsrv.dll</TargetPath>
123123
<Link>DebuggerFiles\symsrv.dll</Link>
@@ -128,8 +128,8 @@
128128
<PropertyGroup>
129129
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
130130
</PropertyGroup>
131-
<Error Condition="!Exists('..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\build\Microsoft.Debugging.Platform.DbgEng.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\build\Microsoft.Debugging.Platform.DbgEng.targets'))" />
132-
<Error Condition="!Exists('..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\build\Microsoft.Debugging.Platform.SymSrv.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\build\Microsoft.Debugging.Platform.SymSrv.targets'))" />
131+
<Error Condition="!Exists('..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\build\Microsoft.Debugging.Platform.DbgEng.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\build\Microsoft.Debugging.Platform.DbgEng.targets'))" />
132+
<Error Condition="!Exists('..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\build\Microsoft.Debugging.Platform.SymSrv.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\build\Microsoft.Debugging.Platform.SymSrv.targets'))" />
133133
</Target>
134134
<PropertyGroup>
135135
<PreBuildEvent>cd $(ProjectDir)
@@ -140,6 +140,6 @@ type ..\utils\import-vsenv.ps1 ..\utils\getBuildPreReqs.ps1 2&gt;nul | powershel
140140
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
141141
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
142142
</PropertyGroup>
143-
<Import Project="..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\build\Microsoft.Debugging.Platform.DbgEng.targets" Condition="Exists('..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\build\Microsoft.Debugging.Platform.DbgEng.targets')" />
144-
<Import Project="..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\build\Microsoft.Debugging.Platform.SymSrv.targets" Condition="Exists('..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\build\Microsoft.Debugging.Platform.SymSrv.targets')" />
143+
<Import Project="..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\build\Microsoft.Debugging.Platform.DbgEng.targets" Condition="Exists('..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\build\Microsoft.Debugging.Platform.DbgEng.targets')" />
144+
<Import Project="..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\build\Microsoft.Debugging.Platform.SymSrv.targets" Condition="Exists('..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\build\Microsoft.Debugging.Platform.SymSrv.targets')" />
145145
</Project>

Engine/app.config

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" /></dependentAssembly>
5+
<dependentAssembly><assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
6+
<dependentAssembly><assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
7+
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
68
<dependentAssembly><assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
9+
<dependentAssembly><assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" /></dependentAssembly>
10+
<dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
711
<dependentAssembly><assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" /></dependentAssembly>
8-
<dependentAssembly><assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
912
</assemblyBinding>
1013
</runtime>
1114
</configuration>

Engine/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--// Copyright (c) Microsoft Corporation. Licensed under the MIT License - see LICENSE file in this repo.-->
33
<packages>
4-
<package id="Microsoft.Debugging.Platform.DbgEng" version="20260109.1235.0" targetFramework="net472" />
5-
<package id="Microsoft.Debugging.Platform.SymSrv" version="20260109.1235.0" targetFramework="net472" />
4+
<package id="Microsoft.Debugging.Platform.DbgEng" version="20260319.1511.0" targetFramework="net472" />
5+
<package id="Microsoft.Debugging.Platform.SymSrv" version="20260319.1511.0" targetFramework="net472" />
66
<package id="Microsoft.SqlServer.XEvent.XELite" version="2024.2.5.1" targetFramework="net472" />
77
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
8-
<package id="System.Collections.Immutable" version="10.0.3" targetFramework="net472" />
9-
<package id="System.IO.Hashing" version="10.0.3" targetFramework="net472" />
8+
<package id="System.Collections.Immutable" version="10.0.6" targetFramework="net472" />
9+
<package id="System.IO.Hashing" version="10.0.6" targetFramework="net472" />
1010
<package id="System.Memory" version="4.6.3" targetFramework="net472" />
1111
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
12-
<package id="System.Reflection.Metadata" version="10.0.3" targetFramework="net472" />
12+
<package id="System.Reflection.Metadata" version="10.0.6" targetFramework="net472" />
1313
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
1414
</packages>

GUI/App.config

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
</appSettings>
1818
<runtime>
1919
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
20+
<dependentAssembly><assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
21+
<dependentAssembly><assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
22+
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
2023
<dependentAssembly><assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
21-
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" /></dependentAssembly>
22-
<dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-9.0.0.8" newVersion="9.0.0.8" /></dependentAssembly>
24+
<dependentAssembly><assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" /></dependentAssembly>
25+
<dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
2326
<dependentAssembly><assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" /></dependentAssembly>
24-
<dependentAssembly><assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
2527
</assemblyBinding>
2628
</runtime>
2729
<userSettings>

Tests/app.config

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" /></dependentAssembly>
6-
<dependentAssembly><assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" /></dependentAssembly>
7-
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.3" newVersion="10.0.0.3" /></dependentAssembly>
8-
<dependentAssembly><assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
95
<dependentAssembly><assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
6+
<dependentAssembly><assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
7+
<dependentAssembly><assemblyIdentity name="System.IO.Hashing" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
8+
<dependentAssembly><assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" /></dependentAssembly>
9+
<dependentAssembly><assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" /></dependentAssembly>
10+
<dependentAssembly><assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-10.0.0.6" newVersion="10.0.0.6" /></dependentAssembly>
11+
<dependentAssembly><assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /><bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" /></dependentAssembly>
1012
</assemblyBinding>
1113
</runtime>
1214
</configuration>

utils/getBuildPreReqs.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ if ((dir "DIA/*").Length -ne 3)
1919
$diaManifestPath = "DIA/msdia140.dll.manifest"
2020
(Get-Content $diaManifestPath).Replace("DIA/msdia140.dll", "msdia140.dll") -Replace " description", " threadingModel=`"Both`" description " | Set-Content $diaManifestPath
2121

22-
@(dir "../packages/Microsoft.Debugging.Platform.DbgEng.20260109.1235.0/content/amd64/dbghelp.dll").VersionInfo.ToString()
23-
@(dir "../packages/Microsoft.Debugging.Platform.SymSrv.20260109.1235.0/content/amd64/symsrv.dll").VersionInfo.ToString()
22+
@(dir "../packages/Microsoft.Debugging.Platform.DbgEng.20260319.1511.0/content/amd64/dbghelp.dll").VersionInfo.ToString()
23+
@(dir "../packages/Microsoft.Debugging.Platform.SymSrv.20260319.1511.0/content/amd64/symsrv.dll").VersionInfo.ToString()

0 commit comments

Comments
 (0)