Merge remote-tracking branch 'origin/main' into feature/llm

microsoft · Nov 23, 2024 · 85c3339 · 85c3339
2 parents 3501d78 + 6047f37
commit 85c3339
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
@@ -275,6 +275,9 @@
     <VcpkgOSTarget>windows</VcpkgOSTarget>
     <VcpkgUseStatic>true</VcpkgUseStatic>
 
+    <!-- BODGY - work around DD#2302065. vcpkg now validates target triplets, and is *case sensitive* -->
+    <VcpkgPlatformTarget Condition="'$(Platform)'=='ARM64'">arm64</VcpkgPlatformTarget>
+
     <VcpkgAdditionalInstallOptions>--x-feature=terminal</VcpkgAdditionalInstallOptions>
     <!--
       Since we link everything statically, we don't need to copy anything.