REVERT: 3

try old provider
microsoft · Aug 13, 2024 · 4bae874 · 4bae874
1 parent 89a275c
commit 4bae874
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.pipelines/packages.config b/.pipelines/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.1" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0" />
 </packages>
diff --git a/.pipelines/release.yml b/.pipelines/release.yml
@@ -157,8 +157,8 @@ extends:
           inputs:
             script: |
               call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.1\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.1\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
+              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
+              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
 
       ## ALL BUT INSTALLER BUILDING
         - task: VSBuild@1

diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -41,6 +41,8 @@ static const wchar_t* POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC1
 constexpr inline const wchar_t* DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
 constexpr inline const wchar_t* DataDiagnosticsRegValueName = L"AllowDataDiagnostics";
 
+#define MICROSOFT_EVENTTAG_DROP_PII 0x02000000
+
 #define TraceLoggingWriteWrapper(provider, eventName, ...)   \
     if (isDataDiagnosticEnabled())                           \
     {                                                        \

diff --git a/src/common/Telemetry/TraceBase.h b/src/common/Telemetry/TraceBase.h
@@ -2,6 +2,8 @@
 
 #include "ProjectTelemetry.h"
 
+#define MICROSOFT_EVENTTAG_DROP_PII 0x02000000
+
 #define TraceLoggingWriteWrapper(provider, eventName, ...)   \
     if (IsDataDiagnosticsEnabled())                          \
     {                                                        \