Skip to content

Commit c5c8ee5

Browse files
fhnaseerfhnaseer
authored
Updating Microsoft.CodeCoverage package structure (#5169)
1. VanguardInstrumentationProfiler_XYZ.config => Cov_XYZ.config 2. rootFolder\InstrumentationEngine => rootFolder
1 parent 12fc734 commit c5c8ee5

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.12.0-preview.24409.1">
4+
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.12.0-preview.24409.2">
55
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
6-
<Sha>ddf66849211bf20fa2a60c447cf0f20d723e6617</Sha>
6+
<Sha>2fabb6cdbce2e64fa7a9dc483991f6ce475ab334</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.24408.1">
99
<Uri>https://github.com/dotnet/diagnostics</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
4545
<MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
4646
<MicrosoftFakesVersion>17.9.0-beta.24058.4</MicrosoftFakesVersion>
47-
<MicrosoftInternalCodeCoverageVersion>17.12.0-preview.24409.1</MicrosoftInternalCodeCoverageVersion>
47+
<MicrosoftInternalCodeCoverageVersion>17.12.0-preview.24409.2</MicrosoftInternalCodeCoverageVersion>
4848
<MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.10.34924.118</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
4949
<MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
5050
<MicrosoftVisualStudioInteropVersion>17.10.525-preview.1</MicrosoftVisualStudioInteropVersion>

‎src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,34 @@
3333
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\codecoveragemessages.dll" target="build\netstandard2.0\CodeCoverage\codecoveragemessages.dll" />
3434
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\covrun32.dll" target="build\netstandard2.0\CodeCoverage\" />
3535
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\msdia140.dll" target="build\netstandard2.0\CodeCoverage\" />
36-
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="build\netstandard2.0\CodeCoverage\" />
36+
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\Cov_x86.config" target="build\netstandard2.0\CodeCoverage\" />
3737

3838
<file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="build\netstandard2.0\CodeCoverage\coreclr\" />
3939

4040
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\CodeCoverage.exe" target="build\netstandard2.0\CodeCoverage\amd64\" />
4141
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\covrun64.dll" target="build\netstandard2.0\CodeCoverage\amd64\" />
4242
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="build\netstandard2.0\CodeCoverage\amd64\" />
43-
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard2.0\CodeCoverage\amd64\" />
43+
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\Cov_x64.config" target="build\netstandard2.0\CodeCoverage\amd64\" />
4444

4545
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\covrunarm64.dll" target="build\netstandard2.0\CodeCoverage\arm64\" />
4646
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\msdia140.dll" target="build\netstandard2.0\CodeCoverage\arm64\" />
47-
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="build\netstandard2.0\CodeCoverage\arm64\" />
47+
<file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\Cov_arm64.config" target="build\netstandard2.0\CodeCoverage\arm64\" />
4848

49-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="build\netstandard2.0\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
50-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="build\netstandard2.0\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
51-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="build\netstandard2.0\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
49+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" target="build\netstandard2.0\x86\MicrosoftInstrumentationEngine_x86.dll" />
50+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" target="build\netstandard2.0\x64\MicrosoftInstrumentationEngine_x64.dll" />
51+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" target="build\netstandard2.0\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
5252

53-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" />
54-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" />
55-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\VanguardInstrumentationProfiler_x64.config" />
53+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" target="build\netstandard2.0\ubuntu\x64\libCoverageInstrumentationMethod.so" />
54+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" target="build\netstandard2.0\ubuntu\x64\libInstrumentationEngine.so" />
55+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\Cov_x64.config" target="build\netstandard2.0\ubuntu\x64\Cov_x64.config" />
5656

57-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so" target="build\netstandard2.0\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so" />
58-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" target="build\netstandard2.0\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" />
59-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard2.0\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config" />
57+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so" target="build\netstandard2.0\alpine\x64\libCoverageInstrumentationMethod.so" />
58+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" target="build\netstandard2.0\alpine\x64\libInstrumentationEngine.so" />
59+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\Cov_x64.config" target="build\netstandard2.0\alpine\x64\Cov_x64.config" />
6060

61-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib" target="build\netstandard2.0\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib" />
62-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib" target="build\netstandard2.0\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib" />
63-
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard2.0\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config" />
61+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib" target="build\netstandard2.0\macos\x64\libCoverageInstrumentationMethod.dylib" />
62+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib" target="build\netstandard2.0\macos\x64\libInstrumentationEngine.dylib" />
63+
<file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\Cov_x64.config" target="build\netstandard2.0\macos\x64\Cov_x64.config" />
6464

6565
<file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\netcoreapp3.1\" />
6666
<file src="net462\Microsoft.Internal.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net462\" />

‎src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,16 +448,16 @@
448448
<file src="net472\CodeCoverage\codecoveragemessages.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\codecoveragemessages.dll" />
449449
<file src="net472\CodeCoverage\covrun32.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
450450
<file src="net472\CodeCoverage\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
451-
<file src="net472\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
451+
<file src="net472\CodeCoverage\Cov_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
452452

453453
<file src="net472\CodeCoverage\amd64\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
454454
<file src="net472\CodeCoverage\amd64\covrun64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
455455
<file src="net472\CodeCoverage\amd64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
456-
<file src="net472\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
456+
<file src="net472\CodeCoverage\amd64\Cov_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
457457

458458
<file src="net472\CodeCoverage\arm64\covrunarm64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
459459
<file src="net472\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
460-
<file src="net472\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
460+
<file src="net472\CodeCoverage\arm64\Cov_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
461461

462462
<file src="net472\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
463463
<file src="net472\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />

0 commit comments

Comments
 (0)