Skip to content
Merged
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
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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).
* [XELite](https://www.nuget.org/packages/Microsoft.SqlServer.XEvent.XELite/) is used for importing Microsoft SQL Extended Event (XEL) files.
* Other packages from Microsoft .NET family are used as well.
* 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.
* 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.
Comment thread
arvindshmicrosoft marked this conversation as resolved.
* Prior to running tests, you need to execute the [downloadsyms.ps1](./Tests/TestCases/downloadsyms.ps1) file once as shown below:
``` cmd
cd .\SQLCallStackResolver\Tests\TestCases
Expand Down
24 changes: 12 additions & 12 deletions Engine/SQLCallStackResolver.Engine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Collections.Immutable, Version=10.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.10.0.3\lib\net462\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=10.0.0.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.10.0.6\lib\net462\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.IO.Hashing, Version=10.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Hashing.10.0.3\lib\net462\System.IO.Hashing.dll</HintPath>
<Reference Include="System.IO.Hashing, Version=10.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Hashing.10.0.6\lib\net462\System.IO.Hashing.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
Expand All @@ -69,8 +69,8 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.Metadata, Version=10.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.10.0.3\lib\net462\System.Reflection.Metadata.dll</HintPath>
<Reference Include="System.Reflection.Metadata, Version=10.0.0.6, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.10.0.6\lib\net462\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
Expand Down Expand Up @@ -112,12 +112,12 @@
</ContentWithTargetPath>
</ItemGroup>
<ItemGroup>
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.DbgEng.20260109.1235.0\content\amd64\dbghelp.dll">
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.DbgEng.20260319.1511.0\content\amd64\dbghelp.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>dbghelp.dll</TargetPath>
<Link>DebuggerFiles\dbghelp.dll</Link>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.SymSrv.20260109.1235.0\content\amd64\symsrv.dll">
<ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.SymSrv.20260319.1511.0\content\amd64\symsrv.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>symsrv.dll</TargetPath>
<Link>DebuggerFiles\symsrv.dll</Link>
Expand All @@ -128,8 +128,8 @@
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
<PropertyGroup>
<PreBuildEvent>cd $(ProjectDir)
Expand All @@ -140,6 +140,6 @@ type ..\utils\import-vsenv.ps1 ..\utils\getBuildPreReqs.ps1 2&gt;nul | powershel
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<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')" />
<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')" />
<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')" />
<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')" />
</Project>
7 changes: 5 additions & 2 deletions Engine/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
</assemblyBinding>
</runtime>
</configuration>
10 changes: 5 additions & 5 deletions Engine/packages.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!--// Copyright (c) Microsoft Corporation. Licensed under the MIT License - see LICENSE file in this repo.-->
<packages>
<package id="Microsoft.Debugging.Platform.DbgEng" version="20260109.1235.0" targetFramework="net472" />
<package id="Microsoft.Debugging.Platform.SymSrv" version="20260109.1235.0" targetFramework="net472" />
<package id="Microsoft.Debugging.Platform.DbgEng" version="20260319.1511.0" targetFramework="net472" />
<package id="Microsoft.Debugging.Platform.SymSrv" version="20260319.1511.0" targetFramework="net472" />
<package id="Microsoft.SqlServer.XEvent.XELite" version="2024.2.5.1" targetFramework="net472" />
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
<package id="System.Collections.Immutable" version="10.0.3" targetFramework="net472" />
<package id="System.IO.Hashing" version="10.0.3" targetFramework="net472" />
<package id="System.Collections.Immutable" version="10.0.6" targetFramework="net472" />
<package id="System.IO.Hashing" version="10.0.6" targetFramework="net472" />
<package id="System.Memory" version="4.6.3" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="10.0.3" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="10.0.6" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
</packages>
8 changes: 5 additions & 3 deletions GUI/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
</assemblyBinding>
</runtime>
<userSettings>
Expand Down
10 changes: 6 additions & 4 deletions Tests/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions utils/getBuildPreReqs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ if ((dir "DIA/*").Length -ne 3)
$diaManifestPath = "DIA/msdia140.dll.manifest"
(Get-Content $diaManifestPath).Replace("DIA/msdia140.dll", "msdia140.dll") -Replace " description", " threadingModel=`"Both`" description " | Set-Content $diaManifestPath

@(dir "../packages/Microsoft.Debugging.Platform.DbgEng.20260109.1235.0/content/amd64/dbghelp.dll").VersionInfo.ToString()
@(dir "../packages/Microsoft.Debugging.Platform.SymSrv.20260109.1235.0/content/amd64/symsrv.dll").VersionInfo.ToString()
@(dir "../packages/Microsoft.Debugging.Platform.DbgEng.20260319.1511.0/content/amd64/dbghelp.dll").VersionInfo.ToString()
@(dir "../packages/Microsoft.Debugging.Platform.SymSrv.20260319.1511.0/content/amd64/symsrv.dll").VersionInfo.ToString()
Comment thread
arvindshmicrosoft marked this conversation as resolved.
Loading