From 8fe1db47b04fb4a6b71fa2275bcbdfe87c315360 Mon Sep 17 00:00:00 2001
From: Flor Elisa Chacon Ochoa <florch@microsoft.com>
Date: Tue, 30 Dec 2025 13:34:14 -0800
Subject: [PATCH 1/5] Add target to ensure triplet match

---
 src/Directory.Solution.props |  3 +++
 src/vcpkg.props              | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/Directory.Solution.props

diff --git a/src/Directory.Solution.props b/src/Directory.Solution.props
new file mode 100644
index 0000000000..493320a2dd
--- /dev/null
+++ b/src/Directory.Solution.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$(MSBuildProjectDirectory)\vcpkg.props" />
+</Project>
\ No newline at end of file
diff --git a/src/vcpkg.props b/src/vcpkg.props
index ccf1644c87..00274029be 100644
--- a/src/vcpkg.props
+++ b/src/vcpkg.props
@@ -48,4 +48,24 @@
     <VcpkgTriplet>x86-fuzzing</VcpkgTriplet>
     <VcpkgConfiguration>Release</VcpkgConfiguration>
   </PropertyGroup>
+
+  <PropertyGroup>
+      <_TripletFile>$(VcpkgInstalledDir)\.selectedtriplet</_TripletFile>
+      <_IsBuildingSln>$(MSBuildProjectName.EndsWith('.sln'))</_IsBuildingSln>
+  </PropertyGroup>
+
+  <Target Name="WriteSolutionTripletToFile" BeforeTargets="Build" Condition="'$(_IsBuildingSln)' == 'true'">
+    <WriteLinesToFile File="$(_TripletFile)" Lines="$(VcpkgTriplet)" Overwrite="true" />
+  </Target>
+
+  <Target Name="EnsureNoTripletMismatch" BeforeTargets="PrepareForBuild" Condition="'$(_IsBuildingSln)' != 'true'">
+    <ReadLinesFromFile File="$(_TripletFile)">
+      <Output TaskParameter="Lines" ItemName="_TripletFileLines" />
+    </ReadLinesFromFile>
+
+    <PropertyGroup>
+      <_SolutionTriplet>@(_TripletFileLines)</_SolutionTriplet>
+    </PropertyGroup>
+    <Error Condition=" '$(_SolutionTriplet)' != '$(VcpkgTriplet)' " Text="The vcpkg triplet $(VcpkgTriplet) selected for this project does not match the solution triplet $(_SolutionTriplet)" />
+  </Target>
 </Project>

From 37f3f7f7badd4d172712ff15377cca4c8c529da3 Mon Sep 17 00:00:00 2001
From: Flor Elisa Chacon Ochoa <florch@microsoft.com>
Date: Mon, 29 Dec 2025 14:47:51 -0800
Subject: [PATCH 2/5] No ReleaseStatic for InProc testbed

---
 src/AppInstallerCLI.sln | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index 873dbf1eb2..64367a1cac 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32630.192
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "AppInstallerCLIPackage\AppInstallerCLIPackage.wapproj", "{6AA3791A-0713-4548-A357-87A323E7AC3A}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -1043,11 +1043,8 @@ Global
 		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.Release|x86.ActiveCfg = Release|Win32
 		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.Release|x86.Build.0 = Release|Win32
 		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|ARM64.ActiveCfg = Release|ARM64
-		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|ARM64.Build.0 = Release|ARM64
 		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|x64.ActiveCfg = Release|x64
-		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|x64.Build.0 = Release|x64
 		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|x86.ActiveCfg = Release|Win32
-		{E5BCFF58-7D0C-4770-ABB9-AECE1027CD94}.ReleaseStatic|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From f8f115b9efe68902c466a248e63386297661446a Mon Sep 17 00:00:00 2001
From: Flor Elisa Chacon Ochoa <florch@microsoft.com>
Date: Tue, 30 Dec 2025 13:52:37 -0800
Subject: [PATCH 3/5] Add comments

---
 src/AppInstallerCLI.sln      |  5 +++--
 src/Directory.Solution.props |  3 ++-
 src/vcpkg.props              | 21 +++++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
index 64367a1cac..ce55e5635b 100644
--- a/src/AppInstallerCLI.sln
+++ b/src/AppInstallerCLI.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11205.157 d18.0
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "AppInstallerCLIPackage\AppInstallerCLIPackage.wapproj", "{6AA3791A-0713-4548-A357-87A323E7AC3A}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -37,7 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8D53
 		..\azure-pipelines.nuget.yml = ..\azure-pipelines.nuget.yml
 		..\azure-pipelines.yml = ..\azure-pipelines.yml
 		..\cgmanifest.json = ..\cgmanifest.json
-		Directory.Build.props = Directory.Build.props
 		Get-VcxprojNugetPackageVersions.ps1 = Get-VcxprojNugetPackageVersions.ps1
 		..\README.md = ..\README.md
 		..\doc\ReleaseNotes.md = ..\doc\ReleaseNotes.md
@@ -97,7 +96,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A5D7A7D-5CB2-47D5-B40D-4E61CAEDC798}"
 	ProjectSection(SolutionItems) = preProject
 		CodeAnalysis.ruleset = CodeAnalysis.ruleset
+		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
+		Directory.Solution.props = Directory.Solution.props
 		nuget.config = nuget.config
 		stylecop.json = stylecop.json
 		vcpkg.json = vcpkg.json
diff --git a/src/Directory.Solution.props b/src/Directory.Solution.props
index 493320a2dd..25c0062552 100644
--- a/src/Directory.Solution.props
+++ b/src/Directory.Solution.props
@@ -1,3 +1,4 @@
+<!-- This file is automatically included in the (autogenerated) project file for the solution. -->
 <Project>
-  <Import Project="$(MSBuildProjectDirectory)\vcpkg.props" />
+    <Import Project="$(MSBuildProjectDirectory)\vcpkg.props" />
 </Project>
\ No newline at end of file
diff --git a/src/vcpkg.props b/src/vcpkg.props
index 00274029be..6d7b7c37e5 100644
--- a/src/vcpkg.props
+++ b/src/vcpkg.props
@@ -49,16 +49,27 @@
     <VcpkgConfiguration>Release</VcpkgConfiguration>
   </PropertyGroup>
 
+  <!-- vcpkg can only install ports for one triplet at a time, so we need to ensure that every project using vcpkg uses the same triplet.
+       If there is a triplet mismatch, the ports for one of the triplets will be deleted when installing a second one.
+       In parallel builds, this can lead to projects that use the first triplet not being able to find the headers or binaries, and cause an error. -->
+
   <PropertyGroup>
-      <_TripletFile>$(VcpkgInstalledDir)\.selectedtriplet</_TripletFile>
+      <!-- The MSBuild process starts with the solution file, and each individual project is built recursively from there.
+           When building the .sln, we will write a file to indicate which triplet should be used in all projects.
+           Each project will later read this file to verify that it is using the same triplet. -->
       <_IsBuildingSln>$(MSBuildProjectName.EndsWith('.sln'))</_IsBuildingSln>
+      <_TripletFile>$(VcpkgInstalledDir)\.solutiontriplet</_TripletFile>
   </PropertyGroup>
 
-  <Target Name="WriteSolutionTripletToFile" BeforeTargets="Build" Condition="'$(_IsBuildingSln)' == 'true'">
+  <Target Name="WriteSolutionTripletToFile"
+          BeforeTargets="Build"
+          Condition="'$(_IsBuildingSln)' == 'true'">
     <WriteLinesToFile File="$(_TripletFile)" Lines="$(VcpkgTriplet)" Overwrite="true" />
   </Target>
 
-  <Target Name="EnsureNoTripletMismatch" BeforeTargets="PrepareForBuild" Condition="'$(_IsBuildingSln)' != 'true'">
+  <Target Name="EnsureNoTripletMismatch"
+          BeforeTargets="PrepareForBuild"
+          Condition="'$(_IsBuildingSln)' != 'true'" >
     <ReadLinesFromFile File="$(_TripletFile)">
       <Output TaskParameter="Lines" ItemName="_TripletFileLines" />
     </ReadLinesFromFile>
@@ -66,6 +77,8 @@
     <PropertyGroup>
       <_SolutionTriplet>@(_TripletFileLines)</_SolutionTriplet>
     </PropertyGroup>
-    <Error Condition=" '$(_SolutionTriplet)' != '$(VcpkgTriplet)' " Text="The vcpkg triplet $(VcpkgTriplet) selected for this project does not match the solution triplet $(_SolutionTriplet)" />
+
+    <Error Condition=" '$(_SolutionTriplet)' != '$(VcpkgTriplet)' "
+           Text="The vcpkg triplet $(VcpkgTriplet) selected for this project does not match the solution triplet $(_SolutionTriplet)" />
   </Target>
 </Project>

From 93557deceb57865f98b3a663071b03f01b63d545 Mon Sep 17 00:00:00 2001
From: Flor Elisa Chacon Ochoa <florch@microsoft.com>
Date: Tue, 30 Dec 2025 14:36:33 -0800
Subject: [PATCH 4/5] Make it work from VS

---
 src/vcpkg.props | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/vcpkg.props b/src/vcpkg.props
index 6d7b7c37e5..2d04c7f4cb 100644
--- a/src/vcpkg.props
+++ b/src/vcpkg.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Vcpkg">
     <VcpkgEnableManifest>true</VcpkgEnableManifest>
-    <VcpkgInstalledDir>$(MSBuildThisFileDirectory)\vcpkg_installed</VcpkgInstalledDir>
+    <VcpkgInstalledDir>$(MSBuildThisFileDirectory)vcpkg_installed\</VcpkgInstalledDir>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgTriplet>x64</VcpkgTriplet>
@@ -58,7 +58,7 @@
            When building the .sln, we will write a file to indicate which triplet should be used in all projects.
            Each project will later read this file to verify that it is using the same triplet. -->
       <_IsBuildingSln>$(MSBuildProjectName.EndsWith('.sln'))</_IsBuildingSln>
-      <_TripletFile>$(VcpkgInstalledDir)\.solutiontriplet</_TripletFile>
+      <_TripletFile>$(VcpkgInstalledDir).solutiontriplet</_TripletFile>
   </PropertyGroup>
 
   <Target Name="WriteSolutionTripletToFile"
@@ -67,9 +67,19 @@
     <WriteLinesToFile File="$(_TripletFile)" Lines="$(VcpkgTriplet)" Overwrite="true" />
   </Target>
 
+  <!-- Note: Visual Studio does not build the .sln in the same way that MSBuild.exe does, so the above target is not executed.
+        In that case we try to write the file on the first project we build.
+        There is a race condition for parallel builds in doing this, but it won't happen on pipeline builds... -->
+  <Target Name="WriteProjectTripletToFile"
+          BeforeTargets="EnsureNoTripletMismatch"
+          Condition="!Exists('$(_TripletFile)')">
+    <WriteLinesToFile File="$(_TripletFile)" Lines="$(VcpkgTriplet)" Overwrite="true" />
+  </Target>
+
   <Target Name="EnsureNoTripletMismatch"
           BeforeTargets="PrepareForBuild"
           Condition="'$(_IsBuildingSln)' != 'true'" >
+
     <ReadLinesFromFile File="$(_TripletFile)">
       <Output TaskParameter="Lines" ItemName="_TripletFileLines" />
     </ReadLinesFromFile>
@@ -79,6 +89,6 @@
     </PropertyGroup>
 
     <Error Condition=" '$(_SolutionTriplet)' != '$(VcpkgTriplet)' "
-           Text="The vcpkg triplet $(VcpkgTriplet) selected for this project does not match the solution triplet $(_SolutionTriplet)" />
+           Text="The vcpkg triplet '$(VcpkgTriplet)' selected for project '$(MSBuildProjectName)' does not match with the solution triplet '$(_SolutionTriplet)'. If you are building from Visual Studio, try deleting the file '$(_TripletFile)'." />
   </Target>
 </Project>

From 5c146496524237f2dc067b41fd67e4caf6dd5365 Mon Sep 17 00:00:00 2001
From: Flor Elisa Chacon Ochoa <florch@microsoft.com>
Date: Tue, 30 Dec 2025 15:11:04 -0800
Subject: [PATCH 5/5] sp

---
 src/vcpkg.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vcpkg.props b/src/vcpkg.props
index 2d04c7f4cb..05c288b9b4 100644
--- a/src/vcpkg.props
+++ b/src/vcpkg.props
@@ -58,7 +58,7 @@
            When building the .sln, we will write a file to indicate which triplet should be used in all projects.
            Each project will later read this file to verify that it is using the same triplet. -->
       <_IsBuildingSln>$(MSBuildProjectName.EndsWith('.sln'))</_IsBuildingSln>
-      <_TripletFile>$(VcpkgInstalledDir).solutiontriplet</_TripletFile>
+      <_TripletFile>$(VcpkgInstalledDir).solution-triplet</_TripletFile>
   </PropertyGroup>
 
   <Target Name="WriteSolutionTripletToFile"