From 363fdb70c8b9ba742e2faed2a1d62e6a0a44ecb3 Mon Sep 17 00:00:00 2001 From: Kaleb Luedtke Date: Mon, 13 Oct 2025 23:29:52 -0500 Subject: [PATCH 1/5] Enable multi-core compilation --- src/AppInstallerCLI/AppInstallerCLI.vcxproj | 8 +++++++- .../AppInstallerCLICore.vcxproj | 11 ++++++++++- .../AppInstallerCLITests.vcxproj | 8 +++++++- .../AppInstallerCommonCore.vcxproj | 10 ++++++++++ .../AppInstallerRepositoryCore.vcxproj | 11 ++++++++++- .../AppInstallerSharedLib.vcxproj | 14 ++++++++++++-- .../AppInstallerTestExeInstaller.vcxproj | 8 +++++++- ...soft.Management.Configuration.OutOfProc.vcxproj | 11 ++++++++++- .../Microsoft.Management.Configuration.vcxproj | 11 ++++++++++- .../Microsoft.Management.Deployment.InProc.vcxproj | 11 ++++++++++- ...crosoft.Management.Deployment.OutOfProc.vcxproj | 11 ++++++++++- .../Microsoft.Management.Deployment.vcxproj | 13 +++++++++++-- src/WinGetServer/WinGetServer.vcxproj | 3 ++- src/WinGetUtil/WinGetUtil.vcxproj | 8 +++++++- .../WindowsPackageManager.vcxproj | 11 ++++++++++- 15 files changed, 133 insertions(+), 16 deletions(-) diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index 6828ce046a..21b5e09089 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -156,6 +156,8 @@ true false false + true + true Console @@ -180,6 +182,7 @@ true true false + true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -215,6 +218,9 @@ false false false + true + true + true Console @@ -261,4 +267,4 @@ - \ No newline at end of file + diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index ffdbf0d4ff..5dc8b63102 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -194,6 +194,8 @@ true false false + true + true false @@ -209,6 +211,7 @@ true true false + true Windows @@ -235,6 +238,9 @@ false false false + true + true + true true @@ -269,6 +275,9 @@ false false false + true + true + true true @@ -493,4 +502,4 @@ - \ No newline at end of file + diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index 7bbd210747..677a6f72aa 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -132,6 +132,8 @@ true false false + true + true Console @@ -156,6 +158,7 @@ $(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories) true false + true wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;onecoreuap.lib;msi.lib;gdi32.lib;%(AdditionalDependencies) @@ -183,6 +186,9 @@ false false false + true + true + true Console @@ -1084,4 +1090,4 @@ - \ No newline at end of file + diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj index 3a1b82b7b3..4831c03233 100644 --- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj +++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj @@ -218,6 +218,8 @@ true false false + true + true false @@ -233,6 +235,7 @@ true true false + true Windows @@ -259,6 +262,9 @@ false false false + true + true + true true @@ -293,6 +299,9 @@ false false false + true + true + true true @@ -315,6 +324,7 @@ MultiThreaded %(AdditionalOptions) /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div false + true true diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index 8744d0ab91..158cc8b559 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -193,6 +193,8 @@ true false false + true + true false @@ -208,6 +210,7 @@ true true false + true Windows @@ -234,6 +237,9 @@ false false false + true + true + true true @@ -268,6 +274,9 @@ false false false + true + true + true true @@ -523,4 +532,4 @@ - \ No newline at end of file + diff --git a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj index 8afee3c685..87f4c69d40 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj @@ -1,4 +1,4 @@ - + @@ -213,6 +213,8 @@ false false false + true + true false @@ -229,6 +231,7 @@ true false false + true Windows @@ -255,6 +258,9 @@ false false false + true + true + true true @@ -289,6 +295,9 @@ MultiThreaded MultiThreaded MultiThreaded + true + true + true true @@ -311,6 +320,7 @@ MultiThreaded %(AdditionalOptions) /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div false + true true @@ -424,4 +434,4 @@ - \ No newline at end of file + diff --git a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj index bc4587ade1..e2b08a508d 100644 --- a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj +++ b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj @@ -97,6 +97,8 @@ stdcpp17 stdcpp17 MultiThreadedDebugDLL + true + true Console @@ -108,6 +110,7 @@ WIN32;%(PreprocessorDefinitions) true stdcpp17 + true @@ -122,6 +125,9 @@ stdcpp17 stdcpp17 stdcpp17 + true + true + true Console @@ -139,4 +145,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj index 33a428da66..96dc49a0ea 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj @@ -199,6 +199,8 @@ 6001 false false + true + true false @@ -229,6 +231,7 @@ true 6001 false + true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -267,6 +270,9 @@ false false false + true + true + true true @@ -328,6 +334,9 @@ false false false + true + true + true true @@ -428,4 +437,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj index 943881aed8..73bfc11111 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj @@ -132,6 +132,9 @@ false false false + true + true + true true @@ -149,6 +152,9 @@ Guard Guard Guard + true + true + true true @@ -173,6 +179,9 @@ Guard Guard Guard + true + true + true true @@ -329,4 +338,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj index bcf1f98477..03515c853a 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj @@ -197,6 +197,8 @@ true false false + true + true false @@ -226,6 +228,7 @@ true true false + true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -261,6 +264,9 @@ false false false + true + true + true true @@ -320,6 +326,9 @@ false false false + true + true + true true @@ -389,4 +398,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj index 4bdb37afd0..0e9fc17007 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj @@ -199,6 +199,8 @@ 6001 false false + true + true false @@ -229,6 +231,7 @@ true 6001 false + true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -267,6 +270,9 @@ false false false + true + true + true true @@ -328,6 +334,9 @@ false false false + true + true + true true @@ -426,4 +435,4 @@ - \ No newline at end of file + diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 8a453f9ecd..8b11f4af70 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -1,4 +1,4 @@ - + @@ -132,6 +132,9 @@ false false false + true + true + true @@ -140,6 +143,9 @@ false false false + true + true + true true @@ -155,6 +161,9 @@ false false false + true + true + true true @@ -280,4 +289,4 @@ - \ No newline at end of file + diff --git a/src/WinGetServer/WinGetServer.vcxproj b/src/WinGetServer/WinGetServer.vcxproj index a25a0dec8d..1fc58e6f79 100644 --- a/src/WinGetServer/WinGetServer.vcxproj +++ b/src/WinGetServer/WinGetServer.vcxproj @@ -102,6 +102,7 @@ true $(ProjectDir)..\WindowsPackageManager;%(AdditionalIncludeDirectories) false + true Windows @@ -183,4 +184,4 @@ - \ No newline at end of file + diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index c4e0709d9f..f22b945be6 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -149,6 +149,8 @@ true false false + true + true false @@ -178,6 +180,7 @@ true true false + true Windows @@ -214,6 +217,9 @@ false false false + true + true + true true @@ -284,4 +290,4 @@ - \ No newline at end of file + diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index 727142591f..95905d916f 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -243,6 +243,8 @@ 4324 false false + true + true false @@ -274,6 +276,7 @@ true 4324 false + true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -312,6 +315,9 @@ false false false + true + true + true true @@ -374,6 +380,9 @@ false false false + true + true + true true @@ -449,4 +458,4 @@ - \ No newline at end of file + From 05789f700123e7055a14edbbaa092e574be10b93 Mon Sep 17 00:00:00 2001 From: Kaleb Luedtke Date: Tue, 14 Oct 2025 00:16:54 -0500 Subject: [PATCH 2/5] Simplify --- src/AppInstallerCLI/AppInstallerCLI.vcxproj | 7 +------ src/AppInstallerCLICore/AppInstallerCLICore.vcxproj | 10 +--------- src/AppInstallerCLITests/AppInstallerCLITests.vcxproj | 7 +------ .../AppInstallerCommonCore.vcxproj | 11 +---------- .../AppInstallerRepositoryCore.vcxproj | 10 +--------- .../AppInstallerSharedLib.vcxproj | 11 +---------- .../AppInstallerTestExeInstaller.vcxproj | 7 +------ ...crosoft.Management.Configuration.OutOfProc.vcxproj | 10 +--------- .../Microsoft.Management.Configuration.vcxproj | 10 +--------- .../Microsoft.Management.Deployment.InProc.vcxproj | 10 +--------- .../Microsoft.Management.Deployment.OutOfProc.vcxproj | 10 +--------- .../Microsoft.Management.Deployment.vcxproj | 10 +--------- src/WinGetUtil/WinGetUtil.vcxproj | 7 +------ .../WindowsPackageManager.vcxproj | 10 +--------- 14 files changed, 14 insertions(+), 116 deletions(-) diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index 21b5e09089..023667ae0b 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -136,6 +136,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj + true @@ -156,8 +157,6 @@ true false false - true - true Console @@ -182,7 +181,6 @@ true true false - true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -218,9 +216,6 @@ false false false - true - true - true Console diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 5dc8b63102..1029c838c6 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -178,6 +178,7 @@ Level4 5321;%(DisableSpecificWarnings) %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -194,8 +195,6 @@ true false false - true - true false @@ -211,7 +210,6 @@ true true false - true Windows @@ -238,9 +236,6 @@ false false false - true - true - true true @@ -275,9 +270,6 @@ false false false - true - true - true true diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index 677a6f72aa..96e9ad831b 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -120,6 +120,7 @@ Level4 5321;%(DisableSpecificWarnings) %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -132,8 +133,6 @@ true false false - true - true Console @@ -158,7 +157,6 @@ $(MSBuildThisFileDirectory)..\AppInstallerCommonCore;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerRepositoryCore;$(MSBuildThisFileDirectory)..\AppInstallerCommonCore\Public;$(MSBuildThisFileDirectory)..\AppInstallerSharedLib\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore\Public;$(MSBuildThisFileDirectory)..\AppInstallerCLICore;$(ProjectDir)..\SfsClient\sfs-client\client\include;%(AdditionalIncludeDirectories) true false - true wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;onecoreuap.lib;msi.lib;gdi32.lib;%(AdditionalDependencies) @@ -186,9 +184,6 @@ false false false - true - true - true Console diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj index 4831c03233..cf3f0db53e 100644 --- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj +++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj @@ -202,6 +202,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -218,8 +219,6 @@ true false false - true - true false @@ -235,7 +234,6 @@ true true false - true Windows @@ -262,9 +260,6 @@ false false false - true - true - true true @@ -299,9 +294,6 @@ false false false - true - true - true true @@ -324,7 +316,6 @@ MultiThreaded %(AdditionalOptions) /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div false - true true diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index 158cc8b559..f9f53b4e8f 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -177,6 +177,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -193,8 +194,6 @@ true false false - true - true false @@ -210,7 +209,6 @@ true true false - true Windows @@ -237,9 +235,6 @@ false false false - true - true - true true @@ -274,9 +269,6 @@ false false false - true - true - true true diff --git a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj index 87f4c69d40..eaa659f7be 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj @@ -196,6 +196,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -213,8 +214,6 @@ false false false - true - true false @@ -231,7 +230,6 @@ true false false - true Windows @@ -258,9 +256,6 @@ false false false - true - true - true true @@ -295,9 +290,6 @@ MultiThreaded MultiThreaded MultiThreaded - true - true - true true @@ -320,7 +312,6 @@ MultiThreaded %(AdditionalOptions) /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div false - true true diff --git a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj index e2b08a508d..1a632a9834 100644 --- a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj +++ b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj @@ -86,6 +86,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /Zi + true @@ -97,8 +98,6 @@ stdcpp17 stdcpp17 MultiThreadedDebugDLL - true - true Console @@ -110,7 +109,6 @@ WIN32;%(PreprocessorDefinitions) true stdcpp17 - true @@ -125,9 +123,6 @@ stdcpp17 stdcpp17 stdcpp17 - true - true - true Console diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj index 96dc49a0ea..4df6e0bbf7 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj @@ -177,6 +177,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -199,8 +200,6 @@ 6001 false false - true - true false @@ -231,7 +230,6 @@ true 6001 false - true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -270,9 +268,6 @@ false false false - true - true - true true @@ -334,9 +329,6 @@ false false false - true - true - true true diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj index 73bfc11111..768f174bbd 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj @@ -113,6 +113,7 @@ _WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) $(ProjectDir);$(ProjectDir)..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories) + true Console @@ -132,9 +133,6 @@ false false false - true - true - true true @@ -152,9 +150,6 @@ Guard Guard Guard - true - true - true true @@ -179,9 +174,6 @@ Guard Guard Guard - true - true - true true diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj index 03515c853a..bae80bab2b 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj @@ -177,6 +177,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -197,8 +198,6 @@ true false false - true - true false @@ -228,7 +227,6 @@ true true false - true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -264,9 +262,6 @@ false false false - true - true - true true @@ -326,9 +321,6 @@ false false false - true - true - true true diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj index 0e9fc17007..8ade5f26cd 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj @@ -177,6 +177,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -199,8 +200,6 @@ 6001 false false - true - true false @@ -231,7 +230,6 @@ true 6001 false - true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -270,9 +268,6 @@ false false false - true - true - true true @@ -334,9 +329,6 @@ false false false - true - true - true true diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 8b11f4af70..68ba9e1cb1 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -123,6 +123,7 @@ Microsoft_Management_Deployment.def $(OutDir)$(ProjectName).winmd AppInstallerCLICore.lib;AppInstallerCommonCore.lib;AppInstallerRepositoryCore.lib;JsonCppLib.lib;YamlCppLib.lib;wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;pure.lib%(AdditionalDependencies) + true @@ -132,9 +133,6 @@ false false false - true - true - true @@ -143,9 +141,6 @@ false false false - true - true - true true @@ -161,9 +156,6 @@ false false false - true - true - true true diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index f22b945be6..db894b2c25 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -131,6 +131,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -149,8 +150,6 @@ true false false - true - true false @@ -180,7 +179,6 @@ true true false - true Windows @@ -217,9 +215,6 @@ false false false - true - true - true true diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index 95905d916f..8c01392120 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -221,6 +221,7 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING + true @@ -243,8 +244,6 @@ 4324 false false - true - true false @@ -276,7 +275,6 @@ true 4324 false - true $(ProjectDir)..\manifest\shared.manifest %(AdditionalManifestFiles) @@ -315,9 +313,6 @@ false false false - true - true - true true @@ -380,9 +375,6 @@ false false false - true - true - true true From 1dbaaac7428f723ddaafd861544156aac4208b2d Mon Sep 17 00:00:00 2001 From: Kaleb Luedtke Date: Tue, 14 Oct 2025 20:24:02 -0500 Subject: [PATCH 3/5] Use Directory.Build.props instead --- src/AppInstallerCLI/AppInstallerCLI.vcxproj | 3 +-- src/AppInstallerCLICore/AppInstallerCLICore.vcxproj | 3 +-- src/AppInstallerCLITests/AppInstallerCLITests.vcxproj | 3 +-- src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj | 1 - .../AppInstallerRepositoryCore.vcxproj | 3 +-- src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj | 5 ++--- .../AppInstallerTestExeInstaller.vcxproj | 3 +-- src/Directory.Build.props | 1 + .../Microsoft.Management.Configuration.OutOfProc.vcxproj | 3 +-- .../Microsoft.Management.Configuration.vcxproj | 3 +-- .../Microsoft.Management.Deployment.InProc.vcxproj | 3 +-- .../Microsoft.Management.Deployment.OutOfProc.vcxproj | 3 +-- .../Microsoft.Management.Deployment.vcxproj | 5 ++--- src/WinGetServer/WinGetServer.vcxproj | 3 +-- src/WinGetUtil/WinGetUtil.vcxproj | 3 +-- src/WindowsPackageManager/WindowsPackageManager.vcxproj | 3 +-- 16 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/AppInstallerCLI/AppInstallerCLI.vcxproj b/src/AppInstallerCLI/AppInstallerCLI.vcxproj index 023667ae0b..6828ce046a 100644 --- a/src/AppInstallerCLI/AppInstallerCLI.vcxproj +++ b/src/AppInstallerCLI/AppInstallerCLI.vcxproj @@ -136,7 +136,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj - true @@ -262,4 +261,4 @@ - + \ No newline at end of file diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj index 1029c838c6..ffdbf0d4ff 100644 --- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj +++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj @@ -178,7 +178,6 @@ Level4 5321;%(DisableSpecificWarnings) %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -494,4 +493,4 @@ - + \ No newline at end of file diff --git a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj index 96e9ad831b..7bbd210747 100644 --- a/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj +++ b/src/AppInstallerCLITests/AppInstallerCLITests.vcxproj @@ -120,7 +120,6 @@ Level4 5321;%(DisableSpecificWarnings) %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -1085,4 +1084,4 @@ - + \ No newline at end of file diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj index cf3f0db53e..3a1b82b7b3 100644 --- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj +++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj @@ -202,7 +202,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj index f9f53b4e8f..8744d0ab91 100644 --- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj +++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj @@ -177,7 +177,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -524,4 +523,4 @@ - + \ No newline at end of file diff --git a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj index eaa659f7be..8afee3c685 100644 --- a/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj +++ b/src/AppInstallerSharedLib/AppInstallerSharedLib.vcxproj @@ -1,4 +1,4 @@ - + @@ -196,7 +196,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -425,4 +424,4 @@ - + \ No newline at end of file diff --git a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj index 1a632a9834..bc4587ade1 100644 --- a/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj +++ b/src/AppInstallerTestExeInstaller/AppInstallerTestExeInstaller.vcxproj @@ -86,7 +86,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /Zi - true @@ -140,4 +139,4 @@ - + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 48302dd29e..b76bfed42c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,6 +15,7 @@ $(WinGetMacros)%(PreprocessorDefinitions) + true diff --git a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj index 4df6e0bbf7..33a428da66 100644 --- a/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Configuration.OutOfProc/Microsoft.Management.Configuration.OutOfProc.vcxproj @@ -177,7 +177,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -429,4 +428,4 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj index 768f174bbd..943881aed8 100644 --- a/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj +++ b/src/Microsoft.Management.Configuration/Microsoft.Management.Configuration.vcxproj @@ -113,7 +113,6 @@ _WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions) $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) $(ProjectDir);$(ProjectDir)..\AppInstallerSharedLib\Public;%(AdditionalIncludeDirectories) - true Console @@ -330,4 +329,4 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj index bae80bab2b..bcf1f98477 100644 --- a/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj +++ b/src/Microsoft.Management.Deployment.InProc/Microsoft.Management.Deployment.InProc.vcxproj @@ -177,7 +177,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -390,4 +389,4 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj index 8ade5f26cd..4bdb37afd0 100644 --- a/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj +++ b/src/Microsoft.Management.Deployment.OutOfProc/Microsoft.Management.Deployment.OutOfProc.vcxproj @@ -177,7 +177,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -427,4 +426,4 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj index 68ba9e1cb1..8a453f9ecd 100644 --- a/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj +++ b/src/Microsoft.Management.Deployment/Microsoft.Management.Deployment.vcxproj @@ -1,4 +1,4 @@ - + @@ -123,7 +123,6 @@ Microsoft_Management_Deployment.def $(OutDir)$(ProjectName).winmd AppInstallerCLICore.lib;AppInstallerCommonCore.lib;AppInstallerRepositoryCore.lib;JsonCppLib.lib;YamlCppLib.lib;wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;winhttp.lib;pure.lib%(AdditionalDependencies) - true @@ -281,4 +280,4 @@ - + \ No newline at end of file diff --git a/src/WinGetServer/WinGetServer.vcxproj b/src/WinGetServer/WinGetServer.vcxproj index 1fc58e6f79..a25a0dec8d 100644 --- a/src/WinGetServer/WinGetServer.vcxproj +++ b/src/WinGetServer/WinGetServer.vcxproj @@ -102,7 +102,6 @@ true $(ProjectDir)..\WindowsPackageManager;%(AdditionalIncludeDirectories) false - true Windows @@ -184,4 +183,4 @@ - + \ No newline at end of file diff --git a/src/WinGetUtil/WinGetUtil.vcxproj b/src/WinGetUtil/WinGetUtil.vcxproj index db894b2c25..c4e0709d9f 100644 --- a/src/WinGetUtil/WinGetUtil.vcxproj +++ b/src/WinGetUtil/WinGetUtil.vcxproj @@ -131,7 +131,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -285,4 +284,4 @@ - + \ No newline at end of file diff --git a/src/WindowsPackageManager/WindowsPackageManager.vcxproj b/src/WindowsPackageManager/WindowsPackageManager.vcxproj index 8c01392120..727142591f 100644 --- a/src/WindowsPackageManager/WindowsPackageManager.vcxproj +++ b/src/WindowsPackageManager/WindowsPackageManager.vcxproj @@ -221,7 +221,6 @@ _CONSOLE;%(PreprocessorDefinitions) Level4 %(AdditionalOptions) /permissive- /bigobj /D _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING - true @@ -450,4 +449,4 @@ - + \ No newline at end of file From 94a8bd4bef4c83287dfe7155cdf33c63e19ff53b Mon Sep 17 00:00:00 2001 From: Kaleb Luedtke Date: Wed, 15 Oct 2025 20:01:56 -0500 Subject: [PATCH 4/5] Move to unconditional ItemDefinitionGroup --- src/Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b76bfed42c..67f974626b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,6 +15,10 @@ $(WinGetMacros)%(PreprocessorDefinitions) + + + + true From d55c966a2b43d1bbd8521b5b61350989fd526830 Mon Sep 17 00:00:00 2001 From: John McPherson Date: Fri, 17 Oct 2025 09:13:40 -0700 Subject: [PATCH 5/5] Change header to proper type --- .../UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj | 2 +- .../UndockedRegFreeWinRT.vcxproj.filters | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj index 725e9caaaa..681e10da91 100644 --- a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj +++ b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj @@ -317,7 +317,7 @@ - + diff --git a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj.filters b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj.filters index 698d996c44..5e8d0ce801 100644 --- a/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj.filters +++ b/src/Xlang/UndockedRegFreeWinRT/src/UndockedRegFreeWinRT/UndockedRegFreeWinRT/UndockedRegFreeWinRT.vcxproj.filters @@ -28,9 +28,6 @@ Source Files - - Header Files - Source Files @@ -54,6 +51,9 @@ Header Files + + Header Files +