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 CC from vsix #3546

Merged
merged 4 commits into from
Apr 5, 2022
Merged

Remove CC from vsix #3546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb8a122
Remove CC from vsix
Apr 4, 2022
30329f1
More changes
Apr 5, 2022
08e9e82
Merge remote-tracking branch 'origin/main' into dev/jachocho/removecc…
Apr 5, 2022
7443210
Merge remote-tracking branch 'origin/main' into dev/jachocho/removecc…
Apr 5, 2022
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
27 changes: 6 additions & 21 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,27 +773,6 @@ function Publish-VsixPackage {
$codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion
$interopExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.InteropExternalsVersion

# Copy Microsoft.VisualStudio.TraceDataCollector to Extensions
$traceDataCollectorPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472"
Copy-Item $traceDataCollectorPackageDirectory\Microsoft.VisualStudio.TraceDataCollector.dll $extensionsPackageDir -Force
if ($TPB_LocalizedBuild) {
Copy-Loc-Files $traceDataCollectorPackageDirectory $extensionsPackageDir "Microsoft.VisualStudio.TraceDataCollector.resources.dll"
}

# Copy Microsoft.VisualStudio.Core to Extensions
$codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
Copy-Item $codeCoverageCorePackagesDir\Microsoft.VisualStudio.Coverage.Core.dll $extensionsPackageDir -Force

# Copy Microsoft.VisualStudio.Interprocess to Extensions
$codeCoverageInterprocessPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.Interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
Copy-Item $codeCoverageInterprocessPackageDirectory\Microsoft.VisualStudio.Coverage.Interprocess.dll $extensionsPackageDir -Force

# Copy Microsoft.VisualStudio.Instrumentation to Extensions
$codeCoverageInstrumentationPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.Instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
Copy-Item $codeCoverageInstrumentationPackageDirectory\Microsoft.VisualStudio.Coverage.Instrumentation.dll $extensionsPackageDir -Force
Copy-Item $codeCoverageInstrumentationPackageDirectory\Mono.Cecil.dll $extensionsPackageDir -Force
Copy-Item $codeCoverageInstrumentationPackageDirectory\Mono.Cecil.Pdb.dll $extensionsPackageDir -Force

# Copy Microsoft.VisualStudio.IO to root
$codeCoverageIOPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.Coverage.IO\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework451"
Copy-Item $codeCoverageIOPackageDirectory\Microsoft.VisualStudio.Coverage.IO.dll $packageDir -Force
Expand Down Expand Up @@ -1016,6 +995,7 @@ function Copy-CodeCoverage-Package-Artifacts {
# Copy TraceDataCollector to Microsoft.CodeCoverage folder.
$codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion
$traceDataCollectorPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.tracedatacollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
$traceDataCollectorPackagesNetFxDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.TraceDataCollector\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework472"
$internalCodeCoveragePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\"
$codeCoverageCorePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.core\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
$codeCoverageInterprocessPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.interprocess\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
Expand All @@ -1025,8 +1005,10 @@ function Copy-CodeCoverage-Package-Artifacts {
$codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos"

$microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\")
$microsoftCodeCoverageExtensionsPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage.Extensions\")

New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir -Force | Out-Null
New-Item -ItemType directory -Path $microsoftCodeCoverageExtensionsPackageDir -Force | Out-Null

Copy-Item $traceDataCollectorPackagesDir\Microsoft.VisualStudio.TraceDataCollector.dll $microsoftCodeCoveragePackageDir -Force
Copy-Item $traceDataCollectorPackagesDir\Microsoft.VisualStudio.TraceDataCollector.pdb $microsoftCodeCoveragePackageDir -Force
Expand All @@ -1039,6 +1021,8 @@ function Copy-CodeCoverage-Package-Artifacts {
Copy-Item $internalCodeCoveragePackagesDir\InstrumentationEngine $microsoftCodeCoveragePackageDir -Force -Recurse
Copy-Item $internalCodeCoveragePackagesDir\Shim $microsoftCodeCoveragePackageDir -Force -Recurse

Copy-Item $traceDataCollectorPackagesNetFxDir\Microsoft.VisualStudio.TraceDataCollector.dll $microsoftCodeCoverageExtensionsPackageDir -Force

New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\ubuntu\ -Force | Out-Null
Copy-Item $codeCoverageImUbuntuPackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\ubuntu\ -Force -Recurse
New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\alpine\ -Force | Out-Null
Expand All @@ -1049,6 +1033,7 @@ function Copy-CodeCoverage-Package-Artifacts {
# Copy TraceDataCollector resource dlls
if ($TPB_LocalizedBuild) {
Copy-Loc-Files $traceDataCollectorPackagesDir $microsoftCodeCoveragePackageDir "Microsoft.VisualStudio.TraceDataCollector.resources.dll"
Copy-Loc-Files $traceDataCollectorPackagesNetFxDir $microsoftCodeCoverageExtensionsPackageDir "Microsoft.VisualStudio.TraceDataCollector.resources.dll"
}
}

Expand Down
38 changes: 19 additions & 19 deletions src/package/nuspec/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,26 +255,26 @@
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />

<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="net451\$Runtime$\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\cs\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\de\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\de\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\es\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\es\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\fr\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\it\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\it\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ja\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ko\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pl\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\pt-BR\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\ru\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\tr\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.dll" />
<file src="Microsoft.CodeCoverage.Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.dll" />

<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Interprocess.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Interprocess.dll" />
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Instrumentation.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Instrumentation.dll" />
<file src="net451\$Runtime$\Extensions\Mono.Cecil.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
<file src="net451\$Runtime$\Extensions\Mono.Cecil.Pdb.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
<file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.Coverage.Core.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Core.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Interprocess.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Interprocess.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Instrumentation.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Instrumentation.dll" />
<file src="Microsoft.CodeCoverage\Mono.Cecil.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.dll" />
<file src="Microsoft.CodeCoverage\Mono.Cecil.Pdb.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Mono.Cecil.Pdb.dll" />
<file src="Microsoft.CodeCoverage\Microsoft.VisualStudio.Coverage.Core.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.Coverage.Core.dll" />

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