Sitelet https://github.com/microsoft/vstest/commit/ca121e5adf8fb514b3ac0684283b40e5dda985a1
Skip to content

Commit ca121e5

Browse files
nohwndCopilot
nohwnd
and
Copilot
committed
Replace VSSDK-sourced DLLs with proper package references
Source System.Diagnostics.DiagnosticSource from its own NuGet package instead of from the Microsoft.VSSDK.BuildTools package. Add a PackageReference with GeneratePathProperty and reference the DLL via the generated path property. Remove the redundant VSSDK-sourced System.Runtime.CompilerServices.Unsafe entry since it is already included from the TestPlatform build output. Remove the now-unused VSSDKBuildToolsFolder property. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent cd763b1 commit ca121e5

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎eng/Versions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<TestPlatformExternalsVersion>18.0.0-preview-1-10911-061</TestPlatformExternalsVersion>
7777
<MicrosoftInternalTestPlatformExtensions>18.0.0-preview-1-10911-061</MicrosoftInternalTestPlatformExtensions>
7878
<TestPlatformMSDiaVersion>18.0.11024.295</TestPlatformMSDiaVersion>
79+
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
7980
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
8081
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
8182
</PropertyGroup>

‎src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<VSQualityToolsFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\</VSQualityToolsFolder>
3737
<DependencyModelFolder>$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\</DependencyModelFolder>
3838
<FileSystemGlobbingFolder>$(TestPlatformBinFolder)Microsoft.Extensions.FileSystemGlobbing\</FileSystemGlobbingFolder>
39-
<VSSDKBuildToolsFolder>$(TestPlatformBinFolder)Microsoft.VSSDK.BuildTools\</VSSDKBuildToolsFolder>
4039
<InternalTestPlatformExtensionsFolder>$(TestPlatformBinFolder)Microsoft.Internal.TestPlatform.Extensions\</InternalTestPlatformExtensionsFolder>
4140
</PropertyGroup>
4241

@@ -83,6 +82,10 @@
8382
</VsixSourceItem>
8483
</ItemGroup>
8584

85+
<ItemGroup>
86+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" PrivateAssets="All" GeneratePathProperty="true" />
87+
</ItemGroup>
88+
8689
<!--
8790
We cannot use the VSIXSourceItems for wildcard as the evaluation is not done at the correct time. This is causing wildcard items to be missed.
8891
Instead use a target that runs before 'GenerateFileManifest' since that's when the VSIX files are collected.
@@ -269,8 +272,7 @@
269272
<ItemGroup>
270273
<VsixSourceItem Include="$(DependencyModelFolder)Microsoft.Extensions.DependencyModel.dll" />
271274
<VsixSourceItem Include="$(FileSystemGlobbingFolder)Microsoft.Extensions.FileSystemGlobbing.dll" />
272-
<VsixSourceItem Include="$(VSSDKBuildToolsFolder)System.Diagnostics.DiagnosticSource.dll" />
273-
<VsixSourceItem Include="$(VSSDKBuildToolsFolder)System.Runtime.CompilerServices.Unsafe.dll" />
275+
<VsixSourceItem Include="$(PkgSystem_Diagnostics_DiagnosticSource)\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll" />
274276
<VsixSourceItem Include="$(VSQualityToolsFolder)Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
275277
</ItemGroup>
276278

0 commit comments

Comments
 (0)