From 74b076e31fd9e9b233d19c355b27a509ea151ccf Mon Sep 17 00:00:00 2001 From: Enrico Giordani Date: Mon, 24 Feb 2020 23:49:28 +0100 Subject: [PATCH] [CDPx] update SDK, restore telemetry, build MSIX (#1358) --- .pipelines/build.cmd | 4 +- .pipelines/msix/Images/logo.png | Bin 0 -> 3012 bytes .pipelines/msix/Images/logo150.png | Bin 0 -> 2223 bytes .pipelines/msix/Images/logo44.png | Bin 0 -> 1638 bytes .pipelines/msix/PackagingLayout.xml | 40 ++++++++++++++++ .pipelines/msix/appxmanifest.xml | 67 +++++++++++++++++++++++++++ .pipelines/msix/build_msix.cmd | 3 ++ .pipelines/nuget.config | 10 ++++ .pipelines/packages.config | 4 ++ .pipelines/pipeline.user.windows.yml | 40 ++++++++++------ .pipelines/restore-telemetry.cmd | 5 +- src/common/notifications_winrt/pch.h | 2 +- 12 files changed, 155 insertions(+), 20 deletions(-) create mode 100644 .pipelines/msix/Images/logo.png create mode 100644 .pipelines/msix/Images/logo150.png create mode 100644 .pipelines/msix/Images/logo44.png create mode 100644 .pipelines/msix/PackagingLayout.xml create mode 100644 .pipelines/msix/appxmanifest.xml create mode 100644 .pipelines/msix/build_msix.cmd create mode 100644 .pipelines/nuget.config create mode 100644 .pipelines/packages.config 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 0000000000000000000000000000000000000000..8495aaf09df5bf80a6f8bf0f28e9d5ca7a4e80d1 GIT binary patch literal 3012 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&eBK4*bPWHAE+-w_aIoT|+y&A`AN>FMGaQW5v|itQ=4=#8!qoBtXZ8C_uG zU{gvfvTV%V;GM=cOR_6gAg?Gmy5MhT&l!7b11`1oM@s_Jbt*2MHACr25ugQcE%YOYt?uTFfm_9WJoKS&&j;u07HpHgXG=xLkv0w467MX zG2NPFz|cKv)bI~0dZbH8k}ou3*s`^8G~tcrED}l~3rU8TyW40~UXouFe>{7={=mdKI;Vst04<%MbpQYW literal 0 HcmV?d00001 diff --git a/.pipelines/msix/Images/logo150.png b/.pipelines/msix/Images/logo150.png new file mode 100644 index 0000000000000000000000000000000000000000..3186a7299688b6a77eda5194d35e402659f41726 GIT binary patch literal 2223 zcmd5;XHXN^77n{YClhF;d_445yj1cneo-f`-^M zewOKC9Qy%pl-Me$&~#QqO1&FjWS5w6&oe*F!bJU$@ey=;SG<$O`IBcvEE1~I$fVZ0 zE-vZp(qhT6^07rdr(A8Voqd|Q4)F84`N91~Qn_9sBN60I_cnN03eLr${C`(LYvG>> z)?Nn|_D^Kgd4~+{A5Bl9DM%caEcUE|^W)5vq@eae?FD<~ah|?WQubw@tlc)$7HFCf4?MjeA$eBUIQQsRk{+RR;Z?U2{6ETW^lJ8ntfkn zgjFHM(?bJGU76FD3Runr2dvVhI|B(rQ_SiIVUh*OTb*8VHWv4zcc?;ha@ywF z+&SxKi9!h;Fic@e#x{ypuW^CD)zOW?jLnuOeeClNW`5-(7vTduxeC{#q`Q#y0_v zs&kH~Hm4or=Rc(G|743-!6EeyH}!VEBeSX(@7NITdX+Uk!jy-LJCE~?D?2zGEA`9t z3P1==ok$e7!YGuQD0bB_zjI?GxcLvqg+lUNma2bUFIl)cV{$_Ggg!sz2T~r8BPNrJ zH#fTW1(>{CaeoNIRR;6KU#PgX&< zz&{NLw@+t4Ol9e$J$5-<_5N|kN!K0{1d{G?ClwquT{mQ+HW?&qeTFZz5$9c2H=B(1 z0Mnf_#3iLtz7A-6Nk7$Ss9<6=r17y1b7u~>*J#5=diw&;8%L{Kb~#Cgvp5@=vPH5{ z&i24XYn(jE8nO`qVyiXBEWVc6B@p#dtUcOfgJ`p~9p= zS~?I-@X=lrch+6gye=zQF9*vth~k#QJZ}~^ixl7mO5e)GVYRC61Y{n5Q_}lDqD-g{ zq1NLYS{rd#agTQa?eWMo*fmg>t=r_^M0x%EMz^aU2DZ4mUrC9J8oYVWZUPI;KWjZK zH@0FeRaf`R=19Tashun1S-EASPwwS3e8CCEAb9BE6iADxj5PcrQBHYdM?|uAR#P%B zQsnU2`z#1D>(P0|@sy1c?w8w^F!OS9f zdPApC>3*|QR~?7aWj{PITC|`?jP=|5UQxJ3JUG!)J==4=g>16ln{naoxFKJQw@cVHeXt2%gJC^^n^nJ&=6xi107#fcq&va;6 zn(55o{`^{U2bnVc2uMx160qFeDBfVU(N51j=Y!uS2#`!wg|$x>-j`WokPA3zqX>2c zMO3M7LX2#1y!b)~G61Fe^+8WkUql~$UMyFs2I3ZK%ph{elk#J6w=PL;cjNMnLPsL< zm~Vo)eaarU+$Sxa=|mq^rMyIU2cqHxIqh`4PoyQhJ_*X7vmQC3=NQuDKWQa}XFriq z3X*qD?J10fs;S!h+5ecAh7Im%B6Jk0$P4M{%^(ykI-#fJ8`Uqa0j#2 z>PW8;5q9hPAp*LGT5t)N5(!C}cpJX5u=nW-Tf{MYgv)8eEJ;L+Mg~B{qL+O?)nvSN zZX{V$4HGIp_@nj=1aJp~O_8XdGa_z&Qnh7Gf3tS2RXAR>LYMGiL|?ao+g)?|JqV{Q zEw=KxlWkqKK#fikP0>xd>>nDq-HW|xrNdpbJs86O(4jy3jsImdKpgt!K4XUy%==^j NEX-_8D@;6N{s3hoDEt5b literal 0 HcmV?d00001 diff --git a/.pipelines/msix/Images/logo44.png b/.pipelines/msix/Images/logo44.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc9822292830cd3061d132794c86a092564887e GIT binary patch literal 1638 zcmV-s2ATPZP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1^Y=vK~z{r?OAPa z6jc;{=4E%g+ugR5wouws2%w^%Bt{Ch#3&L2Mq<(&qvoo{v;yHJArZd~6Ta+fN>61R4J2Pj_Jonr)XYZYnTmlI5 za}&r;T!Es-dADKU*cMtl`p~=WHL)KE&Og3~*{NYDN`nb@EM(gIu&MVIu`fNEyW^^A z4C7+8ot8IY2bPKnnAbIpYpg2JYQ<9AnS}*RF6{y}JD3XCG;}Eju0cxA# zm?JA_$z`!;O(w!&%MEQr>PFq$`3#IKCH zD-K$vB1`9;>J^4YGp-0+I5}Ft+Dmpk8lAF%q#PC^At5awE-zO0Jy>c2T64#;`Px&@ zhg}l7u~0(CVll#Q*+LIRcZm+Rv}x#S%Lm-lmV?qt)5mraOi}h|L*LMXznZ!te5|%U zn+TV56K@Xe;c$^Z&taVGheyXyEb5SHj?A!a8(p0n@ci~3SUle)@VTO<JD;iDX@6KRl4B}njf>JaT$=S2v0 zQ-Uw%NU(?!Q7h@tG($wG8XQ@+2~(#C)q?O-vGKR7$cX=89p+y1(5kewXU0^Os6_J2 zhfHfd-_EC^)V_sEeyVL($bI1OK%%1%69A+>9#guKkIx>G(Pb`{oexeRq9 ztWh2P;JpFS_Uka)|NQGH7IMWPN4Y}u^>$+Ko*gKcEpd!Hkk1!!=KNJOCA`q>Xc`s#2AP4H?sf*O1XHbW^m%2`*E$66CbZXUM63yq> zPLQrK>EWyeVdvY5ttl!}J*+B+8wqsh%Zh|Y^NYAV@@HVjlb)Mn(?X07zJg2F z#i2g}yOC?RF+|sK{;ib1j8)ZPo&fn3!bejw9{E9FaCP8(4@0J?SNmjN1@aluMms60 z?bRdqkLoZN{&YGSVYOHW4{x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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