From c5c8ee586c6bd58eee6e845aee32e88f789c127d Mon Sep 17 00:00:00 2001
From: fhnaseer <fhnaseer@live.com>
Date: Mon, 12 Aug 2024 15:23:46 +0200
Subject: [PATCH] Updating Microsoft.CodeCoverage package structure (#5169)

1. VanguardInstrumentationProfiler_XYZ.config => Cov_XYZ.config
2. rootFolder\InstrumentationEngine => rootFolder
---
 eng/Version.Details.xml                       |  4 +--
 eng/Versions.props                            |  2 +-
 .../Microsoft.CodeCoverage.nuspec             | 30 +++++++++----------
 .../Microsoft.TestPlatform.nuspec             |  6 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f5fec3b212..bd91f713b6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.12.0-preview.24409.1">
+    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.12.0-preview.24409.2">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>ddf66849211bf20fa2a60c447cf0f20d723e6617</Sha>
+      <Sha>2fabb6cdbce2e64fa7a9dc483991f6ce475ab334</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.24408.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a0c3955ed2..739e8e252f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -44,7 +44,7 @@
     <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftFakesVersion>17.9.0-beta.24058.4</MicrosoftFakesVersion>
-    <MicrosoftInternalCodeCoverageVersion>17.12.0-preview.24409.1</MicrosoftInternalCodeCoverageVersion>
+    <MicrosoftInternalCodeCoverageVersion>17.12.0-preview.24409.2</MicrosoftInternalCodeCoverageVersion>
     <MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.10.34924.118</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
     <MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
     <MicrosoftVisualStudioInteropVersion>17.10.525-preview.1</MicrosoftVisualStudioInteropVersion>
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
index 117a6ba933..530ba92536 100644
--- a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
+++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
@@ -33,34 +33,34 @@
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\codecoveragemessages.dll" target="build\netstandard2.0\CodeCoverage\codecoveragemessages.dll" />
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\covrun32.dll" target="build\netstandard2.0\CodeCoverage\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\msdia140.dll" target="build\netstandard2.0\CodeCoverage\" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="build\netstandard2.0\CodeCoverage\" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\Cov_x86.config" target="build\netstandard2.0\CodeCoverage\" />
 
     <file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="build\netstandard2.0\CodeCoverage\coreclr\" />
 
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\CodeCoverage.exe" target="build\netstandard2.0\CodeCoverage\amd64\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\covrun64.dll" target="build\netstandard2.0\CodeCoverage\amd64\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\msdia140.dll" target="build\netstandard2.0\CodeCoverage\amd64\" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="build\netstandard2.0\CodeCoverage\amd64\" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\amd64\Cov_x64.config" target="build\netstandard2.0\CodeCoverage\amd64\" />
 
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\covrunarm64.dll" target="build\netstandard2.0\CodeCoverage\arm64\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\msdia140.dll" target="build\netstandard2.0\CodeCoverage\arm64\" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="build\netstandard2.0\CodeCoverage\arm64\" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\CodeCoverage\arm64\Cov_arm64.config" target="build\netstandard2.0\CodeCoverage\arm64\" />
 
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll"	target="build\netstandard2.0\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll"	target="build\netstandard2.0\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll"	target="build\netstandard2.0\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x86\MicrosoftInstrumentationEngine_x86.dll"	target="build\netstandard2.0\x86\MicrosoftInstrumentationEngine_x86.dll" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\x64\MicrosoftInstrumentationEngine_x64.dll"	target="build\netstandard2.0\x64\MicrosoftInstrumentationEngine_x64.dll" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\arm64\MicrosoftInstrumentationEngine_arm64.dll"	target="build\netstandard2.0\arm64\MicrosoftInstrumentationEngine_arm64.dll" />
 
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so"	target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\VanguardInstrumentationProfiler_x64.config"	target="build\netstandard2.0\InstrumentationEngine\ubuntu\x64\VanguardInstrumentationProfiler_x64.config" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard2.0\ubuntu\x64\libCoverageInstrumentationMethod.so" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\libInstrumentationEngine.so"	target="build\netstandard2.0\ubuntu\x64\libInstrumentationEngine.so" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\ubuntu\x64\Cov_x64.config"	target="build\netstandard2.0\ubuntu\x64\Cov_x64.config" />
 
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard2.0\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so"	target="build\netstandard2.0\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config"	target="build\netstandard2.0\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libCoverageInstrumentationMethod.so"	target="build\netstandard2.0\alpine\x64\libCoverageInstrumentationMethod.so" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so"	target="build\netstandard2.0\alpine\x64\libInstrumentationEngine.so" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\alpine\x64\Cov_x64.config"	target="build\netstandard2.0\alpine\x64\Cov_x64.config" />
 
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib"	target="build\netstandard2.0\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib"	target="build\netstandard2.0\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib" />
-    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config"	target="build\netstandard2.0\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib"	target="build\netstandard2.0\macos\x64\libCoverageInstrumentationMethod.dylib" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib"	target="build\netstandard2.0\macos\x64\libInstrumentationEngine.dylib" />
+    <file src="net462\Microsoft.Internal.CodeCoverage\InstrumentationEngine\macos\x64\Cov_x64.config"	target="build\netstandard2.0\macos\x64\Cov_x64.config" />
 
     <file src="net462\Microsoft.Internal.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\netcoreapp3.1\" />
     <file src="net462\Microsoft.Internal.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net462\" />
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index 812cab1cfe..921d46e25c 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -448,16 +448,16 @@
     <file src="net472\CodeCoverage\codecoveragemessages.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\codecoveragemessages.dll" />
     <file src="net472\CodeCoverage\covrun32.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
     <file src="net472\CodeCoverage\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
-    <file src="net472\CodeCoverage\VanguardInstrumentationProfiler_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
+    <file src="net472\CodeCoverage\Cov_x86.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />
 
     <file src="net472\CodeCoverage\amd64\CodeCoverage.exe" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
     <file src="net472\CodeCoverage\amd64\covrun64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
     <file src="net472\CodeCoverage\amd64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
-    <file src="net472\CodeCoverage\amd64\VanguardInstrumentationProfiler_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
+    <file src="net472\CodeCoverage\amd64\Cov_x64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\amd64\" />
 
     <file src="net472\CodeCoverage\arm64\covrunarm64.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
     <file src="net472\CodeCoverage\arm64\msdia140.dll" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
-    <file src="net472\CodeCoverage\arm64\VanguardInstrumentationProfiler_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
+    <file src="net472\CodeCoverage\arm64\Cov_arm64.config" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\arm64\" />
 
     <file src="net472\Microsoft.VisualStudio.Telemetry.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Telemetry.dll" />
     <file src="net472\Microsoft.VisualStudio.Utilities.Internal.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Utilities.Internal.dll" />