From 70dcd1b96fa1189621ae32d226799d4b85e240f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 16 May 2023 11:32:40 +0200
Subject: [PATCH 1/4] Dowgrade version of TestPlatform.Remote.Externals
 dependency

---
 eng/Versions.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d6cdf22c42..7b4d6907a7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,8 @@
     <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
     <SystemUriVersion>4.3.2</SystemUriVersion>
     <TestPlatformMSDiaVersion>17.6.33617.297</TestPlatformMSDiaVersion>
-    <TestPlatformRemoteExternalsVersion>17.6.33617.297</TestPlatformRemoteExternalsVersion>
+    <!-- DO NOT BUMP THIS VERSION - it seems to be causing issues after VS insertion -->
+    <TestPlatformRemoteExternalsVersion>17.3.32621.448</TestPlatformRemoteExternalsVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftNetCompilersToolsetVersion>4.6.0-1.23107.10</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>

From d9900f415019a151f76e964b216e273e3b57622c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 16 May 2023 11:46:52 +0200
Subject: [PATCH 2/4] Update

---
 eng/SourceBuildPrebuiltBaseline.xml | 2 +-
 eng/Versions.props                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index a76c88ab3c..8170f3d8c2 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -3,7 +3,7 @@
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
 
     <!-- Tracked with https://github.com/microsoft/vstest/issues/4403 -->
-    <UsagePattern IdentityGlob="Microsoft.Internal.TestPlatform.Remote/17.6.33617.297" />
+    <UsagePattern IdentityGlob="Microsoft.Internal.TestPlatform.Remote/17.3.32621.448" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/3.0.0-preview4-27615-11" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7b4d6907a7..6d858e6a2f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,7 +38,7 @@
     <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
     <SystemUriVersion>4.3.2</SystemUriVersion>
     <TestPlatformMSDiaVersion>17.6.33617.297</TestPlatformMSDiaVersion>
-    <!-- DO NOT BUMP THIS VERSION - it seems to be causing issues after VS insertion -->
+    <!-- DO NOT BUMP THIS VERSION - it seems to be causing issues after VS insertion for CPP unit test -->
     <TestPlatformRemoteExternalsVersion>17.3.32621.448</TestPlatformRemoteExternalsVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftNetCompilersToolsetVersion>4.6.0-1.23107.10</MicrosoftNetCompilersToolsetVersion>

From 9b8738b810658ab15c87b0d4c3de4ee63f85c076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 16 May 2023 14:28:29 +0200
Subject: [PATCH 3/4] Use Internal.TestPlatform.Extensions instead of
 Internal.TestPlatform.Remote

---
 eng/Versions.props                                         | 6 ++----
 ...osoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6d858e6a2f..c2ecf9edc7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,9 +37,9 @@
     <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
     <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
     <SystemUriVersion>4.3.2</SystemUriVersion>
+    <TestPlatformExternalsVersion>17.6.33617.297</TestPlatformExternalsVersion>
     <TestPlatformMSDiaVersion>17.6.33617.297</TestPlatformMSDiaVersion>
-    <!-- DO NOT BUMP THIS VERSION - it seems to be causing issues after VS insertion for CPP unit test -->
-    <TestPlatformRemoteExternalsVersion>17.3.32621.448</TestPlatformRemoteExternalsVersion>
+    <TestPlatformRemoteExternalsVersion>17.6.33617.297</TestPlatformRemoteExternalsVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftNetCompilersToolsetVersion>4.6.0-1.23107.10</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
@@ -86,7 +86,5 @@
     <NuGetFrameworksVersion>5.11.0</NuGetFrameworksVersion>
     <ILAsmPackageVersion>5.0.0</ILAsmPackageVersion>
     <JsonNetVersion>13.0.1</JsonNetVersion>
-    <!-- We cannot reuse $(msbuildvar) because we need the text value inside build.ps1 -->
-    <TestPlatformExternalsVersion>17.6.33617.297</TestPlatformExternalsVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
index 6b312c17aa..912e3ef5da 100644
--- a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -29,7 +29,6 @@
     <!-- Properties for items we include in VSIX -->
     <ExtensionInstallationRelativeToVS>[installDir]\Common7\IDE\Extensions\TestPlatform</ExtensionInstallationRelativeToVS>
     <TestPlatformCliBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\</TestPlatformCliBinFolder>
-    <InternalTestPlatformRemoteFolder>$(TestPlatformCliBinFolder)Microsoft.Internal.TestPlatform.Remote\Extensions\</InternalTestPlatformRemoteFolder>
     <TestPlatformBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\net472\</TestPlatformBinFolder>
     <MsDiaFolder>$(TestPlatformBinFolder)Microsoft.Internal.Dia\</MsDiaFolder>
     <CUITFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.CUIT\</CUITFolder>
@@ -118,13 +117,13 @@
 
     <!-- Cpp Extensions -->
     <ItemGroup>
-      <VsixSourceItem Include="$(InternalTestPlatformRemoteFolder)*" Exclude="$(InternalTestPlatformRemoteFolder)*.pdb;$(InternalTestPlatformRemoteFolder)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.ComInterfaces.dll;$(InternalTestPlatformRemoteFolder)Microsoft.VisualStudio.TestTools.CppUnitTestFramework.CppUnitTestExtension.dll;$(InternalTestPlatformRemoteFolder)System.ComponentModel.Composition.dll">
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\*" Exclude="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\*.pdb">
         <VSIXSubPath>Extensions\Cpp</VSIXSubPath>
       </VsixSourceItem>
-      <VsixSourceItem Include="$(InternalTestPlatformRemoteFolder)arm64\*" Exclude="$(InternalTestPlatformRemoteFolder)arm64\*.pdb">
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\arm64\dbghelp.dll">
         <VSIXSubPath>Extensions\Cpp\arm64</VSIXSubPath>
       </VsixSourceItem>
-      <VsixSourceItem Include="$(InternalTestPlatformRemoteFolder)x64\*" Exclude="$(InternalTestPlatformRemoteFolder)x64\*.pdb">
+      <VsixSourceItem Include="$(InternalTestPlatformExtensionsFolder)\Extensions\Cpp\x64\dbghelp.dll">
         <VSIXSubPath>Extensions\Cpp\x64</VSIXSubPath>
       </VsixSourceItem>
     </ItemGroup>

From b3ae6e68ca9ced079876fac935909aeb0b569004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 16 May 2023 14:30:07 +0200
Subject: [PATCH 4/4] Revert baseline change for source build

---
 eng/SourceBuildPrebuiltBaseline.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 8170f3d8c2..a76c88ab3c 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -3,7 +3,7 @@
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
 
     <!-- Tracked with https://github.com/microsoft/vstest/issues/4403 -->
-    <UsagePattern IdentityGlob="Microsoft.Internal.TestPlatform.Remote/17.3.32621.448" />
+    <UsagePattern IdentityGlob="Microsoft.Internal.TestPlatform.Remote/17.6.33617.297" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/3.0.0-preview4-27615-11" />
   </IgnorePatterns>
 </UsageData>