Skip to content

Bundle arm64 managed code coverage support #3547

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

Merged
MarcoRossignoli merged 3 commits into from
Apr 5, 2022
Merged

Bundle arm64 managed code coverage support #3547

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ee9d92
bundle arm64 managed code coverage support
MarcoRossignoli Apr 4, 2022
18c0e8a
fix build
MarcoRossignoli Apr 4, 2022
7cb4f68
update Microsoft.TestPlatform.nuspec
MarcoRossignoli 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
4 changes: 2 additions & 2 deletions scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ function Verify-Nuget-Packages($packageDirectory, $version)
{
Write-Log "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 53;
"Microsoft.CodeCoverage" = 57;
"Microsoft.NET.Test.Sdk" = 27;
"Microsoft.TestPlatform" = 612;
"Microsoft.TestPlatform" = 615;
"Microsoft.TestPlatform.Build" = 21;
"Microsoft.TestPlatform.CLI" = 425;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-sign.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $TPB_AssembliesPattern = @(
"*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe",
"QTAgent*.exe", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll",
"Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll",
"covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe",
"covrun32.dll", "msdia140.dll", "covrun64.dll", "covrunarm64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe",
"CodeCoverage.exe", "Microsoft.ShDocVw.dll", "UIAComwrapper.dll", "Interop.UIAutomationClient.dll", "SettingsMigrator.exe",
"Newtonsoft.Json.dll", "DumpMinitool*.exe"
)
Expand Down
5 changes: 5 additions & 0 deletions src/package/nuspec/Microsoft.CodeCoverage.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@
<file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="build\netstandard1.0\CodeCoverage\amd64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard1.0\CodeCoverage\amd64\" />

<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\covrunarm64.dll" target="build\netstandard1.0\CodeCoverage\arm64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\msdia140.dll" target="build\netstandard1.0\CodeCoverage\arm64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="build\netstandard1.0\CodeCoverage\arm64\" />

<file src="Microsoft.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="build\netstandard1.0\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
<file src="Microsoft.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="build\netstandard1.0\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
<file src="Microsoft.CodeCoverage\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="build\netstandard1.0\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />

<file src="Microsoft.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" target="build\netstandard1.0\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" />
<file src="Microsoft.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" target="build\netstandard1.0\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" />
Expand Down
4 changes: 4 additions & 0 deletions src/package/nuspec/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@
<file src="Microsoft.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\amd64\" />

<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\covrunarm64.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\arm64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\msdia140.dll" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\arm64\" />
<file src="Microsoft.CodeCoverage\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="tools\net451\Team Tools\Dynamic Code Coverage Tools\arm64\" />

<file src="Intellitrace\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
<file src="Intellitrace\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />
<file src="Microsoft.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.CodeCoverage.Shim.dll" />
Expand Down