Remove un-necessary VC++ runtime DLLs (#39)

msvcp140.dll, vcruntime140.dll and vcruntime140_1.dll are no longer needed as DIA removed these dependencies.
microsoft · May 27, 2022 · a0ca7ca · a0ca7ca
1 parent cdbefd4
commit a0ca7ca
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/Engine/SQLCallStackResolver.Engine.csproj b/Engine/SQLCallStackResolver.Engine.csproj
@@ -101,18 +101,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>msdia140.dll</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="DIA\msvcp140.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>msvcp140.dll</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="DIA\vcruntime140.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>vcruntime140.dll</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="DIA\vcruntime140_1.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>vcruntime140_1.dll</TargetPath>
-    </ContentWithTargetPath>
   </ItemGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="..\packages\Microsoft.Debugging.Platform.DbgEng.20220211.1453.0\content\amd64\dbghelp.dll">

diff --git a/Engine/getBuildPreReqs.ps1 b/Engine/getBuildPreReqs.ps1
@@ -26,9 +26,6 @@ if (-not (Test-Path "./DIA")) {
 
 copy "$vsPath\Team Tools\Performance Tools\x64\msdia140.dll" "./DIA/msdia140.dll"
 copy "$vsPath\Team Tools\Performance Tools\x64\msdia140.dll.manifest" "./DIA/msdia140.dll.manifest"
-copy "$vsPath\Common7\IDE\Remote Debugger\x64\msvcp140.dll" "./DIA/msvcp140.dll"
-copy "$vsPath\Common7\IDE\Remote Debugger\x64\vcruntime140.dll" "./DIA/vcruntime140.dll"
-copy "$vsPath\Common7\IDE\Remote Debugger\x64\vcruntime140_1.dll" "./DIA/vcruntime140_1.dll"
 
 Write-Host
 Write-Host "DIA file versions:"
@@ -37,8 +34,8 @@ foreach ($file in $diaFiles) {
     Write-Host $file.FullName":" $file.VersionInfo.FileVersion
 }
 
-if ((Get-ChildItem ".\DIA\*.*").Length -ne 5) {
-    Write-Error "You must manually obtain msdia140.dll, msdia140.dll.manifest and associated necessary Visual C++ runtime dependency DLLs (msvcp140.dll, vcruntime140.dll and vcruntime140_1.dll). Those are redistributable components of Visual Studio 2019 subject to terms as published here: https://docs.microsoft.com/en-us/visualstudio/releases/2019/redistribution." -ErrorAction Stop
+if ((Get-ChildItem ".\DIA\*.*").Length -ne 2) {
+    Write-Error "You must manually obtain msdia140.dll and msdia140.dll.manifest, and copy them to the Engine\DIA sub-folder. Those are redistributable components of Visual Studio 2022 subject to terms as published here: https://docs.microsoft.com/en-us/visualstudio/releases/2022/redistribution." -ErrorAction Stop
 }
 
 Write-Host "Debugger file versions:"

diff --git a/README.md b/README.md
@@ -37,7 +37,8 @@ When you submit a pull request, a CLA bot will automatically determine whether y
 * Access to NuGet is needed to fetch and restore package dependencies.
 * If needed, you may also need to manually obtain the current versions of the following files:
     * symsrv.dll and dbghelp.dll (from the x64 / AMD64 Windows Debugger package, part of Windows SDK and many other tools)
-    * msdia140.dll, msdia140.dll.manifest and associated necessary Visual C++ runtime dependency DLLs (msvcp140.dll, vcruntime140.dll and vcruntime140_1.dll are redistributable components of Visual Studio 2022 subject to terms as published [here](https://docs.microsoft.com/en-us/visualstudio/releases/2022/redistribution). Windows Debugging Tools DLLs (dbghelp.dll and symsrv.dll) as per the terms published [here](https://docs.microsoft.com/en-us/legal/windows-sdk/redist#debugging-tools-for-windows).
+    * msdia140.dll and msdia140.dll.manifest are redistributable components of Visual Studio 2022 subject to terms as published [here](https://docs.microsoft.com/en-us/visualstudio/releases/2022/redistribution).
+    * Windows Debugging Tools DLLs (dbghelp.dll and symsrv.dll) as per the terms published [here](https://docs.microsoft.com/en-us/legal/windows-sdk/redist#debugging-tools-for-windows).
 * Tests are implemented using [xUnit](https://xunit.net/docs/getting-started/netfx/visual-studio#run-tests-visualstudio). Please try to ensure that tests are passing before submitting a PR. In order to run tests, you will need to run the Tests\TestCases\downloadsyms.ps1 file to gather pre-requisites. Watch for warnings from the script - there are typically 3 files you will need to gather manually (instructions provided in the PowerShell script).
 * When a PR is submitted, there is a GitHub Actions workflow which will build the project and run tests. PRs cannot merge till the workflow succeeds.
 

diff --git a/SQLCallStackResolver.sln b/SQLCallStackResolver.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{551EED46
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		.github\workflows\build.yml = .github\workflows\build.yml
+		latestrelease.txt = latestrelease.txt
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection

diff --git a/latestrelease.txt b/latestrelease.txt
@@ -1 +1 @@
-2022-04-01 00:00
+2022-05-27 00:00