From 9ab36b7475f60b373b5157f0846e56794c10edb5 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 29 Sep 2025 22:15:38 -0700 Subject: [PATCH 01/45] Initial script --- tools/GenerateCompilationDatabase.ps1 | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tools/GenerateCompilationDatabase.ps1 diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 new file mode 100644 index 0000000000..4568f5625b --- /dev/null +++ b/tools/GenerateCompilationDatabase.ps1 @@ -0,0 +1,30 @@ +$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath +write-host "VCToolsInstallDir: $VCToolsInstallDir" + +$msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" +write-host "msBuildPath: $msBuildPath" + +$binlogFile = Split-Path $PSScriptRoot -parent +$binlogFile = Join-Path $binlogFile "BuildOutput\Binlogs\WindowsAppRuntime.x64.Release.binlog" + +if (-Not (Test-Path $binlogFile)) { + Write-Error "Binlog file not found: $binlogFile" + exit 1 +} + +& $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=test.log + +Write-Host "Log file generated at: $(Get-Location)\test.log" + +Select-String -Path "test.log" -Pattern "Cl.exe" | + ForEach-Object { $_.Line } | + Where-Object { $_ -notmatch "Tracker.exe" } | + Set-Content -Path "test-filtered.log" + +Write-Host "Filtered log file generated at: $(Get-Location)\test-filtered.log" + +Remove-Item "test.log" + +& ms2cc -i "test-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p + +Remove-Item "test-filtered.log" From 3d8dc830b25f248dedc4bf55936acfab9044edc0 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 29 Sep 2025 22:26:49 -0700 Subject: [PATCH 02/45] Downloading ms2cc --- tools/GenerateCompilationDatabase.ps1 | 44 ++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 4568f5625b..7f73776682 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -1,3 +1,8 @@ +Param( + [string]$Ms2ccVersion = "1.2.0" +) + + $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath write-host "VCToolsInstallDir: $VCToolsInstallDir" @@ -25,6 +30,43 @@ Write-Host "Filtered log file generated at: $(Get-Location)\test-filtered.log" Remove-Item "test.log" -& ms2cc -i "test-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p +$ms2ccPath = Join-Path $PSScriptRoot "ms2cc" +$ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" + +if (-Not (Test-Path $ms2ccExe)) { + Write-Host "Downloading ms2cc..." + $ms2ccUrl = "https://github.com/freddiehaddad/ms2cc/releases/download/v$Ms2ccVersion/ms2cc-$Ms2ccVersion.zip" + $zipPath = Join-Path $PSScriptRoot "ms2cc-$Ms2ccVersion.zip" + + try { + Invoke-WebRequest -Uri $ms2ccUrl -OutFile $zipPath -UseBasicParsing + Write-Host "Downloaded ms2cc to: $zipPath" + + if (-Not (Test-Path $ms2ccPath)) { + New-Item -ItemType Directory -Path $ms2ccPath -Force | Out-Null + } + + Expand-Archive -Path $zipPath -DestinationPath $ms2ccPath -Force + Write-Host "Extracted ms2cc to: $ms2ccPath" + + Remove-Item $zipPath -Force + Write-Host "Cleaned up zip file" + + if (Test-Path $ms2ccExe) { + Write-Host "ms2cc successfully downloaded and extracted" + } else { + Write-Error "Failed to extract ms2cc.exe" + exit 1 + } + } + catch { + Write-Error "Failed to download or extract ms2cc: $_" + exit 1 + } +} else { + Write-Host "ms2cc already exists at: $ms2ccExe" +} + +& $ms2ccExe -i "test-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p Remove-Item "test-filtered.log" From 8323d8f6d60e762d46753f8e6565e21f5081ffe4 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 29 Sep 2025 22:28:39 -0700 Subject: [PATCH 03/45] Adding compile commands database to git ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 863bfdce8f..21fd8be47a 100644 --- a/.gitignore +++ b/.gitignore @@ -395,3 +395,6 @@ build/override/ # WindowsAppSDK specific files Microsoft.WinUI.AppX.targets !dev/vsix/**/*.pubxml + +# Compile commands database for clang-based tools +compile_commands.json From f6908a38211396d0d722e1521f7bcf56d54cda1b Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 29 Sep 2025 22:31:57 -0700 Subject: [PATCH 04/45] Changing name of temporary log files --- tools/GenerateCompilationDatabase.ps1 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 7f73776682..c6cfe129b3 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -17,18 +17,16 @@ if (-Not (Test-Path $binlogFile)) { exit 1 } -& $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=test.log +& $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=temp.log -Write-Host "Log file generated at: $(Get-Location)\test.log" - -Select-String -Path "test.log" -Pattern "Cl.exe" | +Select-String -Path "temp.log" -Pattern "Cl.exe" | ForEach-Object { $_.Line } | Where-Object { $_ -notmatch "Tracker.exe" } | - Set-Content -Path "test-filtered.log" + Set-Content -Path "temp-filtered.log" -Write-Host "Filtered log file generated at: $(Get-Location)\test-filtered.log" +Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" -Remove-Item "test.log" +Remove-Item "temp.log" $ms2ccPath = Join-Path $PSScriptRoot "ms2cc" $ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" @@ -67,6 +65,6 @@ if (-Not (Test-Path $ms2ccExe)) { Write-Host "ms2cc already exists at: $ms2ccExe" } -& $ms2ccExe -i "test-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p +& $ms2ccExe -i "temp-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p -Remove-Item "test-filtered.log" +Remove-Item "temp-filtered.log" From fc320119f7a4b104568e46d53cc8ab2a19c1b0ef Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 29 Sep 2025 22:33:31 -0700 Subject: [PATCH 05/45] Adding ms2cc to git ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 21fd8be47a..f5fa2d99bd 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,6 @@ Microsoft.WinUI.AppX.targets # Compile commands database for clang-based tools compile_commands.json + +# MS2CC files used to generate compile commands database +tools/ms2cc/** From 0f23f7f4afef9fb6873679115dbf5f5a26a17789 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 30 Sep 2025 18:21:12 -0700 Subject: [PATCH 06/45] Adding current build file directory to files included in test projects --- test/ABForward/ABForward.vcxproj | 2 +- .../AccessControlTests.vcxproj | 4 ++-- test/AppLifecycle/AppLifecycle.vcxproj | 8 ++++---- .../AppNotificationBuilderTests.vcxproj | 4 ++-- .../AppNotificationTests.vcxproj | 16 ++++++++-------- .../CameraCaptureUITests.vcxproj | 4 ++-- test/Deployment/API/DeploymentTests.vcxproj | 8 ++++---- test/LRPTests/LRPTests.vcxproj | 4 ++-- .../PowerNotifications.vcxproj | 6 +++--- .../PushNotificationTests.vcxproj | 12 ++++++------ 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index a8c7dfaa4c..19a82ef1a9 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -220,7 +220,7 @@ Create - + diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 36aa8bb2ba..231945d273 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -198,7 +198,7 @@ Create Create - + @@ -245,4 +245,4 @@ - + \ No newline at end of file diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 3e3cb5d208..863555c4d1 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -198,12 +198,12 @@ Create - - + + - + @@ -255,4 +255,4 @@ $(RepoTestCertificatePFX) $(RepoTestCertificatePassword) - + \ No newline at end of file diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index fe18fcbdec..99bd16c239 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -109,7 +109,7 @@ Create - + @@ -154,4 +154,4 @@ - + \ No newline at end of file diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index a586593b02..35c2d81a83 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -118,17 +118,17 @@ Create - - - + + + - - + + - + @@ -145,7 +145,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -180,4 +180,4 @@ - + \ No newline at end of file diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index 2b19253c4f..a004c7350b 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -211,7 +211,7 @@ - + Create Create @@ -270,4 +270,4 @@ - + \ No newline at end of file diff --git a/test/Deployment/API/DeploymentTests.vcxproj b/test/Deployment/API/DeploymentTests.vcxproj index 4eb0e170c7..3793012b33 100644 --- a/test/Deployment/API/DeploymentTests.vcxproj +++ b/test/Deployment/API/DeploymentTests.vcxproj @@ -189,13 +189,13 @@ - + Create - + - + @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index 53b8c0e24d..30d3c15595 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -109,7 +109,7 @@ Create - + @@ -147,4 +147,4 @@ - + \ No newline at end of file diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index 4a6083f0a4..4d1bf63c3c 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -122,8 +122,8 @@ - - + + Create Create @@ -173,4 +173,4 @@ - + \ No newline at end of file diff --git a/test/PushNotificationTests/PushNotificationTests.vcxproj b/test/PushNotificationTests/PushNotificationTests.vcxproj index 2745e217a4..ac545ff43a 100644 --- a/test/PushNotificationTests/PushNotificationTests.vcxproj +++ b/test/PushNotificationTests/PushNotificationTests.vcxproj @@ -109,16 +109,16 @@ Create - - - + + + - - + + - + From f215bdde62ed17cc720925d4d8b3c9f1cb110b1a Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 30 Sep 2025 18:55:57 -0700 Subject: [PATCH 07/45] Adding 2 --- .../CameraCaptureUITests.vcxproj.filters | 6 +++--- test/Deployment/API/APITests.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters index 2fe119871b..9f6c8294c2 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters @@ -15,15 +15,15 @@ - + Header Files - + Source Files - + Source Files diff --git a/test/Deployment/API/APITests.cpp b/test/Deployment/API/APITests.cpp index a81b9ded9a..3c9b55cd25 100644 --- a/test/Deployment/API/APITests.cpp +++ b/test/Deployment/API/APITests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation and Contributors. +// Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. #include "pch.h" From 061dbcd137ef8960a2d88374b617c2de8b963561 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 30 Sep 2025 20:01:01 -0700 Subject: [PATCH 08/45] Bumping version of ms2cc --- tools/GenerateCompilationDatabase.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index c6cfe129b3..4ab160912c 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -1,5 +1,5 @@ Param( - [string]$Ms2ccVersion = "1.2.0" + [string]$Ms2ccVersion = "1.3.0" ) From 00f9789ac20f251574f85fe33abe1ca57f6aa599 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 30 Sep 2025 22:55:27 -0700 Subject: [PATCH 09/45] Using specific path for almost all includes in the project --- dev/DeploymentAgent/DeploymentAgent.vcxproj | 12 ++++---- dev/Detours/Detours.vcxproj | 26 ++++++++-------- ...micDependencyLifetimeManagerShadow.vcxproj | 12 ++++---- ...amicDependency.DataStore.ProxyStub.vcxproj | 12 ++++---- .../DynamicDependency.DataStore.vcxproj | 10 +++---- ...ependencyLifetimeManager.ProxyStub.vcxproj | 12 ++++---- .../DynamicDependencyLifetimeManager.vcxproj | 10 +++---- .../IDynamicDependencyLifetimeManager.vcxproj | 4 +-- .../ChangeTracker/ChangeTracker.vcxitems | 4 +-- ...Windows.ApplicationModel.Resources.vcxproj | 4 +-- dev/RestartAgent/RestartAgent.vcxproj | 10 +++---- .../WindowsAppRuntime_BootstrapDLL.vcxproj | 30 +++++++++---------- .../WindowsAppRuntime_DLL.vcxproj | 10 +++---- ...ndowsAppRuntime_UniversalBGTaskDLL.vcxproj | 12 ++++---- test/ABForward/ABForward.vcxproj | 4 +-- .../AccessControlTests.vcxproj | 4 +-- test/AppLifecycle/AppLifecycle.vcxproj | 4 +-- .../AppNotificationBuilderTests.vcxproj | 4 +-- .../AppNotificationTests.vcxproj | 8 ++--- .../ApplicationDataTests.vcxproj | 14 ++++----- .../BackgroundTaskTests.vcxproj | 8 ++--- .../BadgeNotificationTest.vcxproj | 10 +++---- .../CameraCaptureUITests.vcxproj | 4 +-- test/Common/Common.vcxproj | 12 ++++---- .../CompatibilityTests.vcxproj | 8 ++--- .../Test_CompatibilitySetter_CPP.vcxproj | 8 ++--- test/Decimal/CPP/DecimalTests.vcxproj | 10 +++---- test/Decimal/WinRT/DecimalTest_WinRT.vcxproj | 10 +++---- ...AutoInitialize_CPP_Options_Defined.vcxproj | 6 ++-- ...ootstrapAutoInitialize_CPP_Default.vcxproj | 4 +-- ...AutoInitialize_CPP_Options_Default.vcxproj | 4 +-- ...AutoInitialize_CPP_Options_Defined.vcxproj | 4 +-- ...rapAutoInitialize_CPP_Options_None.vcxproj | 4 +-- .../DynamicDependency_Test_Win32.vcxproj | 6 ++-- .../DynamicDependency_Test_WinRT.vcxproj | 6 ++-- .../EnvironmentManagerTests.vcxproj | 6 ++-- test/LRPTests/LRPTests.vcxproj | 4 +-- .../OAuth2ManagerTests.vcxproj | 10 +++---- .../API/PackageManagerTests.vcxproj | 8 ++--- .../PowerNotifications.vcxproj | 4 +-- .../PushNotificationTests.vcxproj | 6 ++-- .../StoragePickersTests.vcxproj | 12 ++++---- .../AccessControlTestApp.vcxproj | 8 ++--- .../AppLifecycleTestApp.vcxproj | 20 ++++++------- .../ManualTestApp/ManualTestApp.vcxproj | 12 ++++---- .../OAuthTestApp/OAuthTestApp.vcxproj | 8 ++--- .../PushNotificationsDemoApp.vcxproj | 8 ++--- .../PushNotificationsTestApp.vcxproj | 8 ++--- .../ToastNotificationsDemoApp.vcxproj | 12 ++++---- .../ToastNotificationsTestApp.vcxproj | 12 ++++---- test/VersionInfo/VersionInfoTests.vcxproj | 8 ++--- 51 files changed, 228 insertions(+), 228 deletions(-) diff --git a/dev/DeploymentAgent/DeploymentAgent.vcxproj b/dev/DeploymentAgent/DeploymentAgent.vcxproj index fb0b0b2745..d7df9f03d3 100644 --- a/dev/DeploymentAgent/DeploymentAgent.vcxproj +++ b/dev/DeploymentAgent/DeploymentAgent.vcxproj @@ -97,17 +97,17 @@ - - + + - - + + Create - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/dev/Detours/Detours.vcxproj b/dev/Detours/Detours.vcxproj index 4b6df3ab62..d5a56086ec 100644 --- a/dev/Detours/Detours.vcxproj +++ b/dev/Detours/Detours.vcxproj @@ -234,20 +234,20 @@ - - + + - - - - - - - - - - + + + + + + + + + + @@ -273,4 +273,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj index 8e44f09fdd..1204aa5bfc 100644 --- a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj +++ b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj @@ -183,10 +183,10 @@ - + - + Create Create Create @@ -194,13 +194,13 @@ Create Create - + - + - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -223,4 +223,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj index 123affd151..8366d13246 100644 --- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj +++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj @@ -229,8 +229,8 @@ - - + + @@ -257,7 +257,7 @@ NotUsing NotUsing - + Create Create Create @@ -267,12 +267,12 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) - + @@ -303,4 +303,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj index 99192f2660..bb4b141553 100644 --- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj +++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj @@ -195,10 +195,10 @@ - + - + Create Create Create @@ -206,7 +206,7 @@ Create Create - + @@ -217,7 +217,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -243,4 +243,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj index 32bcca96e6..016b103904 100644 --- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj @@ -234,8 +234,8 @@ - - + + @@ -262,7 +262,7 @@ NotUsing NotUsing - + Create Create Create @@ -272,12 +272,12 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) - + @@ -312,4 +312,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj index d819ea9aee..8e83e08dc1 100644 --- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj @@ -189,10 +189,10 @@ - + - + Create Create Create @@ -200,7 +200,7 @@ Create Create - + @@ -211,7 +211,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -234,4 +234,4 @@ - + \ No newline at end of file diff --git a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj index 919e61ce6f..29654cd4cc 100644 --- a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj @@ -162,7 +162,7 @@ - + @@ -178,4 +178,4 @@ - + \ No newline at end of file diff --git a/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems b/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems index 63eb83d375..977adb17e1 100644 --- a/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems +++ b/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj index 3542aa54e8..fc908a6212 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj @@ -110,7 +110,7 @@ - + @@ -122,7 +122,7 @@ - + Create diff --git a/dev/RestartAgent/RestartAgent.vcxproj b/dev/RestartAgent/RestartAgent.vcxproj index b5bd0e5aa1..5f94ff853d 100644 --- a/dev/RestartAgent/RestartAgent.vcxproj +++ b/dev/RestartAgent/RestartAgent.vcxproj @@ -97,16 +97,16 @@ - + - - + + Create - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -133,4 +133,4 @@ - + \ No newline at end of file diff --git a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj index 2e468ebae2..6760ad104a 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj +++ b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj @@ -259,21 +259,21 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + Create Create Create @@ -287,7 +287,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -328,4 +328,4 @@ {ccd23028-b9d3-410b-836e-20b2e7c08451} - + \ No newline at end of file diff --git a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj index 444615c099..bfb2731cba 100644 --- a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj +++ b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj @@ -255,13 +255,13 @@ - + - - - - + + + + Create Create Create diff --git a/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj b/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj index 49d0cd57d1..145bafe5f9 100644 --- a/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj +++ b/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj @@ -115,20 +115,20 @@ - - + + Task.cpp - + Create - + - + Code Task.cpp @@ -163,4 +163,4 @@ - + \ No newline at end of file diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index 19a82ef1a9..179b174b11 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -217,13 +217,13 @@ - + Create - + diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 231945d273..44312154d7 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -187,10 +187,10 @@ - + - + Create Create Create diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 863555c4d1..2dd4f1a34e 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -195,14 +195,14 @@ - + Create - + diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index 99bd16c239..e2f51bff05 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -106,13 +106,13 @@ - + Create - + diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index 35c2d81a83..df54907eb3 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -115,7 +115,7 @@ - + Create @@ -123,11 +123,11 @@ - + - - + + diff --git a/test/ApplicationData/ApplicationDataTests.vcxproj b/test/ApplicationData/ApplicationDataTests.vcxproj index e511f44ecd..265ce9914a 100644 --- a/test/ApplicationData/ApplicationDataTests.vcxproj +++ b/test/ApplicationData/ApplicationDataTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -106,15 +106,15 @@ - + Create - - - + + + - + @@ -163,4 +163,4 @@ - + \ No newline at end of file diff --git a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj index 297b63d539..9d1eb61567 100644 --- a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj +++ b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj @@ -210,8 +210,8 @@ - - + + Create Create Create @@ -221,7 +221,7 @@ - + @@ -263,4 +263,4 @@ - + \ No newline at end of file diff --git a/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj b/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj index ad5094a8d0..1067147485 100644 --- a/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj +++ b/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj @@ -115,15 +115,15 @@ - + Create - + - - - + + + diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index a004c7350b..96eaca3ee6 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -208,11 +208,11 @@ - + - + Create Create Create diff --git a/test/Common/Common.vcxproj b/test/Common/Common.vcxproj index 9b5ea7ac03..a0c3e8298e 100644 --- a/test/Common/Common.vcxproj +++ b/test/Common/Common.vcxproj @@ -108,15 +108,15 @@ - + Create - - - + + + - + @@ -141,4 +141,4 @@ - + \ No newline at end of file diff --git a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj index 8edeb3908c..26e5ed1adb 100644 --- a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj +++ b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj @@ -103,15 +103,15 @@ - + Create - + $(RepoRoot)\build\VersionInfo;%(AdditionalIncludeDirectories) - + @@ -149,4 +149,4 @@ - + \ No newline at end of file diff --git a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj index ffa104d5fa..941a488c9b 100644 --- a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj +++ b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj @@ -123,10 +123,10 @@ - + Create - + @@ -140,7 +140,7 @@ - + @@ -166,4 +166,4 @@ - + \ No newline at end of file diff --git a/test/Decimal/CPP/DecimalTests.vcxproj b/test/Decimal/CPP/DecimalTests.vcxproj index 984b2377f6..3bb1764e03 100644 --- a/test/Decimal/CPP/DecimalTests.vcxproj +++ b/test/Decimal/CPP/DecimalTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -106,13 +106,13 @@ - + Create - + - + @@ -155,4 +155,4 @@ - + \ No newline at end of file diff --git a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj index 1706444e50..cec8981eb0 100644 --- a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj +++ b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj @@ -1,4 +1,4 @@ - + @@ -107,13 +107,13 @@ - + Create - + - + @@ -164,4 +164,4 @@ - + \ No newline at end of file diff --git a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj index bd4cd76a70..eaef76eb7a 100644 --- a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj @@ -118,10 +118,10 @@ - + {f76b776e-86f5-48c5-8fc7-d2795ecc9746} - + {9c1a6c58-52d6-4514-9120-5c339c5df4be} @@ -141,4 +141,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj index d6e38a1fc7..77cac0cc7c 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj @@ -102,7 +102,7 @@ - + @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj index 00fff1528a..e8aef57d13 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj @@ -103,7 +103,7 @@ - + @@ -129,4 +129,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj index 5a34d17988..16dd8057b0 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj @@ -107,7 +107,7 @@ - + @@ -133,4 +133,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj index cef7c4d1b9..d9484f1f42 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj @@ -103,7 +103,7 @@ - + @@ -129,4 +129,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 9ef52159d2..f8b2dd4319 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -197,7 +197,7 @@ - + Create @@ -220,7 +220,7 @@ - + @@ -257,4 +257,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 9007764baa..0811e2d63f 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -201,7 +201,7 @@ - + Create @@ -217,7 +217,7 @@ - + @@ -254,4 +254,4 @@ - + \ No newline at end of file diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index cafdaf0b01..76ede2c416 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -137,8 +137,8 @@ - - + + @@ -188,4 +188,4 @@ - + \ No newline at end of file diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index 30d3c15595..a5c79ae1d3 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -106,13 +106,13 @@ - + Create - + diff --git a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj index d5bc13180a..dcba3c7a50 100644 --- a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj +++ b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj @@ -214,12 +214,12 @@ - - + + - - + + Create Create Create @@ -281,4 +281,4 @@ - + \ No newline at end of file diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index 96d55f4590..e6713e5ed1 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -107,7 +107,7 @@ - + Create @@ -129,7 +129,7 @@ - + @@ -188,4 +188,4 @@ - + \ No newline at end of file diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index 4d1bf63c3c..b2941331a0 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -119,12 +119,12 @@ - + - + Create Create Create diff --git a/test/PushNotificationTests/PushNotificationTests.vcxproj b/test/PushNotificationTests/PushNotificationTests.vcxproj index ac545ff43a..28439ba192 100644 --- a/test/PushNotificationTests/PushNotificationTests.vcxproj +++ b/test/PushNotificationTests/PushNotificationTests.vcxproj @@ -106,7 +106,7 @@ - + Create @@ -116,8 +116,8 @@ - - + + diff --git a/test/StoragePickersTests/StoragePickersTests.vcxproj b/test/StoragePickersTests/StoragePickersTests.vcxproj index 48ac11200b..a0ef7bc5fb 100644 --- a/test/StoragePickersTests/StoragePickersTests.vcxproj +++ b/test/StoragePickersTests/StoragePickersTests.vcxproj @@ -105,19 +105,19 @@ - + Create - - - + + + $(RepoRoot)\build\VersionInfo;%(AdditionalIncludeDirectories) - - + + diff --git a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj index 227342c347..02faa68f9a 100644 --- a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj +++ b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj @@ -29,13 +29,13 @@ - - + + Create - + @@ -224,4 +224,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj index e81ab464f0..43e23539a0 100644 --- a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj +++ b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj @@ -189,19 +189,19 @@ - - - + + + Create - - + + - - - - + + + + @@ -230,4 +230,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj index 46f27e5e58..ad47e9d1ec 100644 --- a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj +++ b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj @@ -188,14 +188,14 @@ - - + + Create - - + + @@ -212,7 +212,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -232,4 +232,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj index 70e7e69b18..9d94b34f86 100644 --- a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj +++ b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj @@ -106,11 +106,11 @@ - + - - + + Create @@ -150,4 +150,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj index c375ae9e8a..58503381a9 100644 --- a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj +++ b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj @@ -183,13 +183,13 @@ - - + + Create - + @@ -234,4 +234,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj index 666d1f1aef..18daefc3a1 100644 --- a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj +++ b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj @@ -29,13 +29,13 @@ - - + + Create - + @@ -235,4 +235,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj index 48c96d4a34..882b5a99ce 100644 --- a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj +++ b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj @@ -183,14 +183,14 @@ - - + + Create - - + + @@ -223,7 +223,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -248,4 +248,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj index 04e3858dbc..94fe3dd6a5 100644 --- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj +++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj @@ -29,14 +29,14 @@ - - + + Create - - + + @@ -59,7 +59,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -238,4 +238,4 @@ - + \ No newline at end of file diff --git a/test/VersionInfo/VersionInfoTests.vcxproj b/test/VersionInfo/VersionInfoTests.vcxproj index 029e9305d3..c95415e37c 100644 --- a/test/VersionInfo/VersionInfoTests.vcxproj +++ b/test/VersionInfo/VersionInfoTests.vcxproj @@ -107,13 +107,13 @@ - + Create - + - + @@ -148,4 +148,4 @@ - + \ No newline at end of file From a3befcebab66d39736364ba299e9b98fff9f4ba7 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 01:08:37 -0700 Subject: [PATCH 10/45] Not cleaning intermediate files if building local --- BuildAll.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BuildAll.ps1 b/BuildAll.ps1 index 80aa2fe727..1bda4fc925 100644 --- a/BuildAll.ps1 +++ b/BuildAll.ps1 @@ -146,7 +146,7 @@ Try { { $destinationPaths = Get-Childitem -Path 'packages' -File 'Traceloggingconfig.h' -Recurse - if (($destinationPaths -ne $null)) + if (($destinationPaths -ne $null)) { foreach ($destPath in $destinationPaths) { Write-Host 'SourcePath:' $srcPath.FullName @@ -165,6 +165,7 @@ Try { # PreFastSetup intentionally skips the call to MSBuild.exe below. if (($AzureBuildStep -eq "all") -Or ($AzureBuildStep -eq "BuildFoundation")) { + $cleanIntermediateFiles = if ($WindowsAppSDKBuildPipeline -eq 1) { "/p:WindowsAppSDKCleanIntermediateFiles=true" } else { "" } foreach($configurationToRun in $configuration.Split(",")) { foreach($platformToRun in $platform.Split(",")) @@ -178,7 +179,7 @@ Try { /binaryLogger:"BuildOutput/binlogs/WindowsAppRuntime.$platformToRun.$configurationToRun.binlog" ` $WindowsAppSDKVersionProperty ` /p:PGOBuildMode=$PGOBuildMode ` - /p:WindowsAppSDKCleanIntermediateFiles=true ` + $cleanIntermediateFiles ` /p:AppxSymbolPackageEnabled=false ` /p:WindowsAppSDKBuildPipeline=$WindowsAppSDKBuildPipeline if ($lastexitcode -ne 0) @@ -279,7 +280,7 @@ Try { { foreach($platformToRun in $platform.Split(",")) { - # TODO: $windowsAppSdkBinariesPath may not be defined. Remove the temp downgrade to 1.0 once this issue has been fixed (b#52130179). + # TODO: $windowsAppSdkBinariesPath may not be defined. Remove the temp downgrade to 1.0 once this issue has been fixed (b#52130179). Set-StrictMode -Version 1.0 .\build\CopyFilesToStagingDir.ps1 -BuildOutputDir 'BuildOutput' -OverrideDir "$buildOverridePath" -PublishDir "$windowsAppSdkBinariesPath" -NugetDir "$BasePath" -Platform $PlatformToRun -Configuration $ConfigurationToRun Set-StrictMode -Version 3.0 From e2ed1bb6af8f9da9a803f7d81e65b638649bc0a2 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 01:22:39 -0700 Subject: [PATCH 11/45] Fixing include path on everything --- dev/MRTCore/mrt/Core/src/MRM.vcxproj | 4 +- .../mrt/Core/unittests/MrmUnitTest.vcxproj | 2 +- ...Windows.ApplicationModel.Resources.vcxproj | 36 ++++---- .../mrm/UnitTests/MrmBaseUnitTests.vcxproj | 88 +++++++++---------- dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj | 46 +++++----- dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj | 88 +++++++++---------- ...ficationsLongRunningTask.ProxyStub.vcxproj | 6 +- ...cationsLongRunningTask.StartupTask.vcxproj | 8 +- .../PushNotificationsLongRunningTask.vcxproj | 36 ++++---- .../BlankApp/ProjectTemplate.vcxproj | 14 +-- .../ProjectTemplate.vcxproj | 14 +-- .../UnitTestApp/ProjectTemplate.vcxproj | 16 ++-- .../RuntimeComponent/ProjectTemplate.vcxproj | 8 +- .../dev/WindowsAppRuntimeInstall.vcxproj | 32 +++---- .../InstallerFunctionalTests.vcxproj | 12 +-- .../HelloWorldAdvancedC.vcxproj | 2 +- .../HelloWorldAdvancedCPP.vcxproj | 2 +- .../DynamicDependency_Test_Win32.vcxproj | 46 +++++----- .../DynamicDependency_Test_WinRT.vcxproj | 34 +++---- .../Framework.Math.Add.vcxproj | 12 +-- .../Framework.Math.Multiply.vcxproj | 12 +-- .../Framework.Widgets.vcxproj | 16 ++-- .../EnvironmentManagerTests.vcxproj | 16 ++-- .../API/PackageManagerTests.vcxproj | 38 ++++---- .../PackageManager.Test.M.Black.msix.vcxproj | 8 +- ...PackageManager.Test.M.Blacker.msix.vcxproj | 8 +- .../PackageManager.Test.M.White.msix.vcxproj | 8 +- .../PackageManager.Test.M.Whiter.msix.vcxproj | 8 +- .../PowerNotifications.vcxproj | 2 +- .../StoragePickersTests.vcxproj | 4 +- 30 files changed, 313 insertions(+), 313 deletions(-) diff --git a/dev/MRTCore/mrt/Core/src/MRM.vcxproj b/dev/MRTCore/mrt/Core/src/MRM.vcxproj index 1a4f3740b0..d5cdc21dc2 100644 --- a/dev/MRTCore/mrt/Core/src/MRM.vcxproj +++ b/dev/MRTCore/mrt/Core/src/MRM.vcxproj @@ -93,10 +93,10 @@ - + - + diff --git a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj index f5d4ae0814..888bc95438 100644 --- a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj +++ b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj @@ -163,7 +163,7 @@ - + diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj index fc908a6212..884f5c64bc 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj @@ -107,31 +107,31 @@ - - - + + + - - - - - - + + + + + + - - - + + + Create - - - - - - + + + + + + diff --git a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj index 1f34a069e9..64043ea058 100644 --- a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj +++ b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj @@ -105,39 +105,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,17 +209,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj index 91f861c2f9..b3fa03bfa9 100644 --- a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj +++ b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj @@ -123,28 +123,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -162,7 +162,7 @@ - + diff --git a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj index 9af96e4e4e..8bbaa7edb7 100644 --- a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj +++ b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj @@ -162,52 +162,52 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj index f1c6fd3ff4..f9e394f1fb 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj @@ -394,8 +394,8 @@ - - + + @@ -428,7 +428,7 @@ NotUsing NotUsing - + Create Create Create diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj index 5972ae34b8..9c797d63ac 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj @@ -158,12 +158,12 @@ - - + + - - + + diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj index 5ede563b65..f2b6cd2122 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj @@ -167,26 +167,26 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj index 3b22ac980a..38dcf0f063 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -99,11 +99,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -112,13 +112,13 @@ - + Create - + App.xaml - + MainWindow.xaml diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj index 6f00439305..95792db8c1 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -105,11 +105,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -118,13 +118,13 @@ - + Create - + App.xaml - + MainWindow.xaml diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj index f4813446c1..16d7f9257d 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -118,11 +118,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -131,17 +131,17 @@ - + Create - + App.xaml - + MainWindow.xaml - + diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj index 44d6f85bf7..04007f791e 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj @@ -102,16 +102,16 @@ - - + + Class.cpp - + Create - + diff --git a/installer/dev/WindowsAppRuntimeInstall.vcxproj b/installer/dev/WindowsAppRuntimeInstall.vcxproj index 53468defd8..663cd6a29a 100644 --- a/installer/dev/WindowsAppRuntimeInstall.vcxproj +++ b/installer/dev/WindowsAppRuntimeInstall.vcxproj @@ -126,26 +126,26 @@ - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + Create - + diff --git a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj index 4c1804ed35..389f90e386 100644 --- a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj +++ b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj @@ -181,9 +181,9 @@ - - - + + + Create Create Create @@ -193,9 +193,9 @@ - - - + + + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj index 993ccfe4fb..d2fb51ba37 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj @@ -102,7 +102,7 @@ - + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index 0e1fbe47d2..92889b70ff 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -102,7 +102,7 @@ - + diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index f8b2dd4319..9a486ec7ac 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -193,37 +193,37 @@ - - - - + + + + Create - - - + + + NotUsing - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 0811e2d63f..042205ee1e 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -198,29 +198,29 @@ - - - + + + Create - - - - - - - - - - - + + + + + + + + + + + - - - + + + diff --git a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj index f8007191fe..4e4b9216bf 100644 --- a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj +++ b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj @@ -217,14 +217,14 @@ - - - + + + - - - + + + Create Create Create diff --git a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj index da15e3a816..de276a295c 100644 --- a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj +++ b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj @@ -225,14 +225,14 @@ - - - + + + - - - + + + Create Create Create diff --git a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj index 5518cdec22..09689e4286 100644 --- a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj +++ b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj @@ -232,16 +232,16 @@ - - - - + + + + - - - - + + + + Create Create Create diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index 76ede2c416..33e82ba48f 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -133,21 +133,21 @@ - - - - + + + + - - + + - - + + diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index e6713e5ed1..0e5be656bb 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -110,28 +110,28 @@ Create - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + diff --git a/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj index 3e6133957b..bc6d44b648 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj index d7edb152f0..2e161ec7d5 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj index 496e8cfeb6..ac3a9e6b05 100644 --- a/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj index 4376203372..8fc63d484c 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index b2941331a0..59792799f6 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -118,7 +118,7 @@ - + diff --git a/test/StoragePickersTests/StoragePickersTests.vcxproj b/test/StoragePickersTests/StoragePickersTests.vcxproj index a0ef7bc5fb..202fe8f483 100644 --- a/test/StoragePickersTests/StoragePickersTests.vcxproj +++ b/test/StoragePickersTests/StoragePickersTests.vcxproj @@ -104,7 +104,7 @@ - + Create @@ -115,7 +115,7 @@ - + From 1c0141c70a20fa9a8632c2394e1ca015a11b0136 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 01:41:52 -0700 Subject: [PATCH 12/45] Using both bin logs --- tools/GenerateCompilationDatabase.ps1 | 32 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 4ab160912c..cf894b6fbf 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -2,6 +2,11 @@ Param( [string]$Ms2ccVersion = "1.3.0" ) +$binlogFileBase = Split-Path $PSScriptRoot -parent +$binlogFile0 = Join-Path $binlogFileBase "BuildOutput\Binlogs\MrtCore.x64.Release.binlog" +$binlogFile1 = Join-Path $binlogFileBase "BuildOutput\Binlogs\WindowsAppRuntime.x64.Release.binlog" + +$binlogFiles = @($binlogFile0, $binlogFile1) $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath write-host "VCToolsInstallDir: $VCToolsInstallDir" @@ -9,24 +14,25 @@ write-host "VCToolsInstallDir: $VCToolsInstallDir" $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" write-host "msBuildPath: $msBuildPath" -$binlogFile = Split-Path $PSScriptRoot -parent -$binlogFile = Join-Path $binlogFile "BuildOutput\Binlogs\WindowsAppRuntime.x64.Release.binlog" +Remove-Item "temp-filtered.log" -ErrorAction SilentlyContinue -if (-Not (Test-Path $binlogFile)) { - Write-Error "Binlog file not found: $binlogFile" - exit 1 -} +foreach ($binlogFile in $binlogFiles) { + if (-Not (Test-Path $binlogFile)) { + Write-Error "Binlog file not found: $binlogFile" + exit 1 + } -& $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=temp.log + & $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=temp.log -Select-String -Path "temp.log" -Pattern "Cl.exe" | - ForEach-Object { $_.Line } | - Where-Object { $_ -notmatch "Tracker.exe" } | - Set-Content -Path "temp-filtered.log" + Select-String -Path "temp.log" -Pattern "Cl.exe" | + ForEach-Object { $_.Line } | + Where-Object { $_ -notmatch "Tracker.exe" } | + Out-File -FilePath "temp-filtered.log" -Append -Encoding utf8 -Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" + Remove-Item "temp.log" +} -Remove-Item "temp.log" +Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" $ms2ccPath = Join-Path $PSScriptRoot "ms2cc" $ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" From 213caaf06a84e0c9af1e9342ff208d8e59eaa6f3 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 09:55:32 -0700 Subject: [PATCH 13/45] Testing eol --- test/AppLifecycle/AppLifecycle.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 2dd4f1a34e..44f288dd35 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -206,7 +206,7 @@ - + .Debug From eb970734858127d4826c71ca228f1fb3107e9851 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 10:01:32 -0700 Subject: [PATCH 14/45] Testing eol 2 --- test/ABForward/ABForward.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index 179b174b11..3990a234ff 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -223,7 +223,7 @@ - + From c3cddcbaf208aa1aa8c2821e6ffb95333a0af1e9 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 10:02:59 -0700 Subject: [PATCH 15/45] Revert "Testing eol 2" This reverts commit eb970734858127d4826c71ca228f1fb3107e9851. --- test/ABForward/ABForward.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index 3990a234ff..179b174b11 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -223,7 +223,7 @@ - + From 46c9ca6b37472732ee466b931da3da5971223f00 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 10:03:57 -0700 Subject: [PATCH 16/45] Revert "Testing eol" This reverts commit 213caaf06a84e0c9af1e9342ff208d8e59eaa6f3. --- test/AppLifecycle/AppLifecycle.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 44f288dd35..2dd4f1a34e 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -206,7 +206,7 @@ - + .Debug From 93df0d874bcbcabe60b152471feec07851ca5ef7 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 10:10:00 -0700 Subject: [PATCH 17/45] Testing eol 3 --- test/AppLifecycle/AppLifecycle.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 2dd4f1a34e..ef36681043 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -255,4 +255,4 @@ $(RepoTestCertificatePFX) $(RepoTestCertificatePassword) - \ No newline at end of file + From 5d246062f6764b87af2ebab0c351ff0869acb7e0 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 11:31:34 -0700 Subject: [PATCH 18/45] Fixing EOF on test vcxproj files --- .../AppNotificationBuilderTests.vcxproj | 2 +- test/AppNotificationTests/AppNotificationTests.vcxproj | 2 +- test/ApplicationData/ApplicationDataTests.vcxproj | 2 +- test/BackgroundTaskTests/BackgroundTaskTests.vcxproj | 2 +- test/CameraCaptureUITests/CameraCaptureUITests.vcxproj | 2 +- test/Common/Common.vcxproj | 2 +- .../Compatibility/CompatibilityTests/CompatibilityTests.vcxproj | 2 +- .../Test_CompatibilitySetter_CPP.vcxproj | 2 +- test/Decimal/CPP/DecimalTests.vcxproj | 2 +- test/Decimal/WinRT/DecimalTest_WinRT.vcxproj | 2 +- test/Deployment/API/DeploymentTests.vcxproj | 2 +- ..._DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj | 2 +- .../CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Default.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj | 2 +- .../Test_Win32/DynamicDependency_Test_Win32.vcxproj | 2 +- .../Test_WinRT/DynamicDependency_Test_WinRT.vcxproj | 2 +- test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj | 2 +- test/LRPTests/LRPTests.vcxproj | 2 +- test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj | 2 +- test/PackageManager/API/PackageManagerTests.vcxproj | 2 +- test/PowerNotifications/PowerNotifications.vcxproj | 2 +- test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj | 2 +- test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj | 2 +- test/TestApps/ManualTestApp/ManualTestApp.vcxproj | 2 +- test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj | 2 +- .../PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj | 2 +- .../PushNotificationsTestApp/PushNotificationsTestApp.vcxproj | 2 +- .../ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj | 2 +- .../ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj | 2 +- test/VersionInfo/VersionInfoTests.vcxproj | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index e2f51bff05..8a0edd3509 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index df54907eb3..3c12d215fb 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -180,4 +180,4 @@ - \ No newline at end of file + diff --git a/test/ApplicationData/ApplicationDataTests.vcxproj b/test/ApplicationData/ApplicationDataTests.vcxproj index 265ce9914a..8244a0c8a7 100644 --- a/test/ApplicationData/ApplicationDataTests.vcxproj +++ b/test/ApplicationData/ApplicationDataTests.vcxproj @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj index 9d1eb61567..afc672bb49 100644 --- a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj +++ b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj @@ -263,4 +263,4 @@ - \ No newline at end of file + diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index 96eaca3ee6..690771054b 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -270,4 +270,4 @@ - \ No newline at end of file + diff --git a/test/Common/Common.vcxproj b/test/Common/Common.vcxproj index a0c3e8298e..c7568dc931 100644 --- a/test/Common/Common.vcxproj +++ b/test/Common/Common.vcxproj @@ -141,4 +141,4 @@ - \ No newline at end of file + diff --git a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj index 26e5ed1adb..e558c5de68 100644 --- a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj +++ b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj @@ -149,4 +149,4 @@ - \ No newline at end of file + diff --git a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj index 941a488c9b..f8abf15695 100644 --- a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj +++ b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/test/Decimal/CPP/DecimalTests.vcxproj b/test/Decimal/CPP/DecimalTests.vcxproj index 3bb1764e03..65e794ba0e 100644 --- a/test/Decimal/CPP/DecimalTests.vcxproj +++ b/test/Decimal/CPP/DecimalTests.vcxproj @@ -155,4 +155,4 @@ - \ No newline at end of file + diff --git a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj index cec8981eb0..284e7985cc 100644 --- a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj +++ b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/test/Deployment/API/DeploymentTests.vcxproj b/test/Deployment/API/DeploymentTests.vcxproj index 3793012b33..85bb68ab15 100644 --- a/test/Deployment/API/DeploymentTests.vcxproj +++ b/test/Deployment/API/DeploymentTests.vcxproj @@ -246,4 +246,4 @@ - \ No newline at end of file + diff --git a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj index eaef76eb7a..6905cbc716 100644 --- a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj @@ -141,4 +141,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index 92889b70ff..f839cac8d6 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -118,4 +118,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj index 77cac0cc7c..ef9ead1f3c 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj index e8aef57d13..f5962fe94b 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj index 16dd8057b0..9a7e9d63bc 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj index d9484f1f42..abd4c4bd22 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 9a486ec7ac..3af31def68 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -257,4 +257,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 042205ee1e..0123004fe6 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index 33e82ba48f..50f5f843fe 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -188,4 +188,4 @@ - \ No newline at end of file + diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index a5c79ae1d3..92781f3d60 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -147,4 +147,4 @@ - \ No newline at end of file + diff --git a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj index dcba3c7a50..d231747b90 100644 --- a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj +++ b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj @@ -281,4 +281,4 @@ - \ No newline at end of file + diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index 0e5be656bb..0922b303ed 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -188,4 +188,4 @@ - \ No newline at end of file + diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index 59792799f6..ec2fcb38b5 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj index 02faa68f9a..7eb019eb20 100644 --- a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj +++ b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj @@ -224,4 +224,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj index 43e23539a0..2ed471a3cd 100644 --- a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj +++ b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj @@ -230,4 +230,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj index ad47e9d1ec..0887da7968 100644 --- a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj +++ b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj @@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj index 9d94b34f86..bc8359ed44 100644 --- a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj +++ b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj @@ -150,4 +150,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj index 58503381a9..339d4b00fd 100644 --- a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj +++ b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj @@ -234,4 +234,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj index 18daefc3a1..68a2f38207 100644 --- a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj +++ b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj @@ -235,4 +235,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj index 882b5a99ce..f92133c99a 100644 --- a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj +++ b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj @@ -248,4 +248,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj index 94fe3dd6a5..663a81d1f1 100644 --- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj +++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj @@ -238,4 +238,4 @@ - \ No newline at end of file + diff --git a/test/VersionInfo/VersionInfoTests.vcxproj b/test/VersionInfo/VersionInfoTests.vcxproj index c95415e37c..be310e1705 100644 --- a/test/VersionInfo/VersionInfoTests.vcxproj +++ b/test/VersionInfo/VersionInfoTests.vcxproj @@ -148,4 +148,4 @@ - \ No newline at end of file + From 4a0ad1d7306954778bb22eb315feb0c42aa9529c Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 11:34:02 -0700 Subject: [PATCH 19/45] Fixing missing test files --- test/AccessControlTests/AccessControlTests.vcxproj | 2 +- .../CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 44312154d7..242b71c083 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index f839cac8d6..92889b70ff 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -118,4 +118,4 @@ - \ No newline at end of file + From 0d6b13fcf1b890421ac9aa06cd88129e1b14d5dd Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:13:20 -0700 Subject: [PATCH 20/45] Revert "Fixing missing test files" This reverts commit 4a0ad1d7306954778bb22eb315feb0c42aa9529c. --- test/AccessControlTests/AccessControlTests.vcxproj | 2 +- .../CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 242b71c083..44312154d7 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -245,4 +245,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index 92889b70ff..f839cac8d6 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -118,4 +118,4 @@ - + \ No newline at end of file From 5ecd1b2c0ed415fb1044d3a65622261da79cf7aa Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:13:37 -0700 Subject: [PATCH 21/45] Revert "Fixing EOF on test vcxproj files" This reverts commit 5d246062f6764b87af2ebab0c351ff0869acb7e0. --- .../AppNotificationBuilderTests.vcxproj | 2 +- test/AppNotificationTests/AppNotificationTests.vcxproj | 2 +- test/ApplicationData/ApplicationDataTests.vcxproj | 2 +- test/BackgroundTaskTests/BackgroundTaskTests.vcxproj | 2 +- test/CameraCaptureUITests/CameraCaptureUITests.vcxproj | 2 +- test/Common/Common.vcxproj | 2 +- .../Compatibility/CompatibilityTests/CompatibilityTests.vcxproj | 2 +- .../Test_CompatibilitySetter_CPP.vcxproj | 2 +- test/Decimal/CPP/DecimalTests.vcxproj | 2 +- test/Decimal/WinRT/DecimalTest_WinRT.vcxproj | 2 +- test/Deployment/API/DeploymentTests.vcxproj | 2 +- ..._DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj | 2 +- .../CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Default.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj | 2 +- .../Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj | 2 +- .../Test_Win32/DynamicDependency_Test_Win32.vcxproj | 2 +- .../Test_WinRT/DynamicDependency_Test_WinRT.vcxproj | 2 +- test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj | 2 +- test/LRPTests/LRPTests.vcxproj | 2 +- test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj | 2 +- test/PackageManager/API/PackageManagerTests.vcxproj | 2 +- test/PowerNotifications/PowerNotifications.vcxproj | 2 +- test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj | 2 +- test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj | 2 +- test/TestApps/ManualTestApp/ManualTestApp.vcxproj | 2 +- test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj | 2 +- .../PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj | 2 +- .../PushNotificationsTestApp/PushNotificationsTestApp.vcxproj | 2 +- .../ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj | 2 +- .../ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj | 2 +- test/VersionInfo/VersionInfoTests.vcxproj | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index 8a0edd3509..e2f51bff05 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -154,4 +154,4 @@ - + \ No newline at end of file diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index 3c12d215fb..df54907eb3 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -180,4 +180,4 @@ - + \ No newline at end of file diff --git a/test/ApplicationData/ApplicationDataTests.vcxproj b/test/ApplicationData/ApplicationDataTests.vcxproj index 8244a0c8a7..265ce9914a 100644 --- a/test/ApplicationData/ApplicationDataTests.vcxproj +++ b/test/ApplicationData/ApplicationDataTests.vcxproj @@ -163,4 +163,4 @@ - + \ No newline at end of file diff --git a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj index afc672bb49..9d1eb61567 100644 --- a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj +++ b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj @@ -263,4 +263,4 @@ - + \ No newline at end of file diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index 690771054b..96eaca3ee6 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -270,4 +270,4 @@ - + \ No newline at end of file diff --git a/test/Common/Common.vcxproj b/test/Common/Common.vcxproj index c7568dc931..a0c3e8298e 100644 --- a/test/Common/Common.vcxproj +++ b/test/Common/Common.vcxproj @@ -141,4 +141,4 @@ - + \ No newline at end of file diff --git a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj index e558c5de68..26e5ed1adb 100644 --- a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj +++ b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj @@ -149,4 +149,4 @@ - + \ No newline at end of file diff --git a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj index f8abf15695..941a488c9b 100644 --- a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj +++ b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj @@ -166,4 +166,4 @@ - + \ No newline at end of file diff --git a/test/Decimal/CPP/DecimalTests.vcxproj b/test/Decimal/CPP/DecimalTests.vcxproj index 65e794ba0e..3bb1764e03 100644 --- a/test/Decimal/CPP/DecimalTests.vcxproj +++ b/test/Decimal/CPP/DecimalTests.vcxproj @@ -155,4 +155,4 @@ - + \ No newline at end of file diff --git a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj index 284e7985cc..cec8981eb0 100644 --- a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj +++ b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj @@ -164,4 +164,4 @@ - + \ No newline at end of file diff --git a/test/Deployment/API/DeploymentTests.vcxproj b/test/Deployment/API/DeploymentTests.vcxproj index 85bb68ab15..3793012b33 100644 --- a/test/Deployment/API/DeploymentTests.vcxproj +++ b/test/Deployment/API/DeploymentTests.vcxproj @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj index 6905cbc716..eaef76eb7a 100644 --- a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj @@ -141,4 +141,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index f839cac8d6..92889b70ff 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj index ef9ead1f3c..77cac0cc7c 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj index f5962fe94b..e8aef57d13 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj @@ -129,4 +129,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj index 9a7e9d63bc..16dd8057b0 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj @@ -133,4 +133,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj index abd4c4bd22..d9484f1f42 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj @@ -129,4 +129,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 3af31def68..9a486ec7ac 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -257,4 +257,4 @@ - + \ No newline at end of file diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 0123004fe6..042205ee1e 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -254,4 +254,4 @@ - + \ No newline at end of file diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index 50f5f843fe..33e82ba48f 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -188,4 +188,4 @@ - + \ No newline at end of file diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index 92781f3d60..a5c79ae1d3 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -147,4 +147,4 @@ - + \ No newline at end of file diff --git a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj index d231747b90..dcba3c7a50 100644 --- a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj +++ b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj @@ -281,4 +281,4 @@ - + \ No newline at end of file diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index 0922b303ed..0e5be656bb 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -188,4 +188,4 @@ - + \ No newline at end of file diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index ec2fcb38b5..59792799f6 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -173,4 +173,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj index 7eb019eb20..02faa68f9a 100644 --- a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj +++ b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj @@ -224,4 +224,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj index 2ed471a3cd..43e23539a0 100644 --- a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj +++ b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj @@ -230,4 +230,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj index 0887da7968..ad47e9d1ec 100644 --- a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj +++ b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj @@ -232,4 +232,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj index bc8359ed44..9d94b34f86 100644 --- a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj +++ b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj @@ -150,4 +150,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj index 339d4b00fd..58503381a9 100644 --- a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj +++ b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj @@ -234,4 +234,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj index 68a2f38207..18daefc3a1 100644 --- a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj +++ b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj @@ -235,4 +235,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj index f92133c99a..882b5a99ce 100644 --- a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj +++ b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj @@ -248,4 +248,4 @@ - + \ No newline at end of file diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj index 663a81d1f1..94fe3dd6a5 100644 --- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj +++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj @@ -238,4 +238,4 @@ - + \ No newline at end of file diff --git a/test/VersionInfo/VersionInfoTests.vcxproj b/test/VersionInfo/VersionInfoTests.vcxproj index be310e1705..c95415e37c 100644 --- a/test/VersionInfo/VersionInfoTests.vcxproj +++ b/test/VersionInfo/VersionInfoTests.vcxproj @@ -148,4 +148,4 @@ - + \ No newline at end of file From 221f4600d06437db5e8b0a556b39bed590ab3d6a Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:13:53 -0700 Subject: [PATCH 22/45] Revert "Testing eol 3" This reverts commit 93df0d874bcbcabe60b152471feec07851ca5ef7. --- test/AppLifecycle/AppLifecycle.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index ef36681043..2dd4f1a34e 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -255,4 +255,4 @@ $(RepoTestCertificatePFX) $(RepoTestCertificatePassword) - + \ No newline at end of file From 7aa3f44fdb55dbcba59be9eb4c87969f329e1ba4 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:14:25 -0700 Subject: [PATCH 23/45] Revert "Fixing include path on everything" This reverts commit e2ed1bb6af8f9da9a803f7d81e65b638649bc0a2. --- dev/MRTCore/mrt/Core/src/MRM.vcxproj | 4 +- .../mrt/Core/unittests/MrmUnitTest.vcxproj | 2 +- ...Windows.ApplicationModel.Resources.vcxproj | 36 ++++---- .../mrm/UnitTests/MrmBaseUnitTests.vcxproj | 88 +++++++++---------- dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj | 46 +++++----- dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj | 88 +++++++++---------- ...ficationsLongRunningTask.ProxyStub.vcxproj | 6 +- ...cationsLongRunningTask.StartupTask.vcxproj | 8 +- .../PushNotificationsLongRunningTask.vcxproj | 36 ++++---- .../BlankApp/ProjectTemplate.vcxproj | 14 +-- .../ProjectTemplate.vcxproj | 14 +-- .../UnitTestApp/ProjectTemplate.vcxproj | 16 ++-- .../RuntimeComponent/ProjectTemplate.vcxproj | 8 +- .../dev/WindowsAppRuntimeInstall.vcxproj | 32 +++---- .../InstallerFunctionalTests.vcxproj | 12 +-- .../HelloWorldAdvancedC.vcxproj | 2 +- .../HelloWorldAdvancedCPP.vcxproj | 2 +- .../DynamicDependency_Test_Win32.vcxproj | 46 +++++----- .../DynamicDependency_Test_WinRT.vcxproj | 34 +++---- .../Framework.Math.Add.vcxproj | 12 +-- .../Framework.Math.Multiply.vcxproj | 12 +-- .../Framework.Widgets.vcxproj | 16 ++-- .../EnvironmentManagerTests.vcxproj | 16 ++-- .../API/PackageManagerTests.vcxproj | 38 ++++---- .../PackageManager.Test.M.Black.msix.vcxproj | 8 +- ...PackageManager.Test.M.Blacker.msix.vcxproj | 8 +- .../PackageManager.Test.M.White.msix.vcxproj | 8 +- .../PackageManager.Test.M.Whiter.msix.vcxproj | 8 +- .../PowerNotifications.vcxproj | 2 +- .../StoragePickersTests.vcxproj | 4 +- 30 files changed, 313 insertions(+), 313 deletions(-) diff --git a/dev/MRTCore/mrt/Core/src/MRM.vcxproj b/dev/MRTCore/mrt/Core/src/MRM.vcxproj index d5cdc21dc2..1a4f3740b0 100644 --- a/dev/MRTCore/mrt/Core/src/MRM.vcxproj +++ b/dev/MRTCore/mrt/Core/src/MRM.vcxproj @@ -93,10 +93,10 @@ - + - + diff --git a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj index 888bc95438..f5d4ae0814 100644 --- a/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj +++ b/dev/MRTCore/mrt/Core/unittests/MrmUnitTest.vcxproj @@ -163,7 +163,7 @@ - + diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj index 884f5c64bc..fc908a6212 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj @@ -107,31 +107,31 @@ - - - + + + - - - - - - + + + + + + - - - + + + Create - - - - - - + + + + + + diff --git a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj index 64043ea058..1f34a069e9 100644 --- a/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj +++ b/dev/MRTCore/mrt/mrm/UnitTests/MrmBaseUnitTests.vcxproj @@ -105,39 +105,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,17 +209,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj index b3fa03bfa9..91f861c2f9 100644 --- a/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj +++ b/dev/MRTCore/mrt/mrm/mrmex/mrmex.vcxproj @@ -123,28 +123,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -162,7 +162,7 @@ - + diff --git a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj index 8bbaa7edb7..9af96e4e4e 100644 --- a/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj +++ b/dev/MRTCore/mrt/mrm/mrmmin/mrmmin.vcxproj @@ -162,52 +162,52 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj index f9e394f1fb..f1c6fd3ff4 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask.ProxyStub/PushNotificationsLongRunningTask.ProxyStub.vcxproj @@ -394,8 +394,8 @@ - - + + @@ -428,7 +428,7 @@ NotUsing NotUsing - + Create Create Create diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj index 9c797d63ac..5972ae34b8 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask.StartupTask/PushNotificationsLongRunningTask.StartupTask.vcxproj @@ -158,12 +158,12 @@ - - + + - - + + diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj index f2b6cd2122..5ede563b65 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj @@ -167,26 +167,26 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj index 38dcf0f063..3b22ac980a 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/PackagedApp/BlankApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -99,11 +99,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -112,13 +112,13 @@ - + Create - + App.xaml - + MainWindow.xaml diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj index 95792db8c1..6f00439305 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -105,11 +105,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -118,13 +118,13 @@ - + Create - + App.xaml - + MainWindow.xaml diff --git a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj index 16d7f9257d..f4813446c1 100644 --- a/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Desktop/CppWinRT/UnitTestApp/ProjectTemplate.vcxproj @@ -1,4 +1,4 @@ - + true @@ -118,11 +118,11 @@ - - + + App.xaml - + MainWindow.xaml @@ -131,17 +131,17 @@ - + Create - + App.xaml - + MainWindow.xaml - + diff --git a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj index 04007f791e..44d6f85bf7 100644 --- a/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj +++ b/dev/VSIX/ProjectTemplates/Neutral/CppWinRT/RuntimeComponent/ProjectTemplate.vcxproj @@ -102,16 +102,16 @@ - - + + Class.cpp - + Create - + diff --git a/installer/dev/WindowsAppRuntimeInstall.vcxproj b/installer/dev/WindowsAppRuntimeInstall.vcxproj index 663cd6a29a..53468defd8 100644 --- a/installer/dev/WindowsAppRuntimeInstall.vcxproj +++ b/installer/dev/WindowsAppRuntimeInstall.vcxproj @@ -126,26 +126,26 @@ - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + Create - + diff --git a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj index 389f90e386..4c1804ed35 100644 --- a/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj +++ b/installer/test/InstallerFunctionalTests/InstallerFunctionalTests.vcxproj @@ -181,9 +181,9 @@ - - - + + + Create Create Create @@ -193,9 +193,9 @@ - - - + + + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj index d2fb51ba37..993ccfe4fb 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/C/HelloWorldAdvancedC/HelloWorldAdvancedC.vcxproj @@ -102,7 +102,7 @@ - + diff --git a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj index 92889b70ff..0e1fbe47d2 100644 --- a/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj +++ b/test/DynamicDependency/ManualTest/HelloWorldAdvanced/CPP/HelloWorldAdvancedCPP/HelloWorldAdvancedCPP.vcxproj @@ -102,7 +102,7 @@ - + diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index 9a486ec7ac..f8b2dd4319 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -193,37 +193,37 @@ - - - - + + + + Create - - - + + + NotUsing - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 042205ee1e..0811e2d63f 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -198,29 +198,29 @@ - - - + + + Create - - - - - - - - - - - + + + + + + + + + + + - - - + + + diff --git a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj index 4e4b9216bf..f8007191fe 100644 --- a/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj +++ b/test/DynamicDependency/data/Framework.Math.Add/Framework.Math.Add.vcxproj @@ -217,14 +217,14 @@ - - - + + + - - - + + + Create Create Create diff --git a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj index de276a295c..da15e3a816 100644 --- a/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj +++ b/test/DynamicDependency/data/Framework.Math.Multiply/Framework.Math.Multiply.vcxproj @@ -225,14 +225,14 @@ - - - + + + - - - + + + Create Create Create diff --git a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj index 09689e4286..5518cdec22 100644 --- a/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj +++ b/test/DynamicDependency/data/Framework.Widgets/Framework.Widgets.vcxproj @@ -232,16 +232,16 @@ - - - - + + + + - - - - + + + + Create Create Create diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index 33e82ba48f..76ede2c416 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -133,21 +133,21 @@ - - - - + + + + - - + + - - + + diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index 0e5be656bb..e6713e5ed1 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -110,28 +110,28 @@ Create - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + diff --git a/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj index bc6d44b648..3e6133957b 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Black.msix/PackageManager.Test.M.Black.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj index 2e161ec7d5..d7edb152f0 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Blacker.msix/PackageManager.Test.M.Blacker.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj index ac3a9e6b05..496e8cfeb6 100644 --- a/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.White.msix/PackageManager.Test.M.White.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj b/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj index 8fc63d484c..4376203372 100644 --- a/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj +++ b/test/PackageManager/data/PackageManager.Test.M.Whiter.msix/PackageManager.Test.M.Whiter.msix.vcxproj @@ -1,4 +1,4 @@ - + @@ -125,13 +125,13 @@ - + - + Create - + diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index 59792799f6..b2941331a0 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -118,7 +118,7 @@ - + diff --git a/test/StoragePickersTests/StoragePickersTests.vcxproj b/test/StoragePickersTests/StoragePickersTests.vcxproj index 202fe8f483..a0ef7bc5fb 100644 --- a/test/StoragePickersTests/StoragePickersTests.vcxproj +++ b/test/StoragePickersTests/StoragePickersTests.vcxproj @@ -104,7 +104,7 @@ - + Create @@ -115,7 +115,7 @@ - + From c3b1f8e87351a44ca5daf14322e266d238d9ed01 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:14:50 -0700 Subject: [PATCH 24/45] Revert "Using specific path for almost all includes in the project" This reverts commit 00f9789ac20f251574f85fe33abe1ca57f6aa599. --- dev/DeploymentAgent/DeploymentAgent.vcxproj | 12 ++++---- dev/Detours/Detours.vcxproj | 26 ++++++++-------- ...micDependencyLifetimeManagerShadow.vcxproj | 12 ++++---- ...amicDependency.DataStore.ProxyStub.vcxproj | 12 ++++---- .../DynamicDependency.DataStore.vcxproj | 10 +++---- ...ependencyLifetimeManager.ProxyStub.vcxproj | 12 ++++---- .../DynamicDependencyLifetimeManager.vcxproj | 10 +++---- .../IDynamicDependencyLifetimeManager.vcxproj | 4 +-- .../ChangeTracker/ChangeTracker.vcxitems | 4 +-- ...Windows.ApplicationModel.Resources.vcxproj | 4 +-- dev/RestartAgent/RestartAgent.vcxproj | 10 +++---- .../WindowsAppRuntime_BootstrapDLL.vcxproj | 30 +++++++++---------- .../WindowsAppRuntime_DLL.vcxproj | 10 +++---- ...ndowsAppRuntime_UniversalBGTaskDLL.vcxproj | 12 ++++---- test/ABForward/ABForward.vcxproj | 4 +-- .../AccessControlTests.vcxproj | 4 +-- test/AppLifecycle/AppLifecycle.vcxproj | 4 +-- .../AppNotificationBuilderTests.vcxproj | 4 +-- .../AppNotificationTests.vcxproj | 8 ++--- .../ApplicationDataTests.vcxproj | 14 ++++----- .../BackgroundTaskTests.vcxproj | 8 ++--- .../BadgeNotificationTest.vcxproj | 10 +++---- .../CameraCaptureUITests.vcxproj | 4 +-- test/Common/Common.vcxproj | 12 ++++---- .../CompatibilityTests.vcxproj | 8 ++--- .../Test_CompatibilitySetter_CPP.vcxproj | 8 ++--- test/Decimal/CPP/DecimalTests.vcxproj | 10 +++---- test/Decimal/WinRT/DecimalTest_WinRT.vcxproj | 10 +++---- ...AutoInitialize_CPP_Options_Defined.vcxproj | 6 ++-- ...ootstrapAutoInitialize_CPP_Default.vcxproj | 4 +-- ...AutoInitialize_CPP_Options_Default.vcxproj | 4 +-- ...AutoInitialize_CPP_Options_Defined.vcxproj | 4 +-- ...rapAutoInitialize_CPP_Options_None.vcxproj | 4 +-- .../DynamicDependency_Test_Win32.vcxproj | 6 ++-- .../DynamicDependency_Test_WinRT.vcxproj | 6 ++-- .../EnvironmentManagerTests.vcxproj | 6 ++-- test/LRPTests/LRPTests.vcxproj | 4 +-- .../OAuth2ManagerTests.vcxproj | 10 +++---- .../API/PackageManagerTests.vcxproj | 8 ++--- .../PowerNotifications.vcxproj | 4 +-- .../PushNotificationTests.vcxproj | 6 ++-- .../StoragePickersTests.vcxproj | 12 ++++---- .../AccessControlTestApp.vcxproj | 8 ++--- .../AppLifecycleTestApp.vcxproj | 20 ++++++------- .../ManualTestApp/ManualTestApp.vcxproj | 12 ++++---- .../OAuthTestApp/OAuthTestApp.vcxproj | 8 ++--- .../PushNotificationsDemoApp.vcxproj | 8 ++--- .../PushNotificationsTestApp.vcxproj | 8 ++--- .../ToastNotificationsDemoApp.vcxproj | 12 ++++---- .../ToastNotificationsTestApp.vcxproj | 12 ++++---- test/VersionInfo/VersionInfoTests.vcxproj | 8 ++--- 51 files changed, 228 insertions(+), 228 deletions(-) diff --git a/dev/DeploymentAgent/DeploymentAgent.vcxproj b/dev/DeploymentAgent/DeploymentAgent.vcxproj index d7df9f03d3..fb0b0b2745 100644 --- a/dev/DeploymentAgent/DeploymentAgent.vcxproj +++ b/dev/DeploymentAgent/DeploymentAgent.vcxproj @@ -97,17 +97,17 @@ - - + + - - + + Create - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/dev/Detours/Detours.vcxproj b/dev/Detours/Detours.vcxproj index d5a56086ec..4b6df3ab62 100644 --- a/dev/Detours/Detours.vcxproj +++ b/dev/Detours/Detours.vcxproj @@ -234,20 +234,20 @@ - - + + - - - - - - - - - - + + + + + + + + + + @@ -273,4 +273,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj index 1204aa5bfc..8e44f09fdd 100644 --- a/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj +++ b/dev/DynamicDependency/DynamicDependencyLifetimeManagerShadow/DynamicDependencyLifetimeManagerShadow.vcxproj @@ -183,10 +183,10 @@ - + - + Create Create Create @@ -194,13 +194,13 @@ Create Create - + - + - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -223,4 +223,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj index 8366d13246..123affd151 100644 --- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj +++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore.ProxyStub/DynamicDependency.DataStore.ProxyStub.vcxproj @@ -229,8 +229,8 @@ - - + + @@ -257,7 +257,7 @@ NotUsing NotUsing - + Create Create Create @@ -267,12 +267,12 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) - + @@ -303,4 +303,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj index bb4b141553..99192f2660 100644 --- a/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj +++ b/dev/DynamicDependencyDataStore/DynamicDependency.DataStore/DynamicDependency.DataStore.vcxproj @@ -195,10 +195,10 @@ - + - + Create Create Create @@ -206,7 +206,7 @@ Create Create - + @@ -217,7 +217,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -243,4 +243,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj index 016b103904..32bcca96e6 100644 --- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.ProxyStub/DynamicDependencyLifetimeManager.ProxyStub.vcxproj @@ -234,8 +234,8 @@ - - + + @@ -262,7 +262,7 @@ NotUsing NotUsing - + Create Create Create @@ -272,12 +272,12 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) - + @@ -312,4 +312,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj index 8e83e08dc1..d819ea9aee 100644 --- a/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager/DynamicDependencyLifetimeManager.vcxproj @@ -189,10 +189,10 @@ - + - + Create Create Create @@ -200,7 +200,7 @@ Create Create - + @@ -211,7 +211,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -234,4 +234,4 @@ - \ No newline at end of file + diff --git a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj index 29654cd4cc..919e61ce6f 100644 --- a/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj +++ b/dev/DynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager/IDynamicDependencyLifetimeManager.vcxproj @@ -162,7 +162,7 @@ - + @@ -178,4 +178,4 @@ - \ No newline at end of file + diff --git a/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems b/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems index 977adb17e1..63eb83d375 100644 --- a/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems +++ b/dev/EnvironmentManager/ChangeTracker/ChangeTracker.vcxitems @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj index fc908a6212..3542aa54e8 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj @@ -110,7 +110,7 @@ - + @@ -122,7 +122,7 @@ - + Create diff --git a/dev/RestartAgent/RestartAgent.vcxproj b/dev/RestartAgent/RestartAgent.vcxproj index 5f94ff853d..b5bd0e5aa1 100644 --- a/dev/RestartAgent/RestartAgent.vcxproj +++ b/dev/RestartAgent/RestartAgent.vcxproj @@ -97,16 +97,16 @@ - + - - + + Create - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj index 6760ad104a..2e468ebae2 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj +++ b/dev/WindowsAppRuntime_BootstrapDLL/WindowsAppRuntime_BootstrapDLL.vcxproj @@ -259,21 +259,21 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + Create Create Create @@ -287,7 +287,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -328,4 +328,4 @@ {ccd23028-b9d3-410b-836e-20b2e7c08451} - \ No newline at end of file + diff --git a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj index bfb2731cba..444615c099 100644 --- a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj +++ b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj @@ -255,13 +255,13 @@ - + - - - - + + + + Create Create Create diff --git a/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj b/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj index 145bafe5f9..49d0cd57d1 100644 --- a/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj +++ b/dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj @@ -115,20 +115,20 @@ - - + + Task.cpp - + Create - + - + Code Task.cpp @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index 179b174b11..19a82ef1a9 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -217,13 +217,13 @@ - + Create - + diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 44312154d7..231945d273 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -187,10 +187,10 @@ - + - + Create Create Create diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 2dd4f1a34e..863555c4d1 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -195,14 +195,14 @@ - + Create - + diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index e2f51bff05..99bd16c239 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -106,13 +106,13 @@ - + Create - + diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index df54907eb3..35c2d81a83 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -115,7 +115,7 @@ - + Create @@ -123,11 +123,11 @@ - + - - + + diff --git a/test/ApplicationData/ApplicationDataTests.vcxproj b/test/ApplicationData/ApplicationDataTests.vcxproj index 265ce9914a..e511f44ecd 100644 --- a/test/ApplicationData/ApplicationDataTests.vcxproj +++ b/test/ApplicationData/ApplicationDataTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -106,15 +106,15 @@ - + Create - - - + + + - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj index 9d1eb61567..297b63d539 100644 --- a/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj +++ b/test/BackgroundTaskTests/BackgroundTaskTests.vcxproj @@ -210,8 +210,8 @@ - - + + Create Create Create @@ -221,7 +221,7 @@ - + @@ -263,4 +263,4 @@ - \ No newline at end of file + diff --git a/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj b/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj index 1067147485..ad5094a8d0 100644 --- a/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj +++ b/test/BadgeNotificationTest/BadgeNotificationTest.vcxproj @@ -115,15 +115,15 @@ - + Create - + - - - + + + diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index 96eaca3ee6..a004c7350b 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -208,11 +208,11 @@ - + - + Create Create Create diff --git a/test/Common/Common.vcxproj b/test/Common/Common.vcxproj index a0c3e8298e..9b5ea7ac03 100644 --- a/test/Common/Common.vcxproj +++ b/test/Common/Common.vcxproj @@ -108,15 +108,15 @@ - + Create - - - + + + - + @@ -141,4 +141,4 @@ - \ No newline at end of file + diff --git a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj index 26e5ed1adb..8edeb3908c 100644 --- a/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj +++ b/test/Compatibility/CompatibilityTests/CompatibilityTests.vcxproj @@ -103,15 +103,15 @@ - + Create - + $(RepoRoot)\build\VersionInfo;%(AdditionalIncludeDirectories) - + @@ -149,4 +149,4 @@ - \ No newline at end of file + diff --git a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj index 941a488c9b..ffa104d5fa 100644 --- a/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj +++ b/test/Compatibility/Test_CompatibilitySetter_CPP/Test_CompatibilitySetter_CPP.vcxproj @@ -123,10 +123,10 @@ - + Create - + @@ -140,7 +140,7 @@ - + @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/test/Decimal/CPP/DecimalTests.vcxproj b/test/Decimal/CPP/DecimalTests.vcxproj index 3bb1764e03..984b2377f6 100644 --- a/test/Decimal/CPP/DecimalTests.vcxproj +++ b/test/Decimal/CPP/DecimalTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -106,13 +106,13 @@ - + Create - + - + @@ -155,4 +155,4 @@ - \ No newline at end of file + diff --git a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj index cec8981eb0..1706444e50 100644 --- a/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj +++ b/test/Decimal/WinRT/DecimalTest_WinRT.vcxproj @@ -1,4 +1,4 @@ - + @@ -107,13 +107,13 @@ - + Create - + - + @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj index eaef76eb7a..bd4cd76a70 100644 --- a/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/Deployment/Test_DeploymentManagerAutoInitialize/CPP/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj @@ -118,10 +118,10 @@ - + {f76b776e-86f5-48c5-8fc7-d2795ecc9746} - + {9c1a6c58-52d6-4514-9120-5c339c5df4be} @@ -141,4 +141,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj index 77cac0cc7c..d6e38a1fc7 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Default/Test_BootstrapAutoInitialize_CPP_Default.vcxproj @@ -102,7 +102,7 @@ - + @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj index e8aef57d13..00fff1528a 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Default/Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj @@ -103,7 +103,7 @@ - + @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj index 16dd8057b0..5a34d17988 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_Defined/Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj @@ -107,7 +107,7 @@ - + @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj index d9484f1f42..cef7c4d1b9 100644 --- a/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj +++ b/test/DynamicDependency/Test_BootstrapAutoInitialize/CPP/Test_BootstrapAutoInitialize_CPP_Options_None/Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj @@ -103,7 +103,7 @@ - + @@ -129,4 +129,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj index f8b2dd4319..9ef52159d2 100644 --- a/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj +++ b/test/DynamicDependency/Test_Win32/DynamicDependency_Test_Win32.vcxproj @@ -197,7 +197,7 @@ - + Create @@ -220,7 +220,7 @@ - + @@ -257,4 +257,4 @@ - \ No newline at end of file + diff --git a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj index 0811e2d63f..9007764baa 100644 --- a/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj +++ b/test/DynamicDependency/Test_WinRT/DynamicDependency_Test_WinRT.vcxproj @@ -201,7 +201,7 @@ - + Create @@ -217,7 +217,7 @@ - + @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj index 76ede2c416..cafdaf0b01 100644 --- a/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj +++ b/test/EnvironmentManagerTests/EnvironmentManagerTests.vcxproj @@ -137,8 +137,8 @@ - - + + @@ -188,4 +188,4 @@ - \ No newline at end of file + diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index a5c79ae1d3..30d3c15595 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -106,13 +106,13 @@ - + Create - + diff --git a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj index dcba3c7a50..d5bc13180a 100644 --- a/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj +++ b/test/OAuth2ManagerTests/OAuth2ManagerTests.vcxproj @@ -214,12 +214,12 @@ - - + + - - + + Create Create Create @@ -281,4 +281,4 @@ - \ No newline at end of file + diff --git a/test/PackageManager/API/PackageManagerTests.vcxproj b/test/PackageManager/API/PackageManagerTests.vcxproj index e6713e5ed1..96d55f4590 100644 --- a/test/PackageManager/API/PackageManagerTests.vcxproj +++ b/test/PackageManager/API/PackageManagerTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -107,7 +107,7 @@ - + Create @@ -129,7 +129,7 @@ - + @@ -188,4 +188,4 @@ - \ No newline at end of file + diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index b2941331a0..4d1bf63c3c 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -119,12 +119,12 @@ - + - + Create Create Create diff --git a/test/PushNotificationTests/PushNotificationTests.vcxproj b/test/PushNotificationTests/PushNotificationTests.vcxproj index 28439ba192..ac545ff43a 100644 --- a/test/PushNotificationTests/PushNotificationTests.vcxproj +++ b/test/PushNotificationTests/PushNotificationTests.vcxproj @@ -106,7 +106,7 @@ - + Create @@ -116,8 +116,8 @@ - - + + diff --git a/test/StoragePickersTests/StoragePickersTests.vcxproj b/test/StoragePickersTests/StoragePickersTests.vcxproj index a0ef7bc5fb..48ac11200b 100644 --- a/test/StoragePickersTests/StoragePickersTests.vcxproj +++ b/test/StoragePickersTests/StoragePickersTests.vcxproj @@ -105,19 +105,19 @@ - + Create - - - + + + $(RepoRoot)\build\VersionInfo;%(AdditionalIncludeDirectories) - - + + diff --git a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj index 02faa68f9a..227342c347 100644 --- a/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj +++ b/test/TestApps/AccessControlTestApp/AccessControlTestApp.vcxproj @@ -29,13 +29,13 @@ - - + + Create - + @@ -224,4 +224,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj index 43e23539a0..e81ab464f0 100644 --- a/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj +++ b/test/TestApps/AppLifecycleTestApp/AppLifecycleTestApp.vcxproj @@ -189,19 +189,19 @@ - - - + + + Create - - + + - - - - + + + + @@ -230,4 +230,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj index ad47e9d1ec..46f27e5e58 100644 --- a/test/TestApps/ManualTestApp/ManualTestApp.vcxproj +++ b/test/TestApps/ManualTestApp/ManualTestApp.vcxproj @@ -188,14 +188,14 @@ - - + + Create - - + + @@ -212,7 +212,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj index 9d94b34f86..70e7e69b18 100644 --- a/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj +++ b/test/TestApps/OAuthTestApp/OAuthTestApp.vcxproj @@ -106,11 +106,11 @@ - + - - + + Create @@ -150,4 +150,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj index 58503381a9..c375ae9e8a 100644 --- a/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj +++ b/test/TestApps/PushNotificationsDemoApp/PushNotificationsDemoApp.vcxproj @@ -183,13 +183,13 @@ - - + + Create - + @@ -234,4 +234,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj index 18daefc3a1..666d1f1aef 100644 --- a/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj +++ b/test/TestApps/PushNotificationsTestApp/PushNotificationsTestApp.vcxproj @@ -29,13 +29,13 @@ - - + + Create - + @@ -235,4 +235,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj index 882b5a99ce..48c96d4a34 100644 --- a/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj +++ b/test/TestApps/ToastNotificationsDemoApp/ToastNotificationsDemoApp.vcxproj @@ -183,14 +183,14 @@ - - + + Create - - + + @@ -223,7 +223,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -248,4 +248,4 @@ - \ No newline at end of file + diff --git a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj index 94fe3dd6a5..04e3858dbc 100644 --- a/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj +++ b/test/TestApps/ToastNotificationsTestApp/ToastNotificationsTestApp.vcxproj @@ -29,14 +29,14 @@ - - + + Create - - + + @@ -59,7 +59,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -238,4 +238,4 @@ - \ No newline at end of file + diff --git a/test/VersionInfo/VersionInfoTests.vcxproj b/test/VersionInfo/VersionInfoTests.vcxproj index c95415e37c..029e9305d3 100644 --- a/test/VersionInfo/VersionInfoTests.vcxproj +++ b/test/VersionInfo/VersionInfoTests.vcxproj @@ -107,13 +107,13 @@ - + Create - + - + @@ -148,4 +148,4 @@ - \ No newline at end of file + From b7e9fe91027154da33e518bf3367fabeef089910 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:15:27 -0700 Subject: [PATCH 25/45] Revert "Adding 2" This reverts commit f215bdde62ed17cc720925d4d8b3c9f1cb110b1a. --- .../CameraCaptureUITests.vcxproj.filters | 6 +++--- test/Deployment/API/APITests.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters index 9f6c8294c2..2fe119871b 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj.filters @@ -15,15 +15,15 @@ - + Header Files - + Source Files - + Source Files diff --git a/test/Deployment/API/APITests.cpp b/test/Deployment/API/APITests.cpp index 3c9b55cd25..a81b9ded9a 100644 --- a/test/Deployment/API/APITests.cpp +++ b/test/Deployment/API/APITests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation and Contributors. +// Copyright (c) Microsoft Corporation and Contributors. // Licensed under the MIT License. #include "pch.h" From fcb634442ee0e46addb669fb2fb691d0c090660a Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 15:15:48 -0700 Subject: [PATCH 26/45] Revert "Adding current build file directory to files included in test projects" This reverts commit 0f23f7f4afef9fb6873679115dbf5f5a26a17789. --- test/ABForward/ABForward.vcxproj | 2 +- .../AccessControlTests.vcxproj | 4 ++-- test/AppLifecycle/AppLifecycle.vcxproj | 8 ++++---- .../AppNotificationBuilderTests.vcxproj | 4 ++-- .../AppNotificationTests.vcxproj | 16 ++++++++-------- .../CameraCaptureUITests.vcxproj | 4 ++-- test/Deployment/API/DeploymentTests.vcxproj | 8 ++++---- test/LRPTests/LRPTests.vcxproj | 4 ++-- .../PowerNotifications.vcxproj | 6 +++--- .../PushNotificationTests.vcxproj | 12 ++++++------ 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/ABForward/ABForward.vcxproj b/test/ABForward/ABForward.vcxproj index 19a82ef1a9..a8c7dfaa4c 100644 --- a/test/ABForward/ABForward.vcxproj +++ b/test/ABForward/ABForward.vcxproj @@ -220,7 +220,7 @@ Create - + diff --git a/test/AccessControlTests/AccessControlTests.vcxproj b/test/AccessControlTests/AccessControlTests.vcxproj index 231945d273..36aa8bb2ba 100644 --- a/test/AccessControlTests/AccessControlTests.vcxproj +++ b/test/AccessControlTests/AccessControlTests.vcxproj @@ -198,7 +198,7 @@ Create Create - + @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/test/AppLifecycle/AppLifecycle.vcxproj b/test/AppLifecycle/AppLifecycle.vcxproj index 863555c4d1..3e3cb5d208 100644 --- a/test/AppLifecycle/AppLifecycle.vcxproj +++ b/test/AppLifecycle/AppLifecycle.vcxproj @@ -198,12 +198,12 @@ Create - - + + - + @@ -255,4 +255,4 @@ $(RepoTestCertificatePFX) $(RepoTestCertificatePassword) - \ No newline at end of file + diff --git a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj index 99bd16c239..fe18fcbdec 100644 --- a/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj +++ b/test/AppNotificationBuilderTests/AppNotificationBuilderTests.vcxproj @@ -109,7 +109,7 @@ Create - + @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/test/AppNotificationTests/AppNotificationTests.vcxproj b/test/AppNotificationTests/AppNotificationTests.vcxproj index 35c2d81a83..a586593b02 100644 --- a/test/AppNotificationTests/AppNotificationTests.vcxproj +++ b/test/AppNotificationTests/AppNotificationTests.vcxproj @@ -118,17 +118,17 @@ Create - - - + + + - - + + - + @@ -145,7 +145,7 @@ - + $(RepoRoot);%(AdditionalIncludeDirectories) @@ -180,4 +180,4 @@ - \ No newline at end of file + diff --git a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj index a004c7350b..2b19253c4f 100644 --- a/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj +++ b/test/CameraCaptureUITests/CameraCaptureUITests.vcxproj @@ -211,7 +211,7 @@ - + Create Create @@ -270,4 +270,4 @@ - \ No newline at end of file + diff --git a/test/Deployment/API/DeploymentTests.vcxproj b/test/Deployment/API/DeploymentTests.vcxproj index 3793012b33..4eb0e170c7 100644 --- a/test/Deployment/API/DeploymentTests.vcxproj +++ b/test/Deployment/API/DeploymentTests.vcxproj @@ -189,13 +189,13 @@ - + Create - + - + @@ -246,4 +246,4 @@ - \ No newline at end of file + diff --git a/test/LRPTests/LRPTests.vcxproj b/test/LRPTests/LRPTests.vcxproj index 30d3c15595..53b8c0e24d 100644 --- a/test/LRPTests/LRPTests.vcxproj +++ b/test/LRPTests/LRPTests.vcxproj @@ -109,7 +109,7 @@ Create - + @@ -147,4 +147,4 @@ - \ No newline at end of file + diff --git a/test/PowerNotifications/PowerNotifications.vcxproj b/test/PowerNotifications/PowerNotifications.vcxproj index 4d1bf63c3c..4a6083f0a4 100644 --- a/test/PowerNotifications/PowerNotifications.vcxproj +++ b/test/PowerNotifications/PowerNotifications.vcxproj @@ -122,8 +122,8 @@ - - + + Create Create @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/test/PushNotificationTests/PushNotificationTests.vcxproj b/test/PushNotificationTests/PushNotificationTests.vcxproj index ac545ff43a..2745e217a4 100644 --- a/test/PushNotificationTests/PushNotificationTests.vcxproj +++ b/test/PushNotificationTests/PushNotificationTests.vcxproj @@ -109,16 +109,16 @@ Create - - - + + + - - + + - + From 649a900758a1061991bd0ac3b9efb1c89de47b04 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 16:35:27 -0700 Subject: [PATCH 27/45] Regex magic --- tools/GenerateCompilationDatabase.ps1 | 52 +++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index cf894b6fbf..03168106ef 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -15,6 +15,10 @@ $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" write-host "msBuildPath: $msBuildPath" Remove-Item "temp-filtered.log" -ErrorAction SilentlyContinue +Remove-Item "temp-filtered2.log" -ErrorAction SilentlyContinue + +# Target "ClCompile" in file "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets" from project "C:\WindowsAppSDK\dev\Detours\Detours.vcxproj" (target "_ClCompile" depends on it): +# Context here would be: "C:\WindowsAppSDK\dev\Detours" foreach ($binlogFile in $binlogFiles) { if (-Not (Test-Path $binlogFile)) { @@ -24,7 +28,7 @@ foreach ($binlogFile in $binlogFiles) { & $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=temp.log - Select-String -Path "temp.log" -Pattern "Cl.exe" | + Select-String -Path "temp.log" -Pattern "Target ""ClCompile"" in file","Cl.exe" | ForEach-Object { $_.Line } | Where-Object { $_ -notmatch "Tracker.exe" } | Out-File -FilePath "temp-filtered.log" -Append -Encoding utf8 @@ -34,6 +38,47 @@ foreach ($binlogFile in $binlogFiles) { Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" +$contextPath = "" + +# for each line in temp-filtered.log, if it is a "Target " line, extract the project directory and save in the contextPath variable +# if it is a "Cl.exe" line, prepend the contextPath to every source file in that line only if it is +# a relative path, then output the modified line to temp-filtered-2.log +# The source files are the arguments that ends with .cpp, .c, or .h +# They can have spaces in them. If so, they are enclosed in quotes. + +$lines = Get-Content "temp-filtered.log" + +foreach ($line in $lines) { + if ($line -match 'Target "ClCompile" in file "([^"]+)" from project "([^"]+)"') { + $contextPath = Split-Path $matches[2] -parent + Write-Host "Context path set to: $contextPath" + } elseif ($line -match 'Cl\.exe (.+)$') { + $clLine = $matches[1] + $args = $clLine -split ' (?=(?:[^"]*"[^"]*")*[^"]*$)' + + $modifiedArgs = @() + foreach ($arg in $args) { + if ($arg -match '^(.*\.(cpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') { + $filePath = $arg.Trim('"') + if (-Not ([System.IO.Path]::IsPathRooted($filePath))) { + $filePath = Join-Path $contextPath $filePath + } + if ($arg.StartsWith('"') -and $arg.EndsWith('"')) { + $modifiedArgs += '"' + $filePath + '"' + } else { + $modifiedArgs += $filePath + } + } else { + $modifiedArgs += $arg + } + } + + $modifiedLine = "Cl.exe " + ($modifiedArgs -join ' ') + Add-Content -Path "temp-filtered2.log" -Value $modifiedLine + # Write-Host "Processed Cl.exe line: $modifiedLine" + } +} + $ms2ccPath = Join-Path $PSScriptRoot "ms2cc" $ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" @@ -71,6 +116,7 @@ if (-Not (Test-Path $ms2ccExe)) { Write-Host "ms2cc already exists at: $ms2ccExe" } -& $ms2ccExe -i "temp-filtered.log" -d (Split-Path $PSScriptRoot -parent) -p +& $ms2ccExe -i "temp-filtered2.log" -d (Split-Path $PSScriptRoot -parent) -p -Remove-Item "temp-filtered.log" +# Remove-Item "temp-filtered.log" +# Remove-Item "temp-filtered2.log" From 28c7dd29168e5e4da0d1c9662e0870d8c44d228e Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Wed, 1 Oct 2025 16:46:37 -0700 Subject: [PATCH 28/45] Small changes on build all ps1 --- BuildAll.ps1 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/BuildAll.ps1 b/BuildAll.ps1 index 1bda4fc925..5d166fd1d5 100644 --- a/BuildAll.ps1 +++ b/BuildAll.ps1 @@ -26,7 +26,8 @@ Param( [string]$OutputDirectory = (Split-Path $MyInvocation.MyCommand.Path) + "\BuildOutput", [string]$PGOBuildMode = "Optimize", [string]$UpdateVersionDetailsPath = $null, - [switch]$Clean = $false + [switch]$Clean = $false, + [switch]$CleanIntermmediateFiles = $false ) Set-StrictMode -Version 3.0 @@ -165,7 +166,13 @@ Try { # PreFastSetup intentionally skips the call to MSBuild.exe below. if (($AzureBuildStep -eq "all") -Or ($AzureBuildStep -eq "BuildFoundation")) { - $cleanIntermediateFiles = if ($WindowsAppSDKBuildPipeline -eq 1) { "/p:WindowsAppSDKCleanIntermediateFiles=true" } else { "" } + if ($WindowsAppSDKBuildPipeline -eq 1) + { + $CleanIntermediateFiles = $true + } + + $cleanIntermediateFilesArg = if ($CleanIntermediateFiles) { "/p:WindowsAppSDKCleanIntermediateFiles=true" } else { "" } + foreach($configurationToRun in $configuration.Split(",")) { foreach($platformToRun in $platform.Split(",")) @@ -179,7 +186,7 @@ Try { /binaryLogger:"BuildOutput/binlogs/WindowsAppRuntime.$platformToRun.$configurationToRun.binlog" ` $WindowsAppSDKVersionProperty ` /p:PGOBuildMode=$PGOBuildMode ` - $cleanIntermediateFiles ` + $cleanIntermediateFilesArg ` /p:AppxSymbolPackageEnabled=false ` /p:WindowsAppSDKBuildPipeline=$WindowsAppSDKBuildPipeline if ($lastexitcode -ne 0) From 472d62df4ce828e80c3adfb7a39018ffad32d93d Mon Sep 17 00:00:00 2001 From: Felipe G Date: Thu, 2 Oct 2025 17:39:25 -0700 Subject: [PATCH 29/45] adding suggestion Co-authored-by: Scott Jones --- BuildAll.ps1 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/BuildAll.ps1 b/BuildAll.ps1 index 5d166fd1d5..d17f808af8 100644 --- a/BuildAll.ps1 +++ b/BuildAll.ps1 @@ -166,13 +166,10 @@ Try { # PreFastSetup intentionally skips the call to MSBuild.exe below. if (($AzureBuildStep -eq "all") -Or ($AzureBuildStep -eq "BuildFoundation")) { - if ($WindowsAppSDKBuildPipeline -eq 1) + if ($CleanIntermediateFiles -eq $true) { - $CleanIntermediateFiles = $true + $cleanIntermediateFilesArg = "/p:WindowsAppSDKCleanIntermediateFiles=true" } - - $cleanIntermediateFilesArg = if ($CleanIntermediateFiles) { "/p:WindowsAppSDKCleanIntermediateFiles=true" } else { "" } - foreach($configurationToRun in $configuration.Split(",")) { foreach($platformToRun in $platform.Split(",")) From 53ea4402162771f3f628d2676e0adcc7999467c4 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Thu, 2 Oct 2025 17:54:56 -0700 Subject: [PATCH 30/45] Adding CleanIntermediateFiles argument to BuildAll.ps1 script --- BuildAll.ps1 | 2 +- ...indowsAppSDK-BuildFoundation-AnyCPU-Steps.yml | 2 +- .../WindowsAppSDK-BuildFoundation-Steps.yml | 8 ++++---- .../WindowsAppSDK-BuildMRT-Steps.yml | 2 +- .../WindowsAppSDK-PackTransportPackage-Stage.yml | 16 ++++++++-------- build/ProjectReunion-CI.yml | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BuildAll.ps1 b/BuildAll.ps1 index d17f808af8..5e1f805bc4 100644 --- a/BuildAll.ps1 +++ b/BuildAll.ps1 @@ -27,7 +27,7 @@ Param( [string]$PGOBuildMode = "Optimize", [string]$UpdateVersionDetailsPath = $null, [switch]$Clean = $false, - [switch]$CleanIntermmediateFiles = $false + [switch]$CleanIntermediateFiles = $false ) Set-StrictMode -Version 3.0 diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml index d9661bd2f2..88e0b5b12f 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-AnyCPU-Steps.yml @@ -28,7 +28,7 @@ steps: name: BuildFoundation inputs: filePath: 'BuildAll.ps1' - arguments: -AzureBuildStep "BuildAnyCPU" + arguments: -AzureBuildStep "BuildAnyCPU" -CleanIntermediateFiles - ${{ if eq(parameters.runPREfast, 'true') }}: - task: SDLNativeRules@3 diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml index f2b67a519a..04cd4bc2ac 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml @@ -72,7 +72,7 @@ steps: name: BuildFoundation inputs: filePath: 'BuildAll.ps1' - arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildFoundation" + arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildFoundation" -CleanIntermediateFiles - ${{ if eq(parameters.runPREfast, 'true') }}: - task: SDLNativeRules@3 @@ -111,10 +111,10 @@ steps: !**\*packages*\** !**\*Demoapp*\** !**\*Demopackage\** - !**\HelloWorldAdvancedC*\** + !**\HelloWorldAdvancedC*\** !**\DecimalCalculator_C*\** - !**\arm\** - !**\arm64\** + !**\arm\** + !**\arm64\** !**\te.*exe !**\te.*dll !**\wex.*exe diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml index ba14353e34..5f70a77b41 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml @@ -33,7 +33,7 @@ steps: retryCountOnTaskFailure: 10 inputs: filePath: 'BuildAll.ps1' - arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildMRT" + arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildMRT" -CleanIntermediateFiles - ${{ if eq(parameters.runPREfast, 'true') }}: - task: SDLNativeRules@3 diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml index 164e6f52d9..a8ae477e90 100644 --- a/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml +++ b/build/AzurePipelinesTemplates/WindowsAppSDK-PackTransportPackage-Stage.yml @@ -17,7 +17,7 @@ parameters: stages: - stage: Pack - dependsOn: + dependsOn: - Build_AnyCPU - Build_x86 - Build_x64 @@ -38,7 +38,7 @@ stages: variables: ob_outputDirectory: '$(REPOROOT)\out' ob_artifactBaseName: "TransportPackage" - ob_sdl_prefast_enabled: false # We currently do not build native code in this job. + ob_sdl_prefast_enabled: false # We currently do not build native code in this job. steps: - ${{ if not( parameters.IsOneBranch ) }}: - checkout: self @@ -128,7 +128,7 @@ stages: name: StageFiles inputs: filePath: 'BuildAll.ps1' - arguments: -Platform "x86,x64,arm64" -Configuration "release" -AzureBuildStep "StageFiles" + arguments: -Platform "x86,x64,arm64" -Configuration "release" -AzureBuildStep "StageFiles" -CleanIntermediateFiles - task: CopyFiles@2 displayName: 'Copy symbols to artifact staging directory' @@ -187,13 +187,13 @@ stages: $buildType = '$(channel)' $majorMinorPatchRev = '$(MajorVersion).$(MinorVersion).$(versionMinDate)' $majorMinorPatchRev = $majorMinorPatchRev + $paddedRevision - + if ($env:ComponentType) { Write-Host "componentType " $env:ComponentType $majorMinorPatchRev = $majorMinorPatchRev + $env:ComponentType } - + $version = $majorMinorPatchRev + '-' + $buildType # If using release versioning, drop the version suffix, which includes a tag & build stamp. @@ -233,7 +233,7 @@ stages: name: PackNuget inputs: filePath: 'BuildAll.ps1' - arguments: -Platform "x64" -Configuration "release" -AzureBuildStep "PackNuget" -OutputDirectory "$(build.artifactStagingDirectory)\FullNuget" -PackageVersion "$(packageVersion)" -ComponentPackageVersion "$(componentPackageVersion)" + arguments: -Platform "x64" -Configuration "release" -AzureBuildStep "PackNuget" -OutputDirectory "$(build.artifactStagingDirectory)\FullNuget" -PackageVersion "$(packageVersion)" -ComponentPackageVersion "$(componentPackageVersion)" -CleanIntermediateFiles # Disable building MockWindowsAppSDK until we can consider the public vs private scenario # - ${{ if eq(parameters.BuildMockWindowsAppSDK, 'true') }}: @@ -241,7 +241,7 @@ stages: # name: BuildMock # inputs: # filePath: 'BuildAll.ps1' - # arguments: -Platform "x64" -Configuration "release" -AzureBuildStep "BuildMock" -OutputDirectory "$(build.artifactStagingDirectory)\FullNuget" -PackageVersion "$(packageVersion)" + # arguments: -Platform "x64" -Configuration "release" -AzureBuildStep "BuildMock" -OutputDirectory "$(build.artifactStagingDirectory)\FullNuget" -PackageVersion "$(packageVersion)" -CleanIntermediateFiles - ${{ if eq(parameters.SignOutput, 'true') }}: - template: AzurePipelinesTemplates/WindowsAppSDK-EsrpCodeSigning-Steps.yml@WindowsAppSDKConfig @@ -279,4 +279,4 @@ stages: verbosityPush: 'Detailed' nuGetFeedType: 'internal' #Note: The project qualifier is always required when using a feed name. Also, do not use organization scoped feeds. - publishVstsFeed: 'ProjectReunion/Project.Reunion.nuget.internal' \ No newline at end of file + publishVstsFeed: 'ProjectReunion/Project.Reunion.nuget.internal' diff --git a/build/ProjectReunion-CI.yml b/build/ProjectReunion-CI.yml index 252ef66063..788ae86497 100644 --- a/build/ProjectReunion-CI.yml +++ b/build/ProjectReunion-CI.yml @@ -102,7 +102,7 @@ jobs: name: BuildBinaries inputs: filePath: 'BuildAll.ps1' - arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildBinaries" + arguments: -Platform "$(buildPlatform)" -Configuration "$(buildConfiguration)" -AzureBuildStep "BuildBinaries" -CleanIntermediateFiles - task: CopyFiles@2 displayName: MoveToOutputDirectory @@ -128,7 +128,7 @@ jobs: name: BuildBinaries inputs: filePath: 'BuildAll.ps1' - arguments: -AzureBuildStep "BuildAnyCPU" + arguments: -AzureBuildStep "BuildAnyCPU" -CleanIntermediateFiles - task: PublishBuildArtifacts@1 displayName: 'Publish artifact: Full Nuget' @@ -189,7 +189,7 @@ jobs: - checkout: self path: s - checkout: WindowsAppSDKConfig - + - template: AzurePipelinesTemplates\WindowsAppSDK-RunTests-Steps.yml parameters: buildPlatform: $(buildPlatform) From f63dbf3dc11286088bd6bdb221994b1e39f53466 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Thu, 2 Oct 2025 20:42:50 -0700 Subject: [PATCH 31/45] Improving binlog file discovering --- tools/GenerateCompilationDatabase.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 03168106ef..1b79bc35b2 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -2,11 +2,13 @@ Param( [string]$Ms2ccVersion = "1.3.0" ) -$binlogFileBase = Split-Path $PSScriptRoot -parent -$binlogFile0 = Join-Path $binlogFileBase "BuildOutput\Binlogs\MrtCore.x64.Release.binlog" -$binlogFile1 = Join-Path $binlogFileBase "BuildOutput\Binlogs\WindowsAppRuntime.x64.Release.binlog" +$binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binlogs" -$binlogFiles = @($binlogFile0, $binlogFile1) +$binlogFiles = Get-ChildItem -Path $binlogFileBase -Filter *.binlog -Recurse | Select-Object -ExpandProperty FullName + +Write-Host "Found binlog files:" +$binlogFiles | ForEach-Object { Write-Host $_ } +exit 0 $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath write-host "VCToolsInstallDir: $VCToolsInstallDir" From 37f8e52aa74cfb7457143311f902ed623b84ea6e Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Thu, 2 Oct 2025 21:08:22 -0700 Subject: [PATCH 32/45] Removing temporary files --- tools/GenerateCompilationDatabase.ps1 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 1b79bc35b2..836b7ad4b0 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -6,10 +6,6 @@ $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binl $binlogFiles = Get-ChildItem -Path $binlogFileBase -Filter *.binlog -Recurse | Select-Object -ExpandProperty FullName -Write-Host "Found binlog files:" -$binlogFiles | ForEach-Object { Write-Host $_ } -exit 0 - $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath write-host "VCToolsInstallDir: $VCToolsInstallDir" @@ -120,5 +116,5 @@ if (-Not (Test-Path $ms2ccExe)) { & $ms2ccExe -i "temp-filtered2.log" -d (Split-Path $PSScriptRoot -parent) -p -# Remove-Item "temp-filtered.log" -# Remove-Item "temp-filtered2.log" +Remove-Item "temp-filtered.log" +Remove-Item "temp-filtered2.log" From f2cb8e3688bb6956904006fd7e906cd31fa27f74 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Thu, 2 Oct 2025 21:13:39 -0700 Subject: [PATCH 33/45] Adding more logging --- tools/GenerateCompilationDatabase.ps1 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 836b7ad4b0..dd40b7ad05 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -3,9 +3,11 @@ Param( ) $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binlogs" - $binlogFiles = Get-ChildItem -Path $binlogFileBase -Filter *.binlog -Recurse | Select-Object -ExpandProperty FullName +Write-Host "Binlog files found:" +$binlogFiles | ForEach-Object { Write-Host $_ } + $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath write-host "VCToolsInstallDir: $VCToolsInstallDir" @@ -32,6 +34,8 @@ foreach ($binlogFile in $binlogFiles) { Out-File -FilePath "temp-filtered.log" -Append -Encoding utf8 Remove-Item "temp.log" + + Write-Host "Processed binlog file: $binlogFile" } Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" @@ -46,6 +50,8 @@ $contextPath = "" $lines = Get-Content "temp-filtered.log" +Write-Host "Processing filtered log to adjust file paths..." + foreach ($line in $lines) { if ($line -match 'Target "ClCompile" in file "([^"]+)" from project "([^"]+)"') { $contextPath = Split-Path $matches[2] -parent @@ -73,10 +79,11 @@ foreach ($line in $lines) { $modifiedLine = "Cl.exe " + ($modifiedArgs -join ' ') Add-Content -Path "temp-filtered2.log" -Value $modifiedLine - # Write-Host "Processed Cl.exe line: $modifiedLine" } } +Write-Host "Adjusted file paths and generated: $(Get-Location)\temp-filtered2.log" + $ms2ccPath = Join-Path $PSScriptRoot "ms2cc" $ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" @@ -118,3 +125,6 @@ if (-Not (Test-Path $ms2ccExe)) { Remove-Item "temp-filtered.log" Remove-Item "temp-filtered2.log" + +Write-Host "Temporary files cleaned up." +Write-Host "Compilation database generated at: $(Split-Path $PSScriptRoot -parent)\compile_commands.json" From 6da3435ddaf2555a74254c89ac15066c0e0524c1 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Sat, 4 Oct 2025 15:27:50 -0700 Subject: [PATCH 34/45] Fixing delete intermediate files --- BuildAll.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/BuildAll.ps1 b/BuildAll.ps1 index 5e1f805bc4..5f2b5d5784 100644 --- a/BuildAll.ps1 +++ b/BuildAll.ps1 @@ -166,6 +166,7 @@ Try { # PreFastSetup intentionally skips the call to MSBuild.exe below. if (($AzureBuildStep -eq "all") -Or ($AzureBuildStep -eq "BuildFoundation")) { + $cleanIntermediateFilesArg = "" if ($CleanIntermediateFiles -eq $true) { $cleanIntermediateFilesArg = "/p:WindowsAppSDKCleanIntermediateFiles=true" From 119b7428ae18ec672dce3ae4047644913fad72f7 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Sat, 4 Oct 2025 15:28:03 -0700 Subject: [PATCH 35/45] Adding update functionality to script --- tools/GenerateCompilationDatabase.ps1 | 40 +++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index dd40b7ad05..798bf014e5 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -1,5 +1,7 @@ Param( - [string]$Ms2ccVersion = "1.3.0" + [string]$Ms2ccVersion = "1.3.0", + [switch]$Update + ) $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binlogs" @@ -121,10 +123,44 @@ if (-Not (Test-Path $ms2ccExe)) { Write-Host "ms2cc already exists at: $ms2ccExe" } +$backupPath = $null + +# If the -Update flag is provided, we want to update an existing compile_commands.json +# instead of overwriting it. +if ($Update) { + # Save the old compile_commands.json if it exists in a new file + $compileCommandsPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json" + if (Test-Path $compileCommandsPath) { + $backupPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands_old.json" + Copy-Item -Path $compileCommandsPath -Destination $backupPath + Write-Host "Backed up existing compile_commands.json to: $backupPath" + } else { + Write-Host "No existing compile_commands.json found to back up." + } +} + & $ms2ccExe -i "temp-filtered2.log" -d (Split-Path $PSScriptRoot -parent) -p Remove-Item "temp-filtered.log" Remove-Item "temp-filtered2.log" - Write-Host "Temporary files cleaned up." + +if ($Update -and (Test-Path $backupPath)) { + # Merge the old and new compile_commands.json files + $newCommands = Get-Content -Raw -Path (Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json") | ConvertFrom-Json + $oldCommands = Get-Content -Raw -Path $backupPath | ConvertFrom-Json + + # What defines the uniqueness of a command is the combination of "file" and "directory" + # We want to merge the old and new commands, preferring the new ones in case of duplicates + $mergedCommands = @{} + foreach ($cmd in $oldCommands + $newCommands) { + $key = "$($cmd.file)|$($cmd.directory)" + $mergedCommands[$key] = $cmd + } + $mergedCommands.Values | ConvertTo-Json -Depth 10 | Set-Content -Path (Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json") -Encoding utf8 + Write-Host "Merged old and new compile_commands.json files." + + Remove-Item $backupPath -Force +} + Write-Host "Compilation database generated at: $(Split-Path $PSScriptRoot -parent)\compile_commands.json" From 331fa32b7122e495308a40e1e60fcabf5051d80f Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 12:03:28 -0700 Subject: [PATCH 36/45] Adding documentation --- tools/GenerateCompilationDatabase.ps1 | 36 ++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 798bf014e5..15707917f1 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -1,7 +1,41 @@ +# Copyright (c) Microsoft Corporation and Contributors. +# Licensed under the MIT License. + +<# +.SYNOPSIS + Generates a compilation database (compile_commands.json) from MSBuild binlog files. + +.DESCRIPTION + This script processes MSBuild binary log files (.binlog) to extract compilation commands + and generates a compilation database in JSON format (compile_commands.json). It uses the + ms2cc tool to convert the filtered log into the desired format. + +.PARAMETER Ms2ccVersion + Specifies the version of ms2cc to download and use. Default is "1.3.0". + +.PARAMETER DownloadMs2cc + If set, it allows the script to download the specified version of ms2cc if it is not found + in the expected location. + +.PARAMETER Ms2ccPath + Specifies a custom path to the ms2cc executable. If not provided, the script will download + ms2cc to a default location. + +.PARAMETER Update + If set, the script will update an existing compile_commands.json file by merging new entries + with existing ones instead of overwriting it. + +.EXAMPLE + .\GenerateCompilationDatabase.ps1 -Ms2ccVersion "1.3.0" -DownloadMs2cc -Update + + Generates or updates the compilation database using ms2cc version 1.3.0, downloading it if necessary. +#> + Param( [string]$Ms2ccVersion = "1.3.0", + [switch]$DownloadMs2cc, + [string]$Ms2ccPath, [switch]$Update - ) $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binlogs" From 04a0b164154ac2be95b971ee5d5958a3b03d5d03 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 13:45:42 -0700 Subject: [PATCH 37/45] Fixing casing and identation --- tools/GenerateCompilationDatabase.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 15707917f1..52b55f9d41 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -42,13 +42,13 @@ $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binl $binlogFiles = Get-ChildItem -Path $binlogFileBase -Filter *.binlog -Recurse | Select-Object -ExpandProperty FullName Write-Host "Binlog files found:" -$binlogFiles | ForEach-Object { Write-Host $_ } +$binlogFiles | ForEach-Object { Write-Host " $_" } $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath -write-host "VCToolsInstallDir: $VCToolsInstallDir" +Write-Host "VCToolsInstallDir: $VCToolsInstallDir" $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" -write-host "msBuildPath: $msBuildPath" +Write-Host "msBuildPath: $msBuildPath" Remove-Item "temp-filtered.log" -ErrorAction SilentlyContinue Remove-Item "temp-filtered2.log" -ErrorAction SilentlyContinue From 1a2ab6a217240943766d1691e93c635493be1f34 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 13:53:12 -0700 Subject: [PATCH 38/45] Fixing open braces --- tools/GenerateCompilationDatabase.ps1 | 83 ++++++++++++++++++--------- 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 52b55f9d41..7fb58239db 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -53,11 +53,10 @@ Write-Host "msBuildPath: $msBuildPath" Remove-Item "temp-filtered.log" -ErrorAction SilentlyContinue Remove-Item "temp-filtered2.log" -ErrorAction SilentlyContinue -# Target "ClCompile" in file "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets" from project "C:\WindowsAppSDK\dev\Detours\Detours.vcxproj" (target "_ClCompile" depends on it): -# Context here would be: "C:\WindowsAppSDK\dev\Detours" - -foreach ($binlogFile in $binlogFiles) { - if (-Not (Test-Path $binlogFile)) { +foreach ($binlogFile in $binlogFiles) +{ + if (-Not (Test-Path $binlogFile)) + { Write-Error "Binlog file not found: $binlogFile" exit 1 } @@ -78,9 +77,12 @@ Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" $contextPath = "" -# for each line in temp-filtered.log, if it is a "Target " line, extract the project directory and save in the contextPath variable +# For each line in temp-filtered.log, if it is a "Target " line, extract the project directory and save in the contextPath variable # if it is a "Cl.exe" line, prepend the contextPath to every source file in that line only if it is # a relative path, then output the modified line to temp-filtered-2.log +# For example, in the line: +# Target "ClCompile" in file "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\Microsoft.CppCommon.targets" from project "C:\WindowsAppSDK\dev\Detours\Detours.vcxproj" (target "_ClCompile" depends on it): +# Context here would be: "C:\WindowsAppSDK\dev\Detours" # The source files are the arguments that ends with .cpp, .c, or .h # They can have spaces in them. If so, they are enclosed in quotes. @@ -88,27 +90,39 @@ $lines = Get-Content "temp-filtered.log" Write-Host "Processing filtered log to adjust file paths..." -foreach ($line in $lines) { - if ($line -match 'Target "ClCompile" in file "([^"]+)" from project "([^"]+)"') { +foreach ($line in $lines) +{ + if ($line -match 'Target "ClCompile" in file "([^"]+)" from project "([^"]+)"') + { $contextPath = Split-Path $matches[2] -parent Write-Host "Context path set to: $contextPath" - } elseif ($line -match 'Cl\.exe (.+)$') { + } + elseif ($line -match 'Cl\.exe (.+)$') + { $clLine = $matches[1] $args = $clLine -split ' (?=(?:[^"]*"[^"]*")*[^"]*$)' $modifiedArgs = @() - foreach ($arg in $args) { - if ($arg -match '^(.*\.(cpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') { + foreach ($arg in $args) + { + if ($arg -match '^(.*\.(cpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') + { $filePath = $arg.Trim('"') - if (-Not ([System.IO.Path]::IsPathRooted($filePath))) { + if (-Not ([System.IO.Path]::IsPathRooted($filePath))) + { $filePath = Join-Path $contextPath $filePath } - if ($arg.StartsWith('"') -and $arg.EndsWith('"')) { + if ($arg.StartsWith('"') -and $arg.EndsWith('"')) + { $modifiedArgs += '"' + $filePath + '"' - } else { + } + else + { $modifiedArgs += $filePath } - } else { + } + else + { $modifiedArgs += $arg } } @@ -123,16 +137,19 @@ Write-Host "Adjusted file paths and generated: $(Get-Location)\temp-filtered2.lo $ms2ccPath = Join-Path $PSScriptRoot "ms2cc" $ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" -if (-Not (Test-Path $ms2ccExe)) { +if (-Not (Test-Path $ms2ccExe)) +{ Write-Host "Downloading ms2cc..." $ms2ccUrl = "https://github.com/freddiehaddad/ms2cc/releases/download/v$Ms2ccVersion/ms2cc-$Ms2ccVersion.zip" $zipPath = Join-Path $PSScriptRoot "ms2cc-$Ms2ccVersion.zip" - try { + try + { Invoke-WebRequest -Uri $ms2ccUrl -OutFile $zipPath -UseBasicParsing Write-Host "Downloaded ms2cc to: $zipPath" - if (-Not (Test-Path $ms2ccPath)) { + if (-Not (Test-Path $ms2ccPath)) + { New-Item -ItemType Directory -Path $ms2ccPath -Force | Out-Null } @@ -142,18 +159,24 @@ if (-Not (Test-Path $ms2ccExe)) { Remove-Item $zipPath -Force Write-Host "Cleaned up zip file" - if (Test-Path $ms2ccExe) { + if (Test-Path $ms2ccExe) + { Write-Host "ms2cc successfully downloaded and extracted" - } else { + } + else + { Write-Error "Failed to extract ms2cc.exe" exit 1 } } - catch { + catch + { Write-Error "Failed to download or extract ms2cc: $_" exit 1 } -} else { +} +else +{ Write-Host "ms2cc already exists at: $ms2ccExe" } @@ -161,14 +184,18 @@ $backupPath = $null # If the -Update flag is provided, we want to update an existing compile_commands.json # instead of overwriting it. -if ($Update) { +if ($Update) +{ # Save the old compile_commands.json if it exists in a new file $compileCommandsPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json" - if (Test-Path $compileCommandsPath) { + if (Test-Path $compileCommandsPath) + { $backupPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands_old.json" Copy-Item -Path $compileCommandsPath -Destination $backupPath Write-Host "Backed up existing compile_commands.json to: $backupPath" - } else { + } + else + { Write-Host "No existing compile_commands.json found to back up." } } @@ -179,7 +206,8 @@ Remove-Item "temp-filtered.log" Remove-Item "temp-filtered2.log" Write-Host "Temporary files cleaned up." -if ($Update -and (Test-Path $backupPath)) { +if ($Update -and (Test-Path $backupPath)) +{ # Merge the old and new compile_commands.json files $newCommands = Get-Content -Raw -Path (Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json") | ConvertFrom-Json $oldCommands = Get-Content -Raw -Path $backupPath | ConvertFrom-Json @@ -187,7 +215,8 @@ if ($Update -and (Test-Path $backupPath)) { # What defines the uniqueness of a command is the combination of "file" and "directory" # We want to merge the old and new commands, preferring the new ones in case of duplicates $mergedCommands = @{} - foreach ($cmd in $oldCommands + $newCommands) { + foreach ($cmd in $oldCommands + $newCommands) + { $key = "$($cmd.file)|$($cmd.directory)" $mergedCommands[$key] = $cmd } From 695a614e4ec89c90bcbd475b16dd7259d4f65e04 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 15:12:33 -0700 Subject: [PATCH 39/45] Adding .hpp --- tools/GenerateCompilationDatabase.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 7fb58239db..995bce4882 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -100,12 +100,12 @@ foreach ($line in $lines) elseif ($line -match 'Cl\.exe (.+)$') { $clLine = $matches[1] - $args = $clLine -split ' (?=(?:[^"]*"[^"]*")*[^"]*$)' + $clArgs = $clLine -split ' (?=(?:[^"]*"[^"]*")*[^"]*$)' $modifiedArgs = @() - foreach ($arg in $args) + foreach ($arg in $clArgs) { - if ($arg -match '^(.*\.(cpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') + if ($arg -match '^(.*\.(cpp|hpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') { $filePath = $arg.Trim('"') if (-Not ([System.IO.Path]::IsPathRooted($filePath))) From 728d2ddb975df89754d473584cedcd9df5c71e45 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 16:03:42 -0700 Subject: [PATCH 40/45] Adding opt in to download ms2cc or using existing path --- tools/GenerateCompilationDatabase.ps1 | 93 ++++++++++++++++++--------- 1 file changed, 61 insertions(+), 32 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 995bce4882..04c3975182 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -32,12 +32,18 @@ #> Param( - [string]$Ms2ccVersion = "1.3.0", [switch]$DownloadMs2cc, - [string]$Ms2ccPath, + [string]$Ms2ccExePath, + [string]$Ms2ccUrl = "https://github.com/freddiehaddad/ms2cc/releases/download/v1.3.0/ms2cc-1.3.0.zip", [switch]$Update ) +if (-Not $Ms2ccExePath -and -Not $DownloadMs2cc) +{ + Write-Error "ms2cc.exe not found at $ms2ccExe. Please provide a valid path using -Ms2ccExePath or allow downloading with -DownloadMs2cc." + exit 1 +} + $binlogFileBase = Join-Path (Split-Path $PSScriptRoot -parent) "BuildOutput\Binlogs" $binlogFiles = Get-ChildItem -Path $binlogFileBase -Filter *.binlog -Recurse | Select-Object -ExpandProperty FullName @@ -50,8 +56,29 @@ Write-Host "VCToolsInstallDir: $VCToolsInstallDir" $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" Write-Host "msBuildPath: $msBuildPath" -Remove-Item "temp-filtered.log" -ErrorAction SilentlyContinue -Remove-Item "temp-filtered2.log" -ErrorAction SilentlyContinue +$temp = Join-Path (Split-Path $PSScriptRoot -parent) "temp" + +Write-Host "Using temporary path: $temp" + +if (-not (Test-Path -Path $temp -PathType Container)) +{ + Write-Host "Creating temporary directory: $temp" + New-Item -ItemType Directory -Path $temp +} + +if (Test-Path "$temp\temp-filtered.log") +{ + Write-Host "Removing existing filtered log: $temp\temp-filtered.log" + Remove-Item "$temp\temp-filtered.log" -Force +} + +if (Test-Path "$temp\temp-filtered2.log") +{ + Write-Host "Removing existing filtered log: $temp\temp-filtered2.log" + Remove-Item "$temp\temp-filtered2.log" -Force +} + +$tempFilteredLog = Join-Path $temp "temp-filtered.log" foreach ($binlogFile in $binlogFiles) { @@ -61,19 +88,21 @@ foreach ($binlogFile in $binlogFiles) exit 1 } - & $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=temp.log + $tempLog = Join-Path $temp "temp.log" - Select-String -Path "temp.log" -Pattern "Target ""ClCompile"" in file","Cl.exe" | + & $msBuildPath $binlogFile /v:normal /noconlog /flp:logfile=$tempLog + + Select-String -Path $tempLog -Pattern "Target ""ClCompile"" in file","Cl.exe" | ForEach-Object { $_.Line } | Where-Object { $_ -notmatch "Tracker.exe" } | - Out-File -FilePath "temp-filtered.log" -Append -Encoding utf8 + Out-File -FilePath $tempFilteredLog -Append -Encoding utf8 - Remove-Item "temp.log" + Remove-Item $tempLog -Force Write-Host "Processed binlog file: $binlogFile" } -Write-Host "Filtered log file generated at: $(Get-Location)\temp-filtered.log" +Write-Host "Filtered log file generated at: $tempFilteredLog" $contextPath = "" @@ -86,7 +115,8 @@ $contextPath = "" # The source files are the arguments that ends with .cpp, .c, or .h # They can have spaces in them. If so, they are enclosed in quotes. -$lines = Get-Content "temp-filtered.log" +$tempFiltered2Log = Join-Path $temp "temp-filtered2.log" +$lines = Get-Content $tempFilteredLog Write-Host "Processing filtered log to adjust file paths..." @@ -128,24 +158,31 @@ foreach ($line in $lines) } $modifiedLine = "Cl.exe " + ($modifiedArgs -join ' ') - Add-Content -Path "temp-filtered2.log" -Value $modifiedLine + Add-Content -Path $tempFiltered2Log -Value $modifiedLine } } -Write-Host "Adjusted file paths and generated: $(Get-Location)\temp-filtered2.log" - -$ms2ccPath = Join-Path $PSScriptRoot "ms2cc" -$ms2ccExe = Join-Path $ms2ccPath "ms2cc.exe" +Write-Host "Adjusted file paths and generated: $tempFiltered2Log" -if (-Not (Test-Path $ms2ccExe)) +if ($Ms2ccExePath) +{ + if (-Not (Test-Path $Ms2ccExePath)) + { + Write-Error "Provided ms2cc.exe path does not exist: $Ms2ccExePath" + exit 1 + } + Write-Host "Using provided ms2cc.exe path: $ms2ccExe" +} +elseif ($DownloadMs2cc) { Write-Host "Downloading ms2cc..." - $ms2ccUrl = "https://github.com/freddiehaddad/ms2cc/releases/download/v$Ms2ccVersion/ms2cc-$Ms2ccVersion.zip" - $zipPath = Join-Path $PSScriptRoot "ms2cc-$Ms2ccVersion.zip" + $zipPath = Join-Path $temp "ms2cc.zip" + $ms2ccPath = Join-Path $temp "ms2cc" + $Ms2ccExePath = Join-Path $ms2ccPath "ms2cc.exe" try { - Invoke-WebRequest -Uri $ms2ccUrl -OutFile $zipPath -UseBasicParsing + Invoke-WebRequest -Uri $Ms2ccUrl -OutFile $zipPath -UseBasicParsing Write-Host "Downloaded ms2cc to: $zipPath" if (-Not (Test-Path $ms2ccPath)) @@ -159,7 +196,7 @@ if (-Not (Test-Path $ms2ccExe)) Remove-Item $zipPath -Force Write-Host "Cleaned up zip file" - if (Test-Path $ms2ccExe) + if (Test-Path $ms2ccExePath) { Write-Host "ms2cc successfully downloaded and extracted" } @@ -175,10 +212,6 @@ if (-Not (Test-Path $ms2ccExe)) exit 1 } } -else -{ - Write-Host "ms2cc already exists at: $ms2ccExe" -} $backupPath = $null @@ -190,7 +223,7 @@ if ($Update) $compileCommandsPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json" if (Test-Path $compileCommandsPath) { - $backupPath = Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands_old.json" + $backupPath = Join-Path $temp "compile_commands_old.json" Copy-Item -Path $compileCommandsPath -Destination $backupPath Write-Host "Backed up existing compile_commands.json to: $backupPath" } @@ -200,11 +233,7 @@ if ($Update) } } -& $ms2ccExe -i "temp-filtered2.log" -d (Split-Path $PSScriptRoot -parent) -p - -Remove-Item "temp-filtered.log" -Remove-Item "temp-filtered2.log" -Write-Host "Temporary files cleaned up." +& $Ms2ccExePath -i $tempFiltered2Log -d (Split-Path $PSScriptRoot -parent) -p if ($Update -and (Test-Path $backupPath)) { @@ -222,8 +251,8 @@ if ($Update -and (Test-Path $backupPath)) } $mergedCommands.Values | ConvertTo-Json -Depth 10 | Set-Content -Path (Join-Path (Split-Path $PSScriptRoot -parent) "compile_commands.json") -Encoding utf8 Write-Host "Merged old and new compile_commands.json files." - - Remove-Item $backupPath -Force } +Remove-Item $temp -Recurse -Force +Write-Host "Temporary files cleaned up." Write-Host "Compilation database generated at: $(Split-Path $PSScriptRoot -parent)\compile_commands.json" From d465a4e551be79e2ffb6c1bf85cf6a71ec7fa263 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 16:04:31 -0700 Subject: [PATCH 41/45] Removing ms2cc from gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index f5fa2d99bd..21fd8be47a 100644 --- a/.gitignore +++ b/.gitignore @@ -398,6 +398,3 @@ Microsoft.WinUI.AppX.targets # Compile commands database for clang-based tools compile_commands.json - -# MS2CC files used to generate compile commands database -tools/ms2cc/** From acfe357a10cd70d8437314a34eb374995365a50d Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 16:05:57 -0700 Subject: [PATCH 42/45] Adding hpp part 2 --- tools/GenerateCompilationDatabase.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 04c3975182..f17fd9fc83 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -135,7 +135,7 @@ foreach ($line in $lines) $modifiedArgs = @() foreach ($arg in $clArgs) { - if ($arg -match '^(.*\.(cpp|hpp|c|h))$' -or $arg -match '^"(.*\.(cpp|c|h))"$') + if ($arg -match '^(.*\.(cpp|hpp|c|h))$' -or $arg -match '^"(.*\.(cpp|hpp|c|h))"$') { $filePath = $arg.Trim('"') if (-Not ([System.IO.Path]::IsPathRooted($filePath))) From 028635c06973d5fefcf4d00dee91cb2265b11480 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Tue, 7 Oct 2025 16:31:07 -0700 Subject: [PATCH 43/45] Changing most of the not important logging to verbose --- tools/GenerateCompilationDatabase.ps1 | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index f17fd9fc83..f329784a32 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -51,30 +51,30 @@ Write-Host "Binlog files found:" $binlogFiles | ForEach-Object { Write-Host " $_" } $VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath -Write-Host "VCToolsInstallDir: $VCToolsInstallDir" +Write-Verbose "VCToolsInstallDir: $VCToolsInstallDir" $msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe" -Write-Host "msBuildPath: $msBuildPath" +Write-Verbose "msBuildPath: $msBuildPath" $temp = Join-Path (Split-Path $PSScriptRoot -parent) "temp" -Write-Host "Using temporary path: $temp" +Write-Verbose "Using temporary path: $temp" if (-not (Test-Path -Path $temp -PathType Container)) { - Write-Host "Creating temporary directory: $temp" - New-Item -ItemType Directory -Path $temp + Write-Verbose "Creating temporary directory: $temp" + New-Item -ItemType Directory -Path $temp | Out-Null } if (Test-Path "$temp\temp-filtered.log") { - Write-Host "Removing existing filtered log: $temp\temp-filtered.log" + Write-Verbose "Removing existing filtered log: $temp\temp-filtered.log" Remove-Item "$temp\temp-filtered.log" -Force } if (Test-Path "$temp\temp-filtered2.log") { - Write-Host "Removing existing filtered log: $temp\temp-filtered2.log" + Write-Verbose "Removing existing filtered log: $temp\temp-filtered2.log" Remove-Item "$temp\temp-filtered2.log" -Force } @@ -99,10 +99,10 @@ foreach ($binlogFile in $binlogFiles) Remove-Item $tempLog -Force - Write-Host "Processed binlog file: $binlogFile" + Write-Verbose "Processed binlog file: $binlogFile" } -Write-Host "Filtered log file generated at: $tempFilteredLog" +Write-Verbose "Filtered log file generated at: $tempFilteredLog" $contextPath = "" @@ -118,14 +118,14 @@ $contextPath = "" $tempFiltered2Log = Join-Path $temp "temp-filtered2.log" $lines = Get-Content $tempFilteredLog -Write-Host "Processing filtered log to adjust file paths..." +Write-Verbose "Processing filtered log to adjust file paths..." foreach ($line in $lines) { if ($line -match 'Target "ClCompile" in file "([^"]+)" from project "([^"]+)"') { $contextPath = Split-Path $matches[2] -parent - Write-Host "Context path set to: $contextPath" + Write-Verbose "Context path set to: $contextPath" } elseif ($line -match 'Cl\.exe (.+)$') { @@ -162,7 +162,7 @@ foreach ($line in $lines) } } -Write-Host "Adjusted file paths and generated: $tempFiltered2Log" +Write-Verbose "Adjusted file paths and generated: $tempFiltered2Log" if ($Ms2ccExePath) { @@ -191,10 +191,10 @@ elseif ($DownloadMs2cc) } Expand-Archive -Path $zipPath -DestinationPath $ms2ccPath -Force - Write-Host "Extracted ms2cc to: $ms2ccPath" + Write-Verbose "Extracted ms2cc to: $ms2ccPath" Remove-Item $zipPath -Force - Write-Host "Cleaned up zip file" + Write-Verbose "Cleaned up zip file" if (Test-Path $ms2ccExePath) { @@ -254,5 +254,5 @@ if ($Update -and (Test-Path $backupPath)) } Remove-Item $temp -Recurse -Force -Write-Host "Temporary files cleaned up." +Write-Verbose "Temporary files cleaned up." Write-Host "Compilation database generated at: $(Split-Path $PSScriptRoot -parent)\compile_commands.json" From 4cffe83b578c83bda03e22413fe4df21d93223d1 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 13 Oct 2025 20:18:36 -0700 Subject: [PATCH 44/45] Adding absolute path fix to precompiled header --- tools/GenerateCompilationDatabase.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index f329784a32..377258b4ff 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -151,6 +151,15 @@ foreach ($line in $lines) $modifiedArgs += $filePath } } + elseif ($arg -match '^/Yu(.*)$') + { + $pchPath = $matches[1].Trim('"') + if (-Not ([System.IO.Path]::IsPathRooted($pchPath))) + { + $pchPath = Join-Path $contextPath $pchPath + } + $modifiedArgs += '/Yu"' + $pchPath + '"' + } else { $modifiedArgs += $arg From 5d136de4fbe53a0675c60672d373412f6521c747 Mon Sep 17 00:00:00 2001 From: guimafelipe Date: Mon, 13 Oct 2025 21:39:33 -0700 Subject: [PATCH 45/45] Moving context path include to front --- tools/GenerateCompilationDatabase.ps1 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/GenerateCompilationDatabase.ps1 b/tools/GenerateCompilationDatabase.ps1 index 377258b4ff..2b1bf33358 100644 --- a/tools/GenerateCompilationDatabase.ps1 +++ b/tools/GenerateCompilationDatabase.ps1 @@ -166,6 +166,24 @@ foreach ($line in $lines) } } + # Move the /I argument that matches the contextPath to be the first /I argument. + # This is to ensure that the context include path is always first and clangd can find the headers + # on the correct path. This is important because clangd tries to find headers in the order + # of the include paths, but for the precompiled headers that are included with angular brackets + # it comes from the context path. The /Yu argument has a absolute path but for + # some reason clangd does not use that path to find the precompiled header that is included. + $includeArgs = $modifiedArgs | Where-Object { $_ -like '/I*' } + $otherArgs = $modifiedArgs | Where-Object { $_ -notlike '/I*' } + # Find the /I argument that matches the contextPath ignoring case and the trailing slash + $contextIncludeArg = $includeArgs | Where-Object { $_ -ieq ("/I$contextPath") -or $_ -ieq ("/I$contextPath\") } | Select-Object -First 1 + + if ($contextIncludeArg) + { + Write-Host "Moving context include path to the front: $contextIncludeArg" + $includeArgs = $includeArgs | Where-Object { $_ -ne $contextIncludeArg } + $modifiedArgs = @($contextIncludeArg) + $includeArgs + $otherArgs + } + $modifiedLine = "Cl.exe " + ($modifiedArgs -join ' ') Add-Content -Path $tempFiltered2Log -Value $modifiedLine }