Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove netstandard telemetry dependencies #4007

Merged
merged 1 commit into from
Sep 12, 2022
Merged

Remove netstandard telemetry dependencies #4007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,6 @@ function Copy-CodeCoverage-Package-Artifacts {
$codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine"
$codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos"
$codeCoverageTelemetryPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.codecoverage.telemetry\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
$telemetryDirectory = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\Microsoft.VisualStudio.Telemetry"

$microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\")
$microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\")
Expand All @@ -1059,11 +1058,6 @@ function Copy-CodeCoverage-Package-Artifacts {
Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $codeCoverageInstrumentationPackagesDir\Mono.Cecil.Pdb.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $codeCoverageTelemetryPackagesDir\Microsoft.CodeCoverage.Telemetry.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $telemetryDirectory\Microsoft.VisualStudio.Telemetry.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $telemetryDirectory\Microsoft.VisualStudio.RemoteControl.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $telemetryDirectory\Microsoft.VisualStudio.Utilities.Internal.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $telemetryDirectory\Microsoft.Win32.Registry.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $telemetryDirectory\System.Runtime.CompilerServices.Unsafe.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $internalCodeCoveragePackagesDir\CodeCoverage $microsoftCodeCoveragePackageDir -Force -Recurse
Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse
Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 57;
"Microsoft.NET.Test.Sdk" = 16;
"Microsoft.TestPlatform" = 607;
"Microsoft.TestPlatform" = 602;
"Microsoft.TestPlatform.Build" = 21;
"Microsoft.TestPlatform.CLI" = 499;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
Expand Down
5 changes: 0 additions & 5 deletions src/package/nuspec/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,6 @@
<file src="Microsoft.CodeCoverage\Mono.Cecil.Pdb.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Core.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Core.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.CodeCoverage.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.CodeCoverage.Telemetry.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Telemetry.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Utilities.Internal.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.RemoteControl.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.RemoteControl.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.Win32.Registry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.Win32.Registry.dll" />
<file src="Microsoft.CodeCoverage\System.Runtime.CompilerServices.Unsafe.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Extensions\System.Runtime.CompilerServices.Unsafe.dll" />

<file src="net462\$Runtime$\Microsoft.CodeCoverage.IO.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.CodeCoverage.IO.dll" />
<file src="net462\$Runtime$\cs\Microsoft.CodeCoverage.IO.resources.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\cs\Microsoft.CodeCoverage.IO.dll" />
Expand Down