From b10ee300067fa78f65b4b4fdec7d77ead99bc9a9 Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 22 May 2026 02:13:18 -0500 Subject: [PATCH 1/4] Remove stale MSBuild project entries Clean project and filter wiring that points at removed or generated files so Visual Studio metadata matches the files carried in the repo. Files changed: - Solutions/Clienttelemetry/Clienttelemetry.vcxitems - examples/cpp project and filter files - lib/pal and lib/tracing shared item files - tests/googletest filter metadata - third_party/Solutions/zlib/vc14/zlibvc.vcxproj - tools/ports/mstelemetry/v142-build.patch Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Clienttelemetry/Clienttelemetry.vcxitems | 3 - .../Clienttelemetry.vcxitems.filters | 5 - examples/cpp/EventSender/EventSender.vcxproj | 4 +- .../EventSender/EventSender.vcxproj.filters | 95 ------------------- examples/cpp/SampleCpp/SampleCpp.vcxproj | 4 +- .../cpp/SampleCppUWP/SampleCppUWP.vcxproj | 3 - .../SampleCppUWP/SampleCppUWP.vcxproj.filters | 1 - lib/pal/desktop/desktop.vcxitems.filters | 4 - lib/pal/universal/universal.vcxitems.filters | 4 - lib/tracing/api/tracing-api.vcxitems | 4 +- .../googletest/msvc/gtest.vcxproj.filters | 2 +- .../Solutions/zlib/vc14/zlibvc.vcxproj | 3 - tools/ports/mstelemetry/v142-build.patch | 3 - 13 files changed, 7 insertions(+), 128 deletions(-) diff --git a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems index 4ed829608..065ca3118 100644 --- a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems +++ b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems @@ -87,7 +87,6 @@ - @@ -116,7 +115,6 @@ - @@ -159,7 +157,6 @@ - diff --git a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters index 87a11c450..376e1dfba 100644 --- a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters +++ b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters @@ -72,7 +72,6 @@ - @@ -101,7 +100,6 @@ - @@ -124,8 +122,6 @@ - - @@ -146,7 +142,6 @@ - diff --git a/examples/cpp/EventSender/EventSender.vcxproj b/examples/cpp/EventSender/EventSender.vcxproj index 73899d2e5..50332eda6 100644 --- a/examples/cpp/EventSender/EventSender.vcxproj +++ b/examples/cpp/EventSender/EventSender.vcxproj @@ -200,10 +200,10 @@ - + {1DC6B38A-B390-34CE-907F-4958807A3D42} - + {2ebc7b3c-2af1-442c-9285-cab39bbb8c00} diff --git a/examples/cpp/EventSender/EventSender.vcxproj.filters b/examples/cpp/EventSender/EventSender.vcxproj.filters index f5b9ccda5..3eed0873f 100644 --- a/examples/cpp/EventSender/EventSender.vcxproj.filters +++ b/examples/cpp/EventSender/EventSender.vcxproj.filters @@ -19,99 +19,4 @@ Source Files - - - - Header Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - \ No newline at end of file diff --git a/examples/cpp/SampleCpp/SampleCpp.vcxproj b/examples/cpp/SampleCpp/SampleCpp.vcxproj index 417568222..9c539f10a 100644 --- a/examples/cpp/SampleCpp/SampleCpp.vcxproj +++ b/examples/cpp/SampleCpp/SampleCpp.vcxproj @@ -1093,10 +1093,10 @@ - + {1DC6B38A-B390-34CE-907F-4958807A3D42} - + {2ebc7b3c-2af1-442c-9285-cab39bbb8c00} diff --git a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj index 0f493a588..885d976e9 100644 --- a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj +++ b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj @@ -110,8 +110,6 @@ - - False @@ -281,7 +279,6 @@ - diff --git a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters index 6aa826060..98247e7a6 100644 --- a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters +++ b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters @@ -46,6 +46,5 @@ - \ No newline at end of file diff --git a/lib/pal/desktop/desktop.vcxitems.filters b/lib/pal/desktop/desktop.vcxitems.filters index a1d6dd857..9653a4ab3 100644 --- a/lib/pal/desktop/desktop.vcxitems.filters +++ b/lib/pal/desktop/desktop.vcxitems.filters @@ -10,8 +10,4 @@ - - - - \ No newline at end of file diff --git a/lib/pal/universal/universal.vcxitems.filters b/lib/pal/universal/universal.vcxitems.filters index 7b4700534..c09a703b4 100644 --- a/lib/pal/universal/universal.vcxitems.filters +++ b/lib/pal/universal/universal.vcxitems.filters @@ -11,8 +11,4 @@ - - - - \ No newline at end of file diff --git a/lib/tracing/api/tracing-api.vcxitems b/lib/tracing/api/tracing-api.vcxitems index e8d272545..173f7cccd 100644 --- a/lib/tracing/api/tracing-api.vcxitems +++ b/lib/tracing/api/tracing-api.vcxitems @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + false diff --git a/tests/googletest/googletest/msvc/gtest.vcxproj.filters b/tests/googletest/googletest/msvc/gtest.vcxproj.filters index b566f891e..8d58a27b2 100644 --- a/tests/googletest/googletest/msvc/gtest.vcxproj.filters +++ b/tests/googletest/googletest/msvc/gtest.vcxproj.filters @@ -11,7 +11,7 @@ - + Source Files diff --git a/third_party/Solutions/zlib/vc14/zlibvc.vcxproj b/third_party/Solutions/zlib/vc14/zlibvc.vcxproj index 9ac005ede..aeefce9d0 100644 --- a/third_party/Solutions/zlib/vc14/zlibvc.vcxproj +++ b/third_party/Solutions/zlib/vc14/zlibvc.vcxproj @@ -1199,11 +1199,8 @@ bld_ml64.bat - - - diff --git a/tools/ports/mstelemetry/v142-build.patch b/tools/ports/mstelemetry/v142-build.patch index 35cd0ec8e..814418819 100644 --- a/tools/ports/mstelemetry/v142-build.patch +++ b/tools/ports/mstelemetry/v142-build.patch @@ -5687,11 +5687,8 @@ index 5ff55579..77518e48 100644 + + + -+ -+ + + -+ + + + From 9457b11a9c25f89b8ac0e6a3589ffb15350a16cd Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 22 May 2026 09:55:54 -0500 Subject: [PATCH 2/4] Keep UWP package signing comments for documentation The commented PackageCertificateKeyFile and PackageCertificateThumbprint lines document how to enable Appx package signing if a developer provides a TestApp.pfx. Restore them so the sample retains its re-enablement instructions; only the unconditional None Include for TestApp.pfx (which referenced a missing file) needed to go. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj index 885d976e9..a55fbf088 100644 --- a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj +++ b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj @@ -110,6 +110,8 @@ + + False From c980d50b2ac2b788c162bc0f9dc2c3316057e2e9 Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 22 May 2026 10:19:24 -0500 Subject: [PATCH 3/4] Restore conditional UTC filter entries in lib/pal The matching desktop.vcxitems and universal.vcxitems still include the UTC module sources via Condition="Exists(...)". Removing the parallel entries from the .filters files would orphan those sources in Visual Studio Solution Explorer when the lib/modules submodule is present. Restore the conditional ItemGroups so solution organization stays correct when the optional module exists. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- lib/pal/desktop/desktop.vcxitems.filters | 4 ++++ lib/pal/universal/universal.vcxitems.filters | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/pal/desktop/desktop.vcxitems.filters b/lib/pal/desktop/desktop.vcxitems.filters index 9653a4ab3..a1d6dd857 100644 --- a/lib/pal/desktop/desktop.vcxitems.filters +++ b/lib/pal/desktop/desktop.vcxitems.filters @@ -10,4 +10,8 @@ + + + + \ No newline at end of file diff --git a/lib/pal/universal/universal.vcxitems.filters b/lib/pal/universal/universal.vcxitems.filters index c09a703b4..7b4700534 100644 --- a/lib/pal/universal/universal.vcxitems.filters +++ b/lib/pal/universal/universal.vcxitems.filters @@ -11,4 +11,8 @@ + + + + \ No newline at end of file From b5184aff90f96068b5b212e87e67e5467eeca9d6 Mon Sep 17 00:00:00 2001 From: Bhagirath Mehta Date: Fri, 22 May 2026 10:28:52 -0500 Subject: [PATCH 4/4] Match SignalsFuncTests filter path to vcxproj entry FuncTests.vcxproj uses $(ProjectDir)..\..\lib\modules\signals\tests\functests\SignalsFuncTests.cpp while the parallel filter entry was missing the $(ProjectDir) prefix, so when the signals submodule is present Visual Studio cannot associate the source file with the Source Files filter. Align the filter Include with the project Include. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- tests/functests/FuncTests.vcxproj.filters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functests/FuncTests.vcxproj.filters b/tests/functests/FuncTests.vcxproj.filters index 22f2ac5d9..50dd37f27 100644 --- a/tests/functests/FuncTests.vcxproj.filters +++ b/tests/functests/FuncTests.vcxproj.filters @@ -22,7 +22,7 @@ - +