@@ -76,6 +26,7 @@
true
$(MsbuildThisFileDirectory)\CppRuleSet.ruleset
+ $(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)
@@ -84,7 +35,7 @@
arm64
false
true
- $(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)
+ $(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)
Guard
@@ -123,6 +74,7 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
+ MultiThreadedDebug
true
@@ -132,6 +84,7 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
+ MultiThreaded
true
true
diff --git a/DATA_AND_PRIVACY.md b/DATA_AND_PRIVACY.md
index 56a2eb9eee..0ad4bda9c9 100644
--- a/DATA_AND_PRIVACY.md
+++ b/DATA_AND_PRIVACY.md
@@ -147,6 +147,18 @@ _If you want to find diagnostic data events in the source code, these two links
Microsoft.PowerToys.AdvancedPasteSemanticKernelFormatEvent
Triggered when Advanced Paste leverages the Semantic Kernel.
+
+ Microsoft.PowerToys.AdvancedPasteSemanticKernelErrorEvent
+ Occurs when the Semantic Kernel workflow encounters an error.
+
+
+ Microsoft.PowerToys.AdvancedPasteEndpointUsageEvent
+ Logs the AI provider, model, and processing duration for each endpoint call.
+
+
+ Microsoft.PowerToys.AdvancedPasteCustomActionErrorEvent
+ Records provider, model, and status details when a custom action fails.
+
### Always on Top
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9f01103d8f..a88ac0ec38 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,6 +7,7 @@
Microsoft PowerToys
-
+
+ Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.
+
-Download .exe from GitHub
-
+Download .exe from GitHub
-Microsoft Store
+Microsoft Store
@@ -82,10 +79,9 @@ You can easily install PowerToys from the Microsoft Store:
-
-WinGet
-
+WinGet
-Other methods
-
+Other methods
diff --git a/deps/cziplib b/deps/cziplib
deleted file mode 160000
index 81314fff0a..0000000000
--- a/deps/cziplib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81314fff0a882b72a9ad321e7a3311660125b56e
diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
index 0cfc3b1765..968fcc2530 100644
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -4,6 +4,7 @@
#include
#include
#include
+#include
#include "../../src/common/logger/logger.h"
#include "../../src/common/utils/gpo.h"
@@ -856,14 +857,69 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)
try
{
- winrt::Windows::Security::Credentials::PasswordVault vault;
- winrt::Windows::Security::Credentials::PasswordCredential cred;
-
hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
ExitOnFailure(hr, "Failed to initialize");
- cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
- vault.Remove(cred);
+ winrt::Windows::Security::Credentials::PasswordVault vault;
+
+ auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
+ std::wstring_view prefixView{ prefix };
+ return value.compare(0, prefixView.size(), prefixView) == 0;
+ };
+
+ const wchar_t* resourcePrefixes[] = {
+ L"https://platform.openai.com/api-keys",
+ L"https://azure.microsoft.com/products/ai-services/openai-service",
+ L"https://azure.microsoft.com/products/ai-services/ai-inference",
+ L"https://console.mistral.ai/account/api-keys",
+ L"https://ai.google.dev/",
+ };
+
+ const wchar_t* usernamePrefixes[] = {
+ L"PowerToys_AdvancedPaste_",
+ };
+
+ auto credentials = vault.RetrieveAll();
+ for (auto const& credential : credentials)
+ {
+ bool shouldRemove = false;
+
+ std::wstring resource{ credential.Resource() };
+ for (auto const prefix : resourcePrefixes)
+ {
+ if (hasPrefix(resource, prefix))
+ {
+ shouldRemove = true;
+ break;
+ }
+ }
+
+ if (!shouldRemove)
+ {
+ std::wstring username{ credential.UserName() };
+ for (auto const prefix : usernamePrefixes)
+ {
+ if (hasPrefix(username, prefix))
+ {
+ shouldRemove = true;
+ break;
+ }
+ }
+ }
+
+ if (!shouldRemove)
+ {
+ continue;
+ }
+
+ try
+ {
+ vault.Remove(credential);
+ }
+ catch (...)
+ {
+ }
+ }
}
catch (...)
{
diff --git a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
index 21b0e75837..ae50cdcedb 100644
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -110,6 +110,7 @@
Disabled
_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
+ MultiThreadedDebug
true
@@ -122,6 +123,7 @@
MaxSpeed
true
NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)
+ MultiThreaded
true
-
@@ -9,4 +8,4 @@
$(BaseIntermediateOutputPath)
-
\ No newline at end of file
+