From a0b8547aaa864abeefbc9c08d34c33be43a56672 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:26 -0700 Subject: [PATCH 01/32] Playground Win32 - start getting it working on WinUI 3 --- .../Images/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Images/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Images/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Images/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../Images/StoreLogo.png | Bin 0 -> 1451 bytes .../Images/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../Package.appxmanifest | 49 ++++++++++++++ .../Playground-win32 (Package).wapproj | 64 ++++++++++++++++++ .../playground/windows/playground-win32.sln | 44 ++++-------- .../playground-win32/Playground-Win32.cpp | 23 ++++--- .../playground-win32/Playground-Win32.h | 3 + .../playground-win32/Playground-win32.vcxproj | 21 +++++- .../Microsoft.ReactNative.Cxx.vcxitems | 2 + .../UI.Xaml.Hosting.DesktopWindowXamlSource.h | 11 +++ .../UI.Xaml.Hosting.h | 10 +++ .../Modules/DeviceInfoModule.cpp | 42 +++++++----- 17 files changed, 210 insertions(+), 59 deletions(-) create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/LockScreenLogo.scale-200.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/SplashScreen.scale-200.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/Square150x150Logo.scale-200.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.scale-200.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/StoreLogo.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Images/Wide310x150Logo.scale-200.png create mode 100644 packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest create mode 100644 packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj create mode 100644 packages/playground/windows/playground-win32/Playground-Win32.h create mode 100644 vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h create mode 100644 vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.h diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/LockScreenLogo.scale-200.png b/packages/playground/windows/Playground-win32 (Package)/Images/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/SplashScreen.scale-200.png b/packages/playground/windows/Playground-win32 (Package)/Images/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/Square150x150Logo.scale-200.png b/packages/playground/windows/Playground-win32 (Package)/Images/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.scale-200.png b/packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/packages/playground/windows/Playground-win32 (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/StoreLogo.png b/packages/playground/windows/Playground-win32 (Package)/Images/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/packages/playground/windows/Playground-win32 (Package)/Images/Wide310x150Logo.scale-200.png b/packages/playground/windows/Playground-win32 (Package)/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + + + + + Playground-win32 (Package) + asklar + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj new file mode 100644 index 00000000000..2e506343629 --- /dev/null +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj @@ -0,0 +1,64 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + NativeOnly + NativeOnly + + + + eec4ef0f-3dd6-4d36-84d8-e5ec3f5ed5ff + 10.0.18362.0 + 10.0.17134.0 + en-US + false + ..\Playground-win32\Playground-win32.vcxproj + + + + Designer + + + + + + + + + + + + + + True + + + + + + + + + + \ No newline at end of file diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index 17b51fe1d0b..dc4923da27f 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29102.190 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-Win32", "playground-win32\Playground-Win32.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-win32", "playground-win32\Playground-Win32.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" EndProject @@ -30,6 +30,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -45,92 +47,76 @@ Global ..\..\..\vnext\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.ActiveCfg = Debug|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Build.0 = Debug|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|ARM.Deploy.0 = Debug|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.ActiveCfg = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Build.0 = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Deploy.0 = Debug|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.ActiveCfg = Debug|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Build.0 = Debug|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Deploy.0 = Debug|Win32 - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.ActiveCfg = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Build.0 = Release|ARM - {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|ARM.Deploy.0 = Release|ARM {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.ActiveCfg = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Build.0 = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Deploy.0 = Release|x64 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.ActiveCfg = Release|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Build.0 = Release|Win32 {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Deploy.0 = Release|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/Playground-Win32.cpp b/packages/playground/windows/playground-win32/Playground-Win32.cpp index 1aa0a0b9b9f..0754d694bc0 100644 --- a/packages/playground/windows/playground-win32/Playground-Win32.cpp +++ b/packages/playground/windows/playground-win32/Playground-Win32.cpp @@ -16,15 +16,20 @@ #include +#include +#include #include -#include -#include #pragma pop_macro("GetCurrentTime") -namespace WUX = winrt::Windows::UI::Xaml; -namespace WUXC = WUX::Controls; -namespace WUXH = WUX::Hosting; +#ifndef USE_WINUI3 +namespace xaml = winrt::Windows::UI::Xaml; +#else +namespace xaml = winrt::Microsoft::UI::Xaml; +#endif + +namespace controls = xaml::Controls; +namespace hosting = xaml::Hosting; int RunPlayground(int showCmd, bool useWebDebugger); @@ -33,7 +38,7 @@ struct WindowData { static constexpr uint16_t defaultDebuggerPort = 9229; std::wstring m_bundleFile; - WUXH::DesktopWindowXamlSource m_desktopWindowXamlSource; + hosting::DesktopWindowXamlSource m_desktopWindowXamlSource; winrt::Microsoft::ReactNative::ReactRootView m_reactRootView; winrt::Microsoft::ReactNative::ReactNativeHost m_host; @@ -46,7 +51,7 @@ struct WindowData { bool m_breakOnNextLine{false}; uint16_t m_debuggerPort{defaultDebuggerPort}; - WindowData(const WUXH::DesktopWindowXamlSource &desktopWindowXamlSource) + WindowData(const hosting::DesktopWindowXamlSource &desktopWindowXamlSource) : m_desktopWindowXamlSource(desktopWindowXamlSource) {} static WindowData *GetFromWindow(HWND hwnd) { @@ -92,7 +97,7 @@ struct WindowData { host.InstanceSettings().DebuggerPort(m_debuggerPort); host.InstanceSettings().UseDeveloperSupport(true); - auto rootElement = m_desktopWindowXamlSource.Content().as(); + auto rootElement = m_desktopWindowXamlSource.Content().as(); winrt::Microsoft::ReactNative::XamlUIService::SetXamlRoot( host.InstanceSettings().Properties(), rootElement.XamlRoot()); @@ -340,7 +345,7 @@ int RunPlayground(int showCmd, bool useWebDebugger) { auto windowData = std::make_unique(desktopXamlSource); windowData->m_useWebDebugger = useWebDebugger; - auto xamlContent = WUXC::Grid(); + auto xamlContent = controls::Grid(); desktopXamlSource.Content(xamlContent); HWND hwnd = CreateWindow( diff --git a/packages/playground/windows/playground-win32/Playground-Win32.h b/packages/playground/windows/playground-win32/Playground-Win32.h new file mode 100644 index 00000000000..e37271e3928 --- /dev/null +++ b/packages/playground/windows/playground-win32/Playground-Win32.h @@ -0,0 +1,3 @@ +#pragma once + +int __stdcall WinMain(HINSTANCE instance, HINSTANCE, PSTR, int showCmd); diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index e2b7040f426..255252184c5 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -11,6 +11,19 @@ 10.0.18362.0 false + + Playground-win32 + en-US + 16.0 + false + false + Windows Store + 10.0 + 10.0 + 10.0.17134.0 + true + WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -97,6 +110,7 @@ + @@ -117,11 +131,11 @@ - + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\AppxPackage\Microsoft.AppXPackage.Targets resources.pri - + @@ -134,6 +148,7 @@ + @@ -148,4 +163,4 @@ - + \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems b/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems index b4cc94dd121..213aba27c6e 100644 --- a/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems +++ b/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems @@ -47,6 +47,8 @@ + + diff --git a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h new file mode 100644 index 00000000000..2bebf70da7c --- /dev/null +++ b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License. + +#pragma once + +#ifdef USE_WINUI3 +// This header doesn't exist in WinUI 3, +// DesktopWindowXamlSource is moved to Microsoft.UI.Xaml.Hosting. +#else +#include +#endif // USE_WINUI3 diff --git a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.h b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.h new file mode 100644 index 00000000000..feebbc2d9aa --- /dev/null +++ b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.h @@ -0,0 +1,10 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT License. + +#pragma once + +#ifdef USE_WINUI3 +#include +#else +#include +#endif // USE_WINUI3 diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index 397a569351c..b74d934dbab 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -30,14 +30,17 @@ void DeviceInfoHolder::InitDeviceInfoHolder( propertyBag.Set(DeviceInfoHolderPropertyId(), std::move(deviceInfoHolder)); auto const &displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView(); - auto const &window = xaml::Window::Current().CoreWindow(); - - deviceInfoHolder->m_sizeChangedRevoker = - window.SizeChanged(winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](auto &&, auto &&) { - if (auto strongHolder = weakHolder.lock()) { - strongHolder->updateDeviceInfo(); - } - }); + /// TODO: WinUI 3 islands support + if (xaml::Window::Current()) { + auto const &window = xaml::Window::Current().CoreWindow(); + + deviceInfoHolder->m_sizeChangedRevoker = + window.SizeChanged(winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](auto &&, auto &&) { + if (auto strongHolder = weakHolder.lock()) { + strongHolder->updateDeviceInfo(); + } + }); + } deviceInfoHolder->m_dpiChangedRevoker = displayInfo.DpiChanged( winrt::auto_revoke, [weakHolder = std::weak_ptr(deviceInfoHolder)](const auto &, const auto &) { @@ -87,16 +90,19 @@ void DeviceInfoHolder::SetCallback( void DeviceInfoHolder::updateDeviceInfo() noexcept { auto const displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView(); - auto const window = xaml::Window::Current().CoreWindow(); - winrt::Windows::UI::ViewManagement::UISettings uiSettings; - - m_windowWidth = window.Bounds().Width; - m_windowHeight = window.Bounds().Height; - m_scale = static_cast(displayInfo.ResolutionScale()) / 100; - m_textScaleFactor = uiSettings.TextScaleFactor(); - m_dpi = displayInfo.LogicalDpi(); - m_screenWidth = displayInfo.ScreenWidthInRawPixels(); - m_screenHeight = displayInfo.ScreenHeightInRawPixels(); + /// TODO: WinUI 3 islands support + if (xaml::Window::Current()) { + auto const window = xaml::Window::Current().CoreWindow(); + winrt::Windows::UI::ViewManagement::UISettings uiSettings; + + m_windowWidth = window.Bounds().Width; + m_windowHeight = window.Bounds().Height; + m_scale = static_cast(displayInfo.ResolutionScale()) / 100; + m_textScaleFactor = uiSettings.TextScaleFactor(); + m_dpi = displayInfo.LogicalDpi(); + m_screenWidth = displayInfo.ScreenWidthInRawPixels(); + m_screenHeight = displayInfo.ScreenHeightInRawPixels(); + } } void DeviceInfo::GetConstants(React::ReactConstantProvider &provider) noexcept { From 047f67e1379036f93bbd30d69dccc4adc75a40e8 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:53 -0700 Subject: [PATCH 02/32] Change files --- ...-native-windows-2020-06-25-01-58-53-pgWin32WinUI3.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-06-25-01-58-53-pgWin32WinUI3.json diff --git a/change/react-native-windows-2020-06-25-01-58-53-pgWin32WinUI3.json b/change/react-native-windows-2020-06-25-01-58-53-pgWin32WinUI3.json new file mode 100644 index 00000000000..b342e7a869c --- /dev/null +++ b/change/react-native-windows-2020-06-25-01-58-53-pgWin32WinUI3.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "WinUI 3 islands support", + "packageName": "react-native-windows", + "email": "asklar@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-06-25T08:58:53.669Z" +} From 7fca0542db866c713e1495aefcf23f2baab4784f Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 11:41:52 -0700 Subject: [PATCH 03/32] use lifted DWXS --- .../windows/playground-win32/Playground-Win32.cpp | 4 ++-- .../playground-win32/Playground-win32.vcxproj | 13 +++++++++++++ .../UI.Xaml.Hosting.DesktopWindowXamlSource.h | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/playground/windows/playground-win32/Playground-Win32.cpp b/packages/playground/windows/playground-win32/Playground-Win32.cpp index 0754d694bc0..00ab63b8d4f 100644 --- a/packages/playground/windows/playground-win32/Playground-Win32.cpp +++ b/packages/playground/windows/playground-win32/Playground-Win32.cpp @@ -1,6 +1,8 @@ #include "pch.h" #include "resource.h" +#include + #include #include #include @@ -14,8 +16,6 @@ #include -#include - #include #include #include diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 255252184c5..a77bb176443 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -76,6 +76,7 @@ + False 867D41FE5091AED426000143497EA4DFC29A8097 @@ -163,4 +164,16 @@ + + + + + + \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h index 2bebf70da7c..0cbda423dad 100644 --- a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h +++ b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h @@ -4,8 +4,8 @@ #pragma once #ifdef USE_WINUI3 -// This header doesn't exist in WinUI 3, -// DesktopWindowXamlSource is moved to Microsoft.UI.Xaml.Hosting. +#include +using IDesktopWindowXamlSourceNative2 = IDesktopWindowXamlSourceNative; #else #include #endif // USE_WINUI3 From 83ec6ddc87c55dbe703390d6ae6d2d47a3e9272f Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 26 Jun 2020 18:29:04 -0700 Subject: [PATCH 04/32] DWXS header --- .../playground-win32/Playground-win32.vcxproj | 1 + .../UI.Xaml.Hosting.DesktopWindowXamlSource.h | 2 +- .../Modules/DeviceInfoModule.cpp | 29 ++++++++++++++----- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index a77bb176443..fb3f899e40f 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -10,6 +10,7 @@ 10.0.18362.0 10.0.18362.0 false + false Playground-win32 diff --git a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h index 0cbda423dad..5f7c46064ee 100644 --- a/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h +++ b/vnext/Microsoft.ReactNative.Cxx/UI.Xaml.Hosting.DesktopWindowXamlSource.h @@ -7,5 +7,5 @@ #include using IDesktopWindowXamlSourceNative2 = IDesktopWindowXamlSourceNative; #else -#include +#include #endif // USE_WINUI3 diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index b74d934dbab..ee11b540264 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include namespace Microsoft::ReactNative { @@ -89,20 +91,31 @@ void DeviceInfoHolder::SetCallback( } void DeviceInfoHolder::updateDeviceInfo() noexcept { - auto const displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView(); - /// TODO: WinUI 3 islands support if (xaml::Window::Current()) { auto const window = xaml::Window::Current().CoreWindow(); - winrt::Windows::UI::ViewManagement::UISettings uiSettings; m_windowWidth = window.Bounds().Width; m_windowHeight = window.Bounds().Height; - m_scale = static_cast(displayInfo.ResolutionScale()) / 100; - m_textScaleFactor = uiSettings.TextScaleFactor(); - m_dpi = displayInfo.LogicalDpi(); - m_screenWidth = displayInfo.ScreenWidthInRawPixels(); - m_screenHeight = displayInfo.ScreenHeightInRawPixels(); + } else { + /// TODO: WinUI 3 Island - mock for now + m_windowWidth = 600; + m_windowHeight = 800; + + /* + auto interop = m_desktopWindowXamlSource.as(); + + // Get the new child window's hwnd + HWND hWndXamlIsland = nullptr; + winrt::check_hresult(interop->get_WindowHandle(&hWndXamlIsland)); + */ } + winrt::Windows::UI::ViewManagement::UISettings uiSettings; + m_textScaleFactor = uiSettings.TextScaleFactor(); + auto const displayInfo = winrt::Windows::Graphics::Display::DisplayInformation::GetForCurrentView(); + m_scale = static_cast(displayInfo.ResolutionScale()) / 100; + m_dpi = displayInfo.LogicalDpi(); + m_screenWidth = displayInfo.ScreenWidthInRawPixels(); + m_screenHeight = displayInfo.ScreenHeightInRawPixels(); } void DeviceInfo::GetConstants(React::ReactConstantProvider &provider) noexcept { From 1777be5474d97680f6a2c42082462efc1ff657a4 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 22:45:31 -0700 Subject: [PATCH 05/32] create separate 16.7 packaging solution --- .../Playground-win32 (Package).wapproj | 61 +------- .../Playground-win32-packaging.proj | 64 ++++++++ .../windows/playground-win32-packaged.sln | 139 ++++++++++++++++++ .../playground/windows/playground-win32.sln | 14 -- .../playground/windows/playground-win32/pch.h | 4 +- 5 files changed, 208 insertions(+), 74 deletions(-) create mode 100644 packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj create mode 100644 packages/playground/windows/playground-win32-packaged.sln diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj index 2e506343629..98cc6abf0dd 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj @@ -1,64 +1,11 @@ - - 15.0 - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - NativeOnly - NativeOnly + + eec4ef0f-3dd6-4d36-84d8-e5ec3f5ed5ff - - eec4ef0f-3dd6-4d36-84d8-e5ec3f5ed5ff - 10.0.18362.0 - 10.0.17134.0 - en-US - false ..\Playground-win32\Playground-win32.vcxproj - - - Designer - - - - - - - - - - - - - - True - - - - - - - - - + + \ No newline at end of file diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj new file mode 100644 index 00000000000..ac05094c32a --- /dev/null +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj @@ -0,0 +1,64 @@ + + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + NativeOnly + NativeOnly + + + + eec4ef0f-3dd6-4d36-84d8-e5ec3f5ed5ff + 10.0.18362.0 + 10.0.17134.0 + en-US + false + ..\Playground-win32\Playground-win32.vcxproj + + + + Designer + + + + + + + + + + + + + + True + + + + + + + + + + \ No newline at end of file diff --git a/packages/playground/windows/playground-win32-packaged.sln b/packages/playground/windows/playground-win32-packaged.sln new file mode 100644 index 00000000000..dc4923da27f --- /dev/null +++ b/packages/playground/windows/playground-win32-packaged.sln @@ -0,0 +1,139 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29102.190 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Playground-win32", "playground-win32\Playground-Win32.vcxproj", "{8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "..\..\..\vnext\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vnext\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" + ProjectSection(ProjectDependencies) = postProject + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\..\..\vnext\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Shared", "..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems", "{0CC28589-39E4-4288-B162-97B959F8B843}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Universal", "..\..\..\vnext\JSI\Universal\JSI.Universal.vcxproj", "{A62D504A-16B8-41D2-9F19-E2E86019E5E4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\..\..\vnext\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "..\..\..\vnext\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" +EndProject +Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 + ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 + ..\..\..\vnext\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 + ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 + ..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + ..\..\..\vnext\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.ActiveCfg = Debug|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Build.0 = Debug|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x64.Deploy.0 = Debug|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.ActiveCfg = Debug|Win32 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Build.0 = Debug|Win32 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Debug|x86.Deploy.0 = Debug|Win32 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.ActiveCfg = Release|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Build.0 = Release|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x64.Deploy.0 = Release|x64 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.ActiveCfg = Release|Win32 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Build.0 = Release|Win32 + {8B88FFAE-4DBC-49A2-AFA5-D2477D4AD189}.Release|x86.Deploy.0 = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 + {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 + {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F5EAF3BA-6B6F-4E81-B5C6-49B30EC0A32E} + EndGlobalSection +EndGlobal diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index dc4923da27f..cb5ea341f1b 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -105,18 +103,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index cdf4a1731bc..74cb8e09047 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -13,7 +13,5 @@ #include #include - -#include - +#include #pragma pop_macro("GetCurrentTime") From 8684d225bfde48c756c335f88f8e5a46ed205898 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 23:10:49 -0700 Subject: [PATCH 06/32] format --- packages/playground/windows/playground-win32/pch.h | 2 +- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index 74cb8e09047..69d880ad9af 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -11,7 +11,7 @@ #include +#include #include #include -#include #pragma pop_macro("GetCurrentTime") diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index ee11b540264..fceeed86f61 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -4,11 +4,11 @@ #include "pch.h" #include "DeviceInfoModule.h" #include +#include #include +#include #include #include -#include -#include namespace Microsoft::ReactNative { From 95d2a8fa906b03cd9e08e3952791b267efb73e0f Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 2 Jul 2020 11:58:48 -0700 Subject: [PATCH 07/32] fix non-winui3 case --- .../Playground-win32 (Package).wapproj | 2 ++ .../windows/playground-win32/Playground-win32.vcxproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj index 98cc6abf0dd..1792d3fc732 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj @@ -6,6 +6,8 @@ ..\Playground-win32\Playground-win32.vcxproj + \ No newline at end of file diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index fb3f899e40f..498090dfeef 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -12,7 +12,7 @@ false false - + Playground-win32 en-US 16.0 From 86979a3a7d1b86f2f932d301bcb0599bbfee5279 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Mon, 6 Jul 2020 22:58:17 -0700 Subject: [PATCH 08/32] use CI nuget downloaded and expanded to C:\temp --- packages/playground/windows/NuGet.Config | 11 +++++++++++ .../playground/windows/playground/packages.config | 2 +- vnext/Microsoft.ReactNative/packages.config | 4 ++-- vnext/NuGet.Config | 1 + vnext/PropertySheets/WinUI.props | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 packages/playground/windows/NuGet.Config diff --git a/packages/playground/windows/NuGet.Config b/packages/playground/windows/NuGet.Config new file mode 100644 index 00000000000..8a7dab4d15f --- /dev/null +++ b/packages/playground/windows/NuGet.Config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/playground/windows/playground/packages.config b/packages/playground/windows/playground/packages.config index a7fde84c020..f38160bf22c 100644 --- a/packages/playground/windows/playground/packages.config +++ b/packages/playground/windows/playground/packages.config @@ -2,5 +2,5 @@ - + diff --git a/vnext/Microsoft.ReactNative/packages.config b/vnext/Microsoft.ReactNative/packages.config index 2864726f934..d64357df546 100644 --- a/vnext/Microsoft.ReactNative/packages.config +++ b/vnext/Microsoft.ReactNative/packages.config @@ -1,4 +1,4 @@ - + @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/vnext/NuGet.Config b/vnext/NuGet.Config index a6d079d69b4..8a7dab4d15f 100644 --- a/vnext/NuGet.Config +++ b/vnext/NuGet.Config @@ -5,6 +5,7 @@ + diff --git a/vnext/PropertySheets/WinUI.props b/vnext/PropertySheets/WinUI.props index 7c099ca9dda..b7d4131c833 100644 --- a/vnext/PropertySheets/WinUI.props +++ b/vnext/PropertySheets/WinUI.props @@ -6,7 +6,7 @@ - 3.0.0-preview2.200713.0 + 3.0.0-development.200706.1-CI Microsoft.WinUI From 672ad7aeb87b424de9b79e8677361108e6da76ea Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 7 Jul 2020 21:37:15 -0700 Subject: [PATCH 09/32] preprocessor defines --- vnext/PropertySheets/WinUI.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vnext/PropertySheets/WinUI.props b/vnext/PropertySheets/WinUI.props index b7d4131c833..f57ae1f5c47 100644 --- a/vnext/PropertySheets/WinUI.props +++ b/vnext/PropertySheets/WinUI.props @@ -31,10 +31,14 @@ USE_WINUI3;%(PreprocessorDefinitions) + + ENABLE_WINRT_EXPERIMENTAL_TYPES=1;%(PreprocessorDefinitions) USE_WINUI3;%(PreprocessorDefinitions) + + ENABLE_WINRT_EXPERIMENTAL_TYPES=1;DISABLE_MIDL_VERSION_CHECKS=1;%(PreprocessorDefinitions) From 78ab8f62a63fa464c94cd561602b5fbcc7cf3c3a Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 9 Jul 2020 14:47:54 -0700 Subject: [PATCH 10/32] Port to WinUI 3 dev nuget with IXP payload (almost preview 2). Islands are rendering! --- .../Modules/I18nManagerModule.cpp | 4 +++- .../Views/TouchEventHandler.cpp | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp index df073057552..f70c415db44 100644 --- a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp @@ -8,6 +8,7 @@ #include #include #include "Unicode.h" +#include namespace Microsoft::ReactNative { @@ -27,7 +28,8 @@ static const React::ReactPropertyId &ForceRTLPropertyId() noexcept { } void I18nManager::InitI18nInfo(const winrt::Microsoft::ReactNative::ReactPropertyBag &propertyBag) noexcept { - if (xaml::TryGetCurrentApplication()) { + if (xaml::TryGetCurrentApplication() && !react::uwp::IsXamlIsland()) { + // TODO: Figure out packaged win32 app story for WinUI 3 auto layoutDirection = winrt::Windows::ApplicationModel::Resources::Core::ResourceContext() .GetForCurrentView() .QualifierValues() diff --git a/vnext/Microsoft.ReactNative/Views/TouchEventHandler.cpp b/vnext/Microsoft.ReactNative/Views/TouchEventHandler.cpp index 8c5abe36a49..39df8712920 100644 --- a/vnext/Microsoft.ReactNative/Views/TouchEventHandler.cpp +++ b/vnext/Microsoft.ReactNative/Views/TouchEventHandler.cpp @@ -18,7 +18,9 @@ #include #include #include - +#ifdef USE_WINUI3 +#include +#endif namespace react { namespace uwp { @@ -202,12 +204,18 @@ TouchEventHandler::ReactPointer TouchEventHandler::CreateReactPointer( pointer.target = tag; pointer.identifier = m_touchId++; pointer.pointerId = point.PointerId(); +#ifndef USE_WINUI3 pointer.deviceType = point.PointerDevice().PointerDeviceType(); +#else + pointer.deviceType = point.PointerDeviceType(); +#endif pointer.isLeftButton = props.IsLeftButtonPressed(); pointer.isRightButton = props.IsRightButtonPressed(); pointer.isMiddleButton = props.IsMiddleButtonPressed(); pointer.isHorizontalScrollWheel = props.IsHorizontalMouseWheel(); +#ifndef USE_WINUI3 pointer.isEraser = props.IsEraser(); +#endif UpdateReactPointer(pointer, args, sourceElement); @@ -226,7 +234,9 @@ void TouchEventHandler::UpdateReactPointer( pointer.positionRoot = rootPoint.Position(); pointer.positionView = point.Position(); pointer.timestamp = point.Timestamp() / 1000; // us -> ms +#ifndef USE_WINUI3 pointer.pressure = props.Pressure(); +#endif pointer.isBarrelButton = props.IsBarrelButtonPressed(); pointer.shiftKey = 0 != (keyModifiers & static_cast(winrt::Windows::System::VirtualKeyModifiers::Shift)); pointer.ctrlKey = 0 != (keyModifiers & static_cast(winrt::Windows::System::VirtualKeyModifiers::Control)); From 485895163f4007a7ecb8202c42dd219d7a686b34 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Tue, 21 Jul 2020 03:07:49 -0700 Subject: [PATCH 11/32] hosting namespace --- .../playground/windows/playground-win32/Playground-Win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/playground/windows/playground-win32/Playground-Win32.cpp b/packages/playground/windows/playground-win32/Playground-Win32.cpp index 00ab63b8d4f..e3d8f7c127e 100644 --- a/packages/playground/windows/playground-win32/Playground-Win32.cpp +++ b/packages/playground/windows/playground-win32/Playground-Win32.cpp @@ -341,7 +341,7 @@ int RunPlayground(int showCmd, bool useWebDebugger) { winrt::init_apartment(winrt::apartment_type::single_threaded); - WUXH::DesktopWindowXamlSource desktopXamlSource; + hosting::DesktopWindowXamlSource desktopXamlSource; auto windowData = std::make_unique(desktopXamlSource); windowData->m_useWebDebugger = useWebDebugger; From c48766ba5c43653a8256d1fdba7c5ea43f1b75ef Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:26 -0700 Subject: [PATCH 12/32] Playground Win32 - start getting it working on WinUI 3 --- .../Playground-win32 (Package).wapproj | 2 +- packages/playground/windows/playground-win32.sln | 14 ++++++++++++++ .../playground-win32/Playground-win32.vcxproj | 16 +--------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj index 1792d3fc732..4491d2a8d72 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32 (Package).wapproj @@ -10,4 +10,4 @@ However 16.7 is still in Preview so it's not available in GitHub Actions --> - \ No newline at end of file + diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index cb5ea341f1b..dc4923da27f 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,6 +30,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -103,6 +105,18 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 498090dfeef..afcac25a0ee 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -22,8 +22,6 @@ 10.0 10.0 10.0.17134.0 - true - WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools @@ -165,16 +163,4 @@ - - - - - - - \ No newline at end of file + From 3a557d229125794b73bc2bc7378c17ec0f21fdab Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 26 Jun 2020 18:29:04 -0700 Subject: [PATCH 13/32] DWXS header --- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index fceeed86f61..e851d0ddfe1 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include namespace Microsoft::ReactNative { From 8997684577b7d7ab231af20e2aa1eb08f66e1f71 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 22:45:31 -0700 Subject: [PATCH 14/32] create separate 16.7 packaging solution --- packages/playground/windows/playground-win32.sln | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index dc4923da27f..cb5ea341f1b 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -105,18 +103,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 2205e3c0d561481c47db01c5470f8f7eb33a9d36 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 23:10:49 -0700 Subject: [PATCH 15/32] format --- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index e851d0ddfe1..fceeed86f61 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,8 +9,6 @@ #include #include #include -#include -#include namespace Microsoft::ReactNative { From 15892be4493754afe9ffb3cfc02b96272fa164eb Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 16 Jul 2020 10:01:30 -0700 Subject: [PATCH 16/32] guard against hresult (from failed activation) in UIManager, update reference to winui.props in WAP --- .../Package.appxmanifest | 2 +- .../Playground-win32-packaging.proj | 6 +++- vnext/Microsoft.ReactNative.Cxx/UI.Text.h | 3 ++ .../Modules/I18nManagerModule.cpp | 2 +- .../Utils/PropertyUtils.h | 5 +-- vnext/Shared/Modules/UIManagerModule.cpp | 33 +++++++++++-------- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest b/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest index 67353658d72..82daaab3b97 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest +++ b/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest @@ -7,7 +7,7 @@ IgnorableNamespaces="uap rescap"> diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj index ac05094c32a..b9b3bb7fada 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj @@ -59,6 +59,10 @@ + + true + + - + \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Cxx/UI.Text.h b/vnext/Microsoft.ReactNative.Cxx/UI.Text.h index d0dbcc19f7a..4b375e44ffd 100644 --- a/vnext/Microsoft.ReactNative.Cxx/UI.Text.h +++ b/vnext/Microsoft.ReactNative.Cxx/UI.Text.h @@ -8,6 +8,9 @@ #ifdef USE_WINUI3 #include namespace text = winrt::Microsoft::UI::Text; +namespace winrt::Microsoft::UI::Text { +using FontStyle = winrt::Windows::UI::Text::FontStyle; +} #else namespace text = winrt::Windows::UI::Text; #endif // USE_WINUI3 diff --git a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp index f70c415db44..970c35a5ddf 100644 --- a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp @@ -5,10 +5,10 @@ #include "I18nManagerModule.h" #include #include +#include #include #include #include "Unicode.h" -#include namespace Microsoft::ReactNative { diff --git a/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h b/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h index ac495d3b81c..6c3e1f0e19b 100644 --- a/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h +++ b/vnext/Microsoft.ReactNative/Utils/PropertyUtils.h @@ -310,12 +310,9 @@ bool TryUpdateFontProperties(const T &element, const std::string &propertyName, } else if (propertyValue.isNull()) { element.ClearValue(T::FontWeightProperty()); } - } else if (propertyName == "fontStyle") { if (propertyValue.isString()) { - element.FontStyle( - (propertyValue.getString() == "italic") ? winrt::Windows::UI::Text::FontStyle::Italic - : winrt::Windows::UI::Text::FontStyle::Normal); + element.FontStyle((propertyValue.getString() == "italic") ? text::FontStyle::Italic : text::FontStyle::Normal); } else if (propertyValue.isNull()) { element.ClearValue(T::FontStyleProperty()); } diff --git a/vnext/Shared/Modules/UIManagerModule.cpp b/vnext/Shared/Modules/UIManagerModule.cpp index 48eda8d068a..2c041985795 100644 --- a/vnext/Shared/Modules/UIManagerModule.cpp +++ b/vnext/Shared/Modules/UIManagerModule.cpp @@ -9,6 +9,7 @@ using namespace std; #include #include +#include #include "ShadowNode.h" #include "ShadowNodeRegistry.h" #include "UIManagerModule.h" @@ -248,20 +249,24 @@ void UIManager::createView( std::string &&className, int64_t /*rootViewTag*/, folly::dynamic && /*ReadableMap*/ props) { - m_nativeUIManager->ensureInBatch(); - auto viewManager = GetViewManager(className); - auto node = viewManager->createShadow(); - node->m_className = std::move(className); - node->m_tag = tag; - node->m_viewManager = viewManager; - - node->createView(); - m_nativeUIManager->CreateView(*node, props); - - m_nodeRegistry.addNode(shadow_ptr(node), tag); - - if (!props.isNull()) - node->updateProperties(std::move(props)); + try { + m_nativeUIManager->ensureInBatch(); + auto viewManager = GetViewManager(className); + auto node = viewManager->createShadow(); + node->m_className = std::move(className); + node->m_tag = tag; + node->m_viewManager = viewManager; + + node->createView(); + m_nativeUIManager->CreateView(*node, props); + + m_nodeRegistry.addNode(shadow_ptr(node), tag); + + if (!props.isNull()) + node->updateProperties(std::move(props)); + } catch (winrt::hresult_error &hr) { + throw Microsoft::Common::Unicode::Utf16ToUtf8(hr.message()); + } } void UIManager::setChildren(int64_t viewTag, folly::dynamic &&childrenTags) { From d0f1351aaad3d2df8655f32e3081d806cf13902b Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:26 -0700 Subject: [PATCH 17/32] Playground Win32 - start getting it working on WinUI 3 --- .../Package.appxmanifest | 2 +- packages/playground/windows/playground-win32.sln | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest b/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest index 82daaab3b97..d0507079eb6 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest +++ b/packages/playground/windows/Playground-win32 (Package)/Package.appxmanifest @@ -1,4 +1,4 @@ - + Date: Fri, 26 Jun 2020 18:29:04 -0700 Subject: [PATCH 18/32] DWXS header --- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index fceeed86f61..e851d0ddfe1 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include namespace Microsoft::ReactNative { From f61d5976ebb868d4e166e4547736ba8d288fa956 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 22:45:31 -0700 Subject: [PATCH 19/32] create separate 16.7 packaging solution --- .../Playground-win32-packaging.proj | 2 +- packages/playground/windows/playground-win32.sln | 14 -------------- packages/playground/windows/playground-win32/pch.h | 1 + 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj index b9b3bb7fada..93bc1e2666d 100644 --- a/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj +++ b/packages/playground/windows/Playground-win32 (Package)/Playground-win32-packaging.proj @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index dc4923da27f..cb5ea341f1b 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -105,18 +103,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index 69d880ad9af..7f4e6b2adf0 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -14,4 +14,5 @@ #include #include #include +#include #pragma pop_macro("GetCurrentTime") From 9e8d1dddcdcb34fb52067b174817c0eadb4b6010 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 23:10:49 -0700 Subject: [PATCH 20/32] format --- packages/playground/windows/playground-win32/pch.h | 1 - vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index 7f4e6b2adf0..69d880ad9af 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -14,5 +14,4 @@ #include #include #include -#include #pragma pop_macro("GetCurrentTime") diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index e851d0ddfe1..fceeed86f61 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,8 +9,6 @@ #include #include #include -#include -#include namespace Microsoft::ReactNative { From 80633c20fe8915a53138d311d369a964cd1e7833 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 9 Jul 2020 14:47:54 -0700 Subject: [PATCH 21/32] Port to WinUI 3 dev nuget with IXP payload (almost preview 2). Islands are rendering! --- vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp index 970c35a5ddf..c3273869b08 100644 --- a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp @@ -9,6 +9,7 @@ #include #include #include "Unicode.h" +#include namespace Microsoft::ReactNative { From 6aeb288ab7e1ee85b3617922fed82adb857ccc73 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:26 -0700 Subject: [PATCH 22/32] Playground Win32 - start getting it working on WinUI 3 --- packages/playground/windows/playground-win32.sln | 14 ++++++++++++++ .../playground-win32/Playground-win32.vcxproj | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index cb5ea341f1b..dc4923da27f 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,6 +30,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -103,6 +105,18 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index afcac25a0ee..425ddc351ab 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -23,6 +23,19 @@ 10.0 10.0.17134.0 + + Playground-win32 + en-US + 16.0 + false + false + Windows Store + 10.0 + 10.0 + 10.0.17134.0 + true + WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -163,4 +176,4 @@ - + \ No newline at end of file From c01cbce41efeee5ec9765d70e8f9b75c3abfbf69 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 11:41:52 -0700 Subject: [PATCH 23/32] use lifted DWXS --- .../playground-win32/Playground-win32.vcxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 425ddc351ab..5e4f54f5734 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -176,4 +176,16 @@ + + + + + + \ No newline at end of file From ee02333a82dc6ca54260e7aecc0b2413e895fba1 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 26 Jun 2020 18:29:04 -0700 Subject: [PATCH 24/32] DWXS header --- .../playground-win32/Playground-win32.vcxproj | 15 +-------------- .../Modules/DeviceInfoModule.cpp | 2 ++ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 5e4f54f5734..df3854631fd 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -23,19 +23,6 @@ 10.0 10.0.17134.0 - - Playground-win32 - en-US - 16.0 - false - false - Windows Store - 10.0 - 10.0 - 10.0.17134.0 - true - WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -188,4 +175,4 @@ /> - \ No newline at end of file + diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index fceeed86f61..e851d0ddfe1 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include namespace Microsoft::ReactNative { From e2004671a22347fe0afc35c553212dacbc5d93c6 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 22:45:31 -0700 Subject: [PATCH 25/32] create separate 16.7 packaging solution --- packages/playground/windows/playground-win32.sln | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index dc4923da27f..cb5ea341f1b 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -105,18 +103,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 21c1f9e83e84a30e3fa006bee2385fed8fec91f4 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 23:10:49 -0700 Subject: [PATCH 26/32] format --- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index e851d0ddfe1..fceeed86f61 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,8 +9,6 @@ #include #include #include -#include -#include namespace Microsoft::ReactNative { From b82bfce15cc14cb3cd62cc6a3b8e090fa4bc5051 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 16 Jul 2020 10:01:30 -0700 Subject: [PATCH 27/32] guard against hresult (from failed activation) in UIManager, update reference to winui.props in WAP --- vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp index c3273869b08..970c35a5ddf 100644 --- a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp @@ -9,7 +9,6 @@ #include #include #include "Unicode.h" -#include namespace Microsoft::ReactNative { From ae97af3859cc895cec1f703943d4711c305328fc Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 25 Jun 2020 01:58:26 -0700 Subject: [PATCH 28/32] Playground Win32 - start getting it working on WinUI 3 --- packages/playground/windows/playground-win32.sln | 14 ++++++++++++++ .../playground-win32/Playground-win32.vcxproj | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index cb5ea341f1b..dc4923da27f 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,6 +30,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -103,6 +105,18 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 + {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index df3854631fd..afcac25a0ee 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -163,16 +163,4 @@ - - - - - - From 1a1197b4823ccb203db9dd3b546fc3b468925271 Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Fri, 26 Jun 2020 18:29:04 -0700 Subject: [PATCH 29/32] DWXS header --- vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index fceeed86f61..e851d0ddfe1 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,6 +9,8 @@ #include #include #include +#include +#include namespace Microsoft::ReactNative { From c9b445bd0469521c8f4365a5ff6e347c3a0ca35a Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 22:45:31 -0700 Subject: [PATCH 30/32] create separate 16.7 packaging solution --- packages/playground/windows/playground-win32.sln | 14 -------------- packages/playground/windows/playground-win32/pch.h | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index dc4923da27f..cb5ea341f1b 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Share EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Playground-win32 (Package)", "Playground-win32 (Package)\Playground-win32 (Package).wapproj", "{EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -105,18 +103,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.ActiveCfg = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Build.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x64.Deploy.0 = Debug|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.ActiveCfg = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Build.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Debug|x86.Deploy.0 = Debug|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.ActiveCfg = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Build.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x64.Deploy.0 = Release|x64 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.ActiveCfg = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Build.0 = Release|x86 - {EEC4EF0F-3DD6-4D36-84D8-E5EC3F5ED5FF}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index 69d880ad9af..7f4e6b2adf0 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -14,4 +14,5 @@ #include #include #include +#include #pragma pop_macro("GetCurrentTime") From cc1263c171f73b30e7318286995d76939b9b0d0b Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Wed, 1 Jul 2020 23:10:49 -0700 Subject: [PATCH 31/32] format --- packages/playground/windows/playground-win32/pch.h | 1 - vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/packages/playground/windows/playground-win32/pch.h b/packages/playground/windows/playground-win32/pch.h index 7f4e6b2adf0..69d880ad9af 100644 --- a/packages/playground/windows/playground-win32/pch.h +++ b/packages/playground/windows/playground-win32/pch.h @@ -14,5 +14,4 @@ #include #include #include -#include #pragma pop_macro("GetCurrentTime") diff --git a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp index e851d0ddfe1..fceeed86f61 100644 --- a/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp @@ -9,8 +9,6 @@ #include #include #include -#include -#include namespace Microsoft::ReactNative { From 5bffa82b96b2d8b7d35375fd883849296780256b Mon Sep 17 00:00:00 2001 From: Alexander Sklar Date: Thu, 9 Jul 2020 14:47:54 -0700 Subject: [PATCH 32/32] Port to WinUI 3 dev nuget with IXP payload (almost preview 2). Islands are rendering! --- vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp index 970c35a5ddf..c3273869b08 100644 --- a/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp +++ b/vnext/Microsoft.ReactNative/Modules/I18nManagerModule.cpp @@ -9,6 +9,7 @@ #include #include #include "Unicode.h" +#include namespace Microsoft::ReactNative {