From fe499e5c3e7ae418b9658ba0955de30ddc94ee67 Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Mon, 13 Apr 2026 16:09:57 +0800 Subject: [PATCH 1/2] [WinML Bug Bash] [Sample] Fix C++ vcxproj NuGet version drift and PlatformToolset - Update all NuGet package versions in vcxproj Import paths, Error conditions, and packages.config to match versions expected by Runtime 1.8.260317003: - InteractiveExperiences: 1.8.260125001 - Foundation: 1.8.260222000 - WinUI: 1.8.260224000 - AI: 1.8.53 - ML: 1.8.2141 - Runtime: 1.8.260317003 - WebView2: 1.0.3405.78 - Replace hardcoded PlatformToolset v143 with \ for VS 2022/2025/2026 compatibility ADO Bug: #61791039 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../cpp-abi/CppAbiEPEnumerationSample.vcxproj | 26 +++++----- Samples/WindowsML/cpp-abi/packages.config | 8 +-- ...pConsoleDesktop.FrameworkDependent.vcxproj | 34 ++++++------- .../packages.config | 10 ++-- .../CppConsoleDesktop.GenAI.vcxproj | 50 +++++++++---------- .../CppConsoleDesktop.GenAI/packages.config | 14 +++--- .../CppConsoleDesktop.SelfContained.vcxproj | 26 +++++----- .../packages.config | 8 +-- .../CppConsoleDesktop.vcxproj | 42 ++++++++-------- .../cpp/CppConsoleDesktop/packages.config | 14 +++--- .../ConsoleClient/ConsoleClient.vcxproj | 2 +- .../WindowsMLWrapper/WindowsMLWrapper.vcxproj | 50 +++++++++---------- .../WindowsMLWrapper/packages.config | 12 ++--- .../CppResnetBuildDemo.vcxproj | 50 +++++++++---------- .../CppResnetBuildDemo/packages.config | 14 +++--- 15 files changed, 180 insertions(+), 180 deletions(-) diff --git a/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj b/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj index 3734f9f3b..8dab16e3f 100644 --- a/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj +++ b/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj @@ -15,11 +15,11 @@ 10.0.26100.0 - - + + - + @@ -40,7 +40,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -91,12 +91,12 @@ - + - - + + @@ -104,17 +104,17 @@ - - + + - - - - + + + + \ No newline at end of file diff --git a/Samples/WindowsML/cpp-abi/packages.config b/Samples/WindowsML/cpp-abi/packages.config index a0f454f49..bfb16ab3f 100644 --- a/Samples/WindowsML/cpp-abi/packages.config +++ b/Samples/WindowsML/cpp-abi/packages.config @@ -1,10 +1,10 @@ - + - - - + + + \ No newline at end of file diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj index 404a1e884..70e7eac30 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj @@ -11,10 +11,10 @@ - - - - + + + + @@ -35,7 +35,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -84,10 +84,10 @@ - - - - + + + + @@ -101,13 +101,13 @@ - - - - - - - - + + + + + + + + diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/packages.config b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/packages.config index 27d08c6c9..f8d25434f 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/packages.config @@ -1,11 +1,11 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj index 2ff5e500c..08945bdac 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj @@ -10,13 +10,13 @@ - + - - - - - + + + + + @@ -41,7 +41,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -83,13 +83,13 @@ - - - - - + + + + + - + @@ -109,20 +109,20 @@ - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/packages.config b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/packages.config index 9614bb8ef..82f95b894 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/packages.config @@ -1,4 +1,4 @@ - + @@ -6,14 +6,14 @@ - + - - - - + + + + - + \ No newline at end of file diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj index 9da2c799f..c4c33f287 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj @@ -8,9 +8,9 @@ true - - - + + + @@ -33,7 +33,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -82,9 +82,9 @@ - - - + + + @@ -98,11 +98,11 @@ - - - - - - + + + + + + diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/packages.config b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/packages.config index 8cb36afee..cee3d1a45 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/packages.config @@ -1,10 +1,10 @@ - + - - - + + + \ No newline at end of file diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj index 7cfdf03ef..72bc3f662 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj @@ -10,11 +10,11 @@ - - - - - + + + + + @@ -38,7 +38,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -91,11 +91,11 @@ - - - - - + + + + + @@ -114,16 +114,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config b/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config index 7838522de..87ba07fc5 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ - + - - - - + + + + - + diff --git a/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj b/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj index 1eec70652..7e94696ab 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj @@ -16,7 +16,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj index bc7ff569c..3809370f8 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj @@ -10,13 +10,13 @@ true - + - - - - - + + + + + @@ -41,7 +41,7 @@ DynamicLibrary - v143 + $(DefaultPlatformToolset) Unicode @@ -72,13 +72,13 @@ - - - - - + + + + + - + @@ -96,20 +96,20 @@ - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config index c1d47d402..fb970df42 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config @@ -3,15 +3,15 @@ - + - - - - + + + + - + diff --git a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj index b744795e1..5ed8e4cb3 100644 --- a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj +++ b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj @@ -5,13 +5,13 @@ ..\..\..\packages - + - - - - - + + + + + @@ -34,7 +34,7 @@ Application - v143 + $(DefaultPlatformToolset) Unicode @@ -67,13 +67,13 @@ - - - - - + + + + + - + @@ -92,20 +92,20 @@ - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config index 630b607bf..9d81ffb2c 100644 --- a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config +++ b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ - + - - - - + + + + - + \ No newline at end of file From 481ce59ee293e27cf0d0f0adb33788a388b6801b Mon Sep 17 00:00:00 2001 From: Copilot <223556219+Copilot@users.noreply.github.com> Date: Tue, 14 Apr 2026 12:09:59 +0800 Subject: [PATCH 2/2] Address Copilot review: fix WebView2 version mismatch, align WindowsAppSDK, add toolset fallback - Update WebView2 from 1.0.3179.45 to 1.0.3405.78 in 3 packages.config files to match the version imported by vcxproj files - Add v143 fallback for in all 8 vcxproj files to handle MSBuild environments where the property is empty Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj | 3 ++- .../CppConsoleDesktop.FrameworkDependent.vcxproj | 3 ++- .../CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj | 3 ++- .../CppConsoleDesktop.SelfContained.vcxproj | 3 ++- .../WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj | 3 ++- Samples/WindowsML/cpp/CppConsoleDesktop/packages.config | 2 +- .../cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj | 3 ++- .../CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj | 3 ++- .../cpp/CppConsoleDll/WindowsMLWrapper/packages.config | 2 +- .../CppResnetBuildDemo/CppResnetBuildDemo.vcxproj | 3 ++- .../cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config | 2 +- 11 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj b/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj index 8dab16e3f..e8999781f 100644 --- a/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj +++ b/Samples/WindowsML/cpp-abi/CppAbiEPEnumerationSample.vcxproj @@ -40,7 +40,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj index 70e7eac30..20a1b3fcf 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.FrameworkDependent/CppConsoleDesktop.FrameworkDependent.vcxproj @@ -35,7 +35,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj index 08945bdac..9091f22f4 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.GenAI/CppConsoleDesktop.GenAI.vcxproj @@ -41,7 +41,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj index c4c33f287..58cb824cc 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop.SelfContained/CppConsoleDesktop.SelfContained.vcxproj @@ -33,7 +33,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj b/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj index 72bc3f662..d836ed061 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDesktop/CppConsoleDesktop.vcxproj @@ -38,7 +38,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config b/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config index 87ba07fc5..2e3f2dc13 100644 --- a/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDesktop/packages.config @@ -1,6 +1,6 @@ - + diff --git a/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj b/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj index 7e94696ab..b373f4935 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDll/ConsoleClient/ConsoleClient.vcxproj @@ -16,7 +16,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj index 3809370f8..b7c5a2dc5 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj +++ b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/WindowsMLWrapper.vcxproj @@ -41,7 +41,8 @@ DynamicLibrary - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config index fb970df42..c8df7edf4 100644 --- a/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config +++ b/Samples/WindowsML/cpp/CppConsoleDll/WindowsMLWrapper/packages.config @@ -14,5 +14,5 @@ - + diff --git a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj index 5ed8e4cb3..6ac7679a7 100644 --- a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj +++ b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/CppResnetBuildDemo.vcxproj @@ -34,7 +34,8 @@ Application - $(DefaultPlatformToolset) + $(DefaultPlatformToolset) + v143 Unicode diff --git a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config index 9d81ffb2c..8a7bb4edf 100644 --- a/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config +++ b/Samples/WindowsML/cpp/CppResnetBuildDemo/CppResnetBuildDemo/packages.config @@ -1,6 +1,6 @@ - +