diff --git a/.pipelines/build.cmd b/.pipelines/build.cmd
index bf91228a92..c28eae8706 100644
--- a/.pipelines/build.cmd
+++ b/.pipelines/build.cmd
@@ -1,4 +1,6 @@
cd /D "%~dp0"
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.16299.0
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0
+call msbuild ../src/common/notifications/notifications_dll.vcxproj /p:Configuration=Release /p:Platform=x64 || exit /b 1
+call msbuild ../src/common/notifications_winrt/notifications.vcxproj /p:Configuration=Release /p:Platform=x64 || exit /b 1
call msbuild ../PowerToys.sln /p:Configuration=Release /p:Platform=x64 || exit /b 1
diff --git a/.pipelines/msix/Images/logo.png b/.pipelines/msix/Images/logo.png
new file mode 100644
index 0000000000..8495aaf09d
Binary files /dev/null and b/.pipelines/msix/Images/logo.png differ
diff --git a/.pipelines/msix/Images/logo150.png b/.pipelines/msix/Images/logo150.png
new file mode 100644
index 0000000000..3186a72996
Binary files /dev/null and b/.pipelines/msix/Images/logo150.png differ
diff --git a/.pipelines/msix/Images/logo44.png b/.pipelines/msix/Images/logo44.png
new file mode 100644
index 0000000000..cbc9822292
Binary files /dev/null and b/.pipelines/msix/Images/logo44.png differ
diff --git a/.pipelines/msix/PackagingLayout.xml b/.pipelines/msix/PackagingLayout.xml
new file mode 100644
index 0000000000..9bd2e40b61
--- /dev/null
+++ b/.pipelines/msix/PackagingLayout.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.pipelines/msix/appxmanifest.xml b/.pipelines/msix/appxmanifest.xml
new file mode 100644
index 0000000000..117b747a66
--- /dev/null
+++ b/.pipelines/msix/appxmanifest.xml
@@ -0,0 +1,67 @@
+
+
+
+
+ PowerToys
+ Microsoft Corporation
+ Windows system utilities to maximize productivity
+ Images\logo.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Notifications.dll
+
+
+
+
+
diff --git a/.pipelines/msix/build_msix.cmd b/.pipelines/msix/build_msix.cmd
new file mode 100644
index 0000000000..b1232f4821
--- /dev/null
+++ b/.pipelines/msix/build_msix.cmd
@@ -0,0 +1,3 @@
+cd /D "%~dp0"
+
+call makeappx build /v /overwrite /f PackagingLayout.xml /id "PowerToys-x64" /op bin\ || exit /b 1
diff --git a/.pipelines/nuget.config b/.pipelines/nuget.config
new file mode 100644
index 0000000000..b914502e52
--- /dev/null
+++ b/.pipelines/nuget.config
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/.pipelines/packages.config b/.pipelines/packages.config
new file mode 100644
index 0000000000..cce4e71f95
--- /dev/null
+++ b/.pipelines/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index e6c215bad4..1d14029680 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -2,10 +2,10 @@ environment:
host:
os: 'windows'
flavor: 'server'
- version: '2016'
+ version: '2019'
runtime:
provider: 'appcontainer'
- image: 'cdpxwin.azurecr.io/user/powertoys/vs2019:3.0'
+ image: 'cdpxwinrs5.azurecr.io/global/vse2019:16.4.3'
source_mode: 'map'
version:
@@ -44,12 +44,12 @@ build:
- from: 'x64/Release'
to: 'Build_Output'
include:
- - 'PowerToys.exe'
- - 'PowerToysSettings.exe'
- - 'modules\FancyZonesEditor.exe'
- - 'modules\fancyzones.dll'
- - 'modules\shortcut_guide.dll'
- - 'modules\PowerRenameExt.dll'
+ - 'PowerToys.exe'
+ - 'PowerToysSettings.exe'
+ - 'modules\FancyZonesEditor.exe'
+ - 'modules\fancyzones.dll'
+ - 'modules\shortcut_guide.dll'
+ - 'modules\PowerRenameExt.dll'
signing_options:
sign_inline: true # This does signing a soon as this command completes
- !!buildcommand
@@ -62,21 +62,31 @@ build:
- 'PowerToysSetup.msi'
signing_options:
sign_inline: true # This does signing a soon as this command completes
+ - !!buildcommand
+ name: 'Build MSIX package'
+ command: '.pipelines\msix\build_msix.cmd'
+ artifacts:
+ - from: '.pipelines\msix\bin'
+ to: 'Build_MSIX_Package_Output'
+ include:
+ - '*.msix'
+ - '*.msixbundle'
+ signing_options:
+ sign_inline: true
static_analysis_options:
binskim_options:
files_to_scan:
- from: 'installer/packages'
exclude:
- exclude:
- - 'WiX.3.11.1/**/*.dll'
- - 'Wix.3.11.1/**/*.exe'
+ - 'WiX.3.11.1/**/*.dll'
+ - 'Wix.3.11.1/**/*.exe'
moderncop_options:
files_to_scan:
- from: 'src'
exclude:
- - '**/just.config.js'
- - '**/webpack.config.js'
- - '**/webpack.serve.config.js'
- - '**/dist/bundle.js'
+ - '**/just.config.js'
+ - '**/webpack.config.js'
+ - '**/webpack.serve.config.js'
+ - '**/dist/bundle.js'
\ No newline at end of file
diff --git a/.pipelines/restore-telemetry.cmd b/.pipelines/restore-telemetry.cmd
index d56351d4e3..7b0a68aee8 100644
--- a/.pipelines/restore-telemetry.cmd
+++ b/.pipelines/restore-telemetry.cmd
@@ -1,6 +1,5 @@
cd /D "%~dp0"
-set PROJECT="..\src\modules\fancyzones\editor\FancyZonesEditor\FancyZonesEditor.csproj"
-set TELEMETRY_PKG="Microsoft.PowerToys.Telemetry"
+call nuget.exe restore -ConfigFile nuget.config packages.config || exit /b 1
-dotnet add %PROJECT% package %TELEMETRY_PKG%
+move /Y "Microsoft.PowerToys.Telemetry.1.0.0\build\include\TraceLoggingDefines.h" "..\src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
diff --git a/src/common/notifications_winrt/pch.h b/src/common/notifications_winrt/pch.h
index 0b82dcd2f1..83ef612465 100644
--- a/src/common/notifications_winrt/pch.h
+++ b/src/common/notifications_winrt/pch.h
@@ -1,6 +1,6 @@
#pragma once
#include
-#include "winrt/Windows.ApplicationModel.Background.h"
+#include
#include
#include
#include