From fb46337f985a35477107a0729df1d68039f76db1 Mon Sep 17 00:00:00 2001 From: Mikael Karlsson <43226266+Micke-K@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:24:27 +1000 Subject: [PATCH] 3.1.7 --- Core.psm1 | 13 +- Documentation/Strings-cs.json | Bin 2383436 -> 2397440 bytes Documentation/Strings-de.json | Bin 2527304 -> 2542156 bytes Documentation/Strings-en.json | Bin 2263136 -> 2277060 bytes Documentation/Strings-es.json | Bin 2540694 -> 2555466 bytes Documentation/Strings-fr.json | Bin 2544632 -> 2559176 bytes Documentation/Strings-hu.json | Bin 2504608 -> 2518624 bytes Documentation/Strings-it.json | Bin 2540114 -> 2554880 bytes Documentation/Strings-ja.json | Bin 1887392 -> 1899916 bytes Documentation/Strings-ko.json | Bin 1856500 -> 1868666 bytes Documentation/Strings-nl.json | Bin 2474902 -> 2489160 bytes Documentation/Strings-pl.json | Bin 2499582 -> 2514094 bytes Documentation/Strings-pt.json | Bin 2263136 -> 2277060 bytes Documentation/Strings-ru.json | Bin 2455886 -> 2470556 bytes Documentation/Strings-sv.json | Bin 2331442 -> 2345538 bytes Documentation/Strings-tr.json | Bin 2379232 -> 2393258 bytes Documentation/Strings-zh-chs.json | Bin 2263136 -> 2277060 bytes Documentation/Strings-zh-cht.json | Bin 2263136 -> 2277060 bytes Documentation/Strings-zh-hans.json | Bin 1686844 -> 1698534 bytes Documentation/Strings-zh-hant.json | Bin 1705536 -> 1717270 bytes Documentation/Strings-zh.json | Bin 2263136 -> 2277060 bytes Extensions/Compare.psm1 | 18 +- Extensions/Copy.psm1 | 10 +- Extensions/Documentation.psm1 | 10 +- Extensions/DocumentationCustom.psm1 | 173 ++++++++- Extensions/EndpointManager.psm1 | 210 ++++++++++- Extensions/MSGraph.psm1 | 530 ++++++++++++++++++++++------ README.md | 47 ++- ReleaseNotes.md | 23 ++ Xaml/BulkImportForm.xaml | 19 +- Xaml/ImportForm.xaml | 36 +- 31 files changed, 907 insertions(+), 182 deletions(-) diff --git a/Core.psm1 b/Core.psm1 index b512a53..ca6c3ec 100644 --- a/Core.psm1 +++ b/Core.psm1 @@ -12,7 +12,7 @@ This module handles the WPF UI function Get-ModuleVersion { - '3.1.3' + '3.1.4' } function Start-CoreApp @@ -914,14 +914,17 @@ function Add-SettingCheckBox function Add-SettingComboBox { - param($id, $value, $itemsData) + param($id, $value, $settingObj) + + $nameProp = ?? $settingObj.DisplayMemberPath "Name" + $valueProp = ?? $settingObj.SelectedValuePath "Value" $xaml = @" - + "@ $xamlObj = [Windows.Markup.XamlReader]::Parse($xaml) - $xamlObj.ItemsSource = $itemsData + $xamlObj.ItemsSource = $settingObj.ItemsSource if($value) { $xamlObj.SelectedValue = $value @@ -979,7 +982,7 @@ function Add-SettingValue } elseif($settingValue.Type -eq "List") { - $settingObj = Add-SettingComboBox $id $value $settingValue.ItemsSource + $settingObj = Add-SettingComboBox $id $value $settingValue } else { diff --git a/Documentation/Strings-cs.json b/Documentation/Strings-cs.json index 2a50d9c67a0ff099bc72b30bb1a7d817a37d67ce..48352b00b619e66e13a390aeb014815b4307b25c 100644 GIT binary patch delta 3565 zcmX@JXCh<6s!5C+itO6OHp{n*ZB}R(+pM@iy3RCKx9NGZDpF7puIV3w1zD!Qc*)GeSUi1yn|$DO zfkjLq(-%ZAvTznLBr+s1WHKaA|0pjjJAF@%tjY9%JMt;hCmdpD;V)&#VMu34WGG_D zWJqMlo1Uw{BtCspj;tL-%>xxKmgxtWxmcw07*ZLE8B!U788R7i844J37%~~s7%~}B z8B(S*YRSqoR!tXN!6!WZ&<9QzknK^^;d%vOdP5jMj!9w2oNhRQM|?VumaGU*2~3QE zmvQ=na~w#Td5akG84?*vpiYa`XOf)Wqb19QEKWRnHtLAJ>5`GR(bk7BUypzr^;o$z*b{Z7z|e!08vxmE6XNd!jKPkBFLc# zf4DLfGk|4~>|P+s&mx`4kOx){vKyh?jUf}+N7F${MT;0x8S=osat8Y&ks*a4aeCr< zA<^jqCbA;a6(VF=rq45h#W+Y0FG7zSL(%k!3z>zd=d2gvf@o;SmUV%+yzZhr8+#E$ zF38;J7tLfPr>pJcvV+8aoGud^Ybrx3L-us*SXs&GCxn^ZrW<@>3YmU^jfq7#i2-Cs zIZ~W?OrIDhD~gC)RV9WDhEfJlD8rK{l5$^$L0{MtL(pM6-|#Td+frMHZA$ z%OFV=$(cS3`3xltmFS8y8A`yu1DOrZc*t6&7pBV!BLZUjgvG*a+(iuK45A7UGc8`^oa>9(*q_baS5ZQivUm}Msh;H1SK}}2_-huF!wL4p^gNgiDj$YhvUB9g`^h@OTh zQ5MB~NCE-5oFNa%pFs?z47s2fMsgWQgJdZ~F+(vn%ZH|fAEE@5KfsXyQYb#Xrx2xx0huKZNhy#L z#FrtJp#oH(GUQL+=qal@eSxp66U4tDwW7#sgBd_PaIOTY4DgT@n(pHxYlcuR3yRhh zjKV2_v5es*N|_^2EzZK4!H~$1IX%{s$roY*NKmnqp@<7~J5OIN-yj;_> zR>^QpU$jitYWjyed~(wd2=TM9=Q0E{lrkhuXS^b(IsM2Y9---ZVVrE!#p*c(7>lPb zoWm|W{hAS@%ftk>=>qi%T+@}-$O%m^D3WHIUa(D$XL{N@eu3$)#02=J2e`5DP5a8l zGTrAGBOiMnI48fHzOYDCeEPJn+(OJL4EfUyqZmbX%NP_Gco`pp>&Z+81qM)tD`I#E z&iD!pAlYBwXauzp6s8N7@d;1A62_`Aoo^|x(6osh4qy*4XEKyeFEkYpo*uPal8aY? zA&()EK>=LgCQaYiBBeRKAx_i|taQ4-bpaN};^~gl1;nSztQ6*&9`u7%X!@u5j6NV= zfog*3AEqd?3A=)$sf3}DA($Z*oc@!i%V)8RB55)T5s@O~)9GP575JtnG|ID0H;G~t z;syB#?%(N*T5`hEFMMKU;fDA!gQ1cEr!T=y=L9tv7g7oU$B}^x zC#r8RYAA_M|M!wv0F=cArX%DR+!o+s&Sa>Xe*dhvEM{wTx`8_@&-AD+C7$U!tl4=W zVYOrqJF*cMt}yXUPjQu(n!c-*n@brfIWm+oC@@qp6fi&{6cjC~3|R~*(;dsC#it+9 zml0vkV#u7{zgSLwdYGsr-*km!Mz-lD-K=8M11w}XrmuU##xq?26n+k0lzgU75M+^< z4zf)Y)DS9Q0M)^e#sVmDq)b2Ps-ix95vT}5_z$Ff`XOFPq3Ly6DqM_-)6cr9NTVs5 z+#tvz4ymy~jTIM$RE9K$L`m>#)64M*1l~|^?oM#o7e#cdX zXS#uj6eML&SCC}lnf_xpr^56Cb9MnxaU(=p4#Sn=_(3TVlIlRghdb3RuxI6%KEY8% zVfwv#4z}s{QusJT^H3^1?jhFu5(jHNEJ8tQ6SGDU;0G05`;Fe!1QYr5>ec>cV;pt0s73`)PC^Jj6ds!-P_p(%BQUw4~ CaR*KS delta 182 zcmZozHHq=eo{5YbitMKE+s()^t(%RleZvvv_64(5iY|s$tQuFmV!k|Fhq%gh`bG4iF`3b3D}3=AZ1Wu zuwqbPP+(AEaAg3=&fTnOL|>Kq&y4>=OUUAw{B~5yIYTN#I>?ymGa2O-c@-Em7@QdL8L}C28JCkpso?1vkW4*mD^28Oj(Er?1aplAPXWj1mtZ z1^f^Nsc`Ez<}e9Q&&y$AoBq#Oo(&N%(?P1mAyEs?q71$asSFjM0*WDjdLxg#{B$Kj zd1y)osTD<58w^eqnGAUlmH)Wq`KCYMmp6k19Y{GhD7rw!3@92t21|=h&k>d9LbBiC zrvw{wB17i%=lM+j5Pc3mC0Jxj8HyOPp;;f1WkVSLfW#45c5(qDi*7bJ=0JrTIN>1W z+fW8%xnfXOoo*TZ&soK8 zy227xiRm9W**JJ1X817VGo&-*gLO|Ac*4apy=;LvAEVXukNqst;Di8@m3LP0MQCLP zr5nXhOrp~RK5_A3vGZd;i|q82`SJqO_Z?Lhnr`Q>Vg%8BU>i3NqwDmEV$$l<6TG-t zrW*)x2uxqYCe1bdTR5-K^arz5c%~cKunA4Sq0hlHJwlg9hQF9Wm%)`mm%*1I5uAAz zeq!;R?y!M{W%`4DX0GWhy(|*b@1)CeOnf{en3k+w=`x z%q-lV;F>IvA(^3M@jiV*{0uMk>;7+r^3%QT}DQQXL`{+1&Qf?7x_7+3)srC zO+WWWL<+<5L#%j9L7ek+EXZ+f1VDBE<0&nj%(Vc^W0!;r|3 zKK+&CW00~a7L8&elFS1a1RytaL);9B=81ufqSNEvvhz&0 z+abq+mJ>MPIbk}Zx~%)e1TK*N=|S7&q^4icXJ!MZ55}_T2OC&jCng9@Kj10E!y z45mM<7m!A8HySjsvP_TJ&%!bNpCAj{bPF3cp6Ovbn1!Y<%I6oGzQ>$L3Y1s`rZ3nh z2+m9j`-Iu1m8)@0cQ~vdHC>^eg>BMxj_D7|@N_v}HLdAWgt#T9^UPxvnO?xb$Tj`l5q^>B2j+-5fKmd?Xi-o*rvTh) zOa!;gKm}RKbiwKJy3>m)S;MBo6i!x>5}H2ms4Ca=eHlCojK$LnD_O&*UzpFt!U_t` z;^~dAMMbBpD9MUUw~=KR;4TBFRB)c0e9=vO`huA(9@9ZJ{x-~OYr~z delta 166 zcmX>zWj5o91+y48d~lp@@R5ygx^WHDPHrVQn>GYc*kS zHQ{JA;cPYGYBk|*HQ{MB;cYeHYc=6-H4$hv5o|RPYBdpVH4$kw5p6XQYc&yXHIZmF zk!&@QYBiB=HIZpGk!>}RYc-K?HBo3aQEW9)YBf=AHBs4WqH2-U{LZocog-uWJ4dGN U?;M#=>}@ZYqq@Cdj@lhv0C2W91^@s6 diff --git a/Documentation/Strings-en.json b/Documentation/Strings-en.json index 9efa1b40becfa48bae1885704d58305d7b0d80df..bfc02a543f217e8f28dff2bbc8ce8dec5cb7b402 100644 GIT binary patch delta 3269 zcmaDbp^Ndz-!8@tdu-aX1m)VZ1m)Ya1QoVt2`UD}Ht(`&-(|ztzRQNGeU}Y$`z{-n z_FXot?YnH)+IQKox9_syXy0YS*}lt$t9_RZcl$0Ip7vcfyzRSe_}X{b@VD=>5oq6K zBiO#nMyP$4jd1%e8+1^QX;{ zW@AreNMgujNS=OihP3!}vv4-M=?5B^qNZ>7%gn-G%8vd`$&kj7$&kvBGJWA9X<1IV#Pq$Z zB)uU>#E{RB z$WQ`x$;ZXg($m$>GR^?Wu~#vqG9)u(Ot(KTEjr!oD@(=n4U4%|I1?H27%~}(88W7? zKQAplo#h;}8_2w%=?<~XEbOHWC16d4OQl7p?{1X%_AhhD309fWHRJTPpoAVp5Cwx8X+L%^61I~7(m{E7?B9m z@?o2F7|4c{=>igrEWG)U7=*g*q8cnIfh6Ti8HyQ-AyP=u6vO}(2gkzH38HN5Mc{m% zIGs^ZRCxM_z0w?D-%p(&%EF$*kk3%YkT|_jlSy)V$z4uJP5?>qL!?0I5mEyDe=02t z*C-B&J8%|b@MTD4r~s8D4EfVP9+H-we&7f+t%3{^MOGRNj`U21Jcz|564Upslj581a**8z;JeG?0}(DY@Cge9gINU*bk0v&3sR-wGobd7)V0@JNp z<@uNs8H%Pm2Jwha@ADAmm_AKdR$%(C#WEh#VP;Q%sl6CqAZ9W$ET!vtVQii1I6Q3%`Pj`65$RY^w zaxOzYC=?jd7%Cy&Hdw>!1=8AZLyn8FWICgiqB0`22!b+bF+(ClIzuXh9)kiy$n?O~ zjN;Q3TI9H^aU9_9MkhYi?U5mc+I0WeMSR+0LUeva+k4ux}deR@boz)VjR;i zY?I)a9^k;n#~BVT!iyO)r~mw>;5dE4V`hoz2EUnD7>lRB&z6;B%%2{ZBp^P0PJt2+ zECQ#43eo8wjw-T=x`N}WgrSllm?4!R2VC)%Og|{cD$MN1fTWeZm`uM)Pv5XgifwvL zi8L3HeuX=Z6%t*78jPaTC*0>}nf|~~f@k`x3mk}S3r#@+p)3Z|8}3NUfju>SiL|uH z^na^`Fj5*qUBYXA4%SSDDu&eQ6JH8Tqcy9hPvB6<#sx_4V5zee7daUbhqQOeA6dzNwG{%_$SOZJtRp$1RM{HI@90Y zk(ZyYBBmfR{mLE*5mp6;B!i zn>Z*rgG$hJ1{a1@hBSsm22eAxWO`y8yXf?SbUA_P7h>hvrmt{kgGF6f3L8 z^a6Vs^tLD@(B^<7V5KT@^nk*O71Zi0pDtLyEk8Xcj-6||4j;SFao1g%EiVRCsVrS8x_)VI)2Gk(?qy^${R^Mk`1A+7GAz>@Tshg$YK+3k!rq`vtMG%LXL^W_jM((Nz49E>ogOjzfE!Sj#i&6I uj;3UAqbe1t()VO2W>7#?Il0lue)u-0dB+c-lK=@wRu&;%o1i#oyjBOQ5}DmSB6w zETQ&}S;FldvqaiEW{I|U%o1zwm?hrcF-xMoW0qul$1JJ#j#<*}9kXQGJ7&qYcg&J& w@0caOyGJv)E?u+*dF7=)E?u++#ch^ z(jMc)+8*P?)*j=;-X7z`(H`T(*&gG>)gI%--5%q_(;nl*+aBY@*B;}<-yY*6&>rI? z*dF5~)E?s`+#cg3(jMa^+8*O1)*j;|-X7y5(H`R@*&gF0)gI#{-5%p4(;nj_+aBX2 z*B;{}-yY+nusy~}ao+stf1K1LreFBN&NBT%o4C;A9w)cyae9nWa3L<<5QbEST!sRM z9EL=OlIenNs>0JYDLPFzxXKhVUBHf+g|mnuks*m8lOcJ!pqjks^t6Xub|BfP=>lzB zZ1On_=?sYsMGTn?i41uRN(@#E3JeMiN(@d6zZh~D(x)3b3%Wv-7wB`dOfT5N#Uhx; zkjhZZkjfCukO{GRx@{)A`1Cuv@;rjYFfoQqhBUCPhFzlWXeP+QObB5Bxh{nvlc9tm zlOdlWk0FsEXZm?vc}eCHhN9^cjhKX|>v+kVf%K3Q;377&()I`pWdd+ z;s#O?1Xdwl#gNL7%#eZP8E1wJhSced@f^+|Wl_@wB6wJ&LH^BTC`M7}0uF_j(+}FJ z%?7JtFJ&kJ88*FAUtWIt5nHtx(;a5>v2mv}__>1fC8bOe}(+q?W-@3bp{8=%=qvLpEpnf*&F*{2*J(8B!V2A;wL&&t?*z z{=i-y^Thi3}p<7)7$gqWsy7yl2e7qfzl{AM3DmD zm7$mcDm(q75Yyc03hJtCq9E5ma*r=VDnkXRm|)1CzR_D=cKQoHd2r#C0#+%AP#Mes zN)(yXAL?=oPdD(9=b6617p4^C2yRexfl3lkOehA+iy}EvAxx5mHG?6MA#?h{B6(Rz zY61yzmogMFWJ5FE$6^#sAGoAgG_%3cl?l$6Ah#gGFq9z~EC2pr2a!o&TT}XgEkwF1el22z$5fGn#B}-Upnu{vO^c_aBJk!sZG4f1rTEi|g`C3`R z^ace+4^VN(r3`XbC4)1#WGP`tWJqQxL5hF?hD?Uk>G$&mM5k|f#mh0>hM8N17gWfD z{FKa)!%#Z?eh#Djw5{@7(?2kauuK)n<1o0z}_cI0#?0TBsSY;F<6FlqY2WsKs} z170(+O*gnJ?E^J}WttH)7o+R+Ko4p4X|Gkdcoi7(859^&89-59GX0^HqU7{AUpB7k zr?NRErpNIKN=)BisNe;%9jtZww`nXA)AJj+vsn1ht!0@Wu#i<~`XLwb zB#;*!?(wrs-@qim!k)_z%uvdZG~LmjQGB||Lu@qo7O8RGnq+PZ2E#0ey-{Fe(@+xzvV6_F}57L1#iu`*r_49K zC5%mMdO;`~8z=?^rnBv1@|iT1MI2OTx`N}UgrSllm?4!R2UNXJFI=T0I(^S7MS~$r_0o{3r&v-Ws?DU z2%01vbeTOswa|2h?{ZSp?@VJwc$p8H!l2Q5pk0WEHItzV6fw!X(ufA%^aImajo|(T zn=3Wl$DEIA`n3c;FHnj&z%9ZyeZwjiE^bF?>7UM!H$8C^kLdKa$$Wg%=k+TJOy96r zk!|`Wbv8MW>-c1K7!()^!1YZbxT*q|Lg4%b$^hrD@rknLF{Ci$PyeeUCqMno85NP~ z2WF^cOo!Vg2x^%WAXV*E)92ro5uI)~jg@D5+-fy3H1EOO$mlcu>{nIk=|#fgQedZ` zs&hyXVH1T^VW38Z3qvYH8bcyODMQY5!8uCe)Aw00%1zIbR1}*&&5$PwB7| zJj?V20-{2=!VN97L3Jr(`SgRw#YLxEJ>lV+zQ9$5YxLr8=a_yWUzuh4tQlf*(?5J*7n$y$$HazO(qqqr^h%l24YVXV*g;tcRQ)yH zWEG#j=bAX*^bJO`B9JHFG+_@*DyViudeU_YzObe{L(0@G(Xae~Up z>F46**+h|opP_^SR4XKd+My3s#iuVwP!yT&BCc#Vxq(S+x`8DlTl=Dks@oS$RQqBC E0Py7&=Kufz delta 191 zcmX^0XEx)s&e@C`;+&@Qols$GXZpn4&h&|;o#_*6JJTl+pS_*w6GuDKC(d@JPh9Ox zpSatZKJm0Oed29r`o!1H^ohTn>61V^(tc&pgX@m8sw`j<+fqTc#HTv9e9C3uok*R?5uQe8Z{z zh7)7^4JW4d8&1saH=J17Z#c2G-*94Uzv0B*e#42Q{e}}~`wb_q_8U&z?Khlw+HW}V zw%>5#Yro;d-+seMp#6rEVEYXxq4pb2!tFPlMA~mSiMHQx5^KNVB;J0*NuvFRlVtl1 zC#m)uPSWi+oMhT>ILWr(aFT1k;UwRF!%1QL4JSptRnvKb)Fh@a_`%LH-JnxkXtGbS z+jPHQs#0(vuIYI@)dU!er`PXM44j^DlPP4nffox4XAwgpLlQ$KL-O=QEqT%DTLjc* zOn;EW!NOn4ki(G9kjPNPkjaq9kT-p=ACvg>Ekc|QAk9(JKTP0a5zS!8WXNMkWhiDy zWe8@-WXNSGV91&No|{#4x{Zmv5PvaDj3JXDjUjV-p`oBNLOVB-_URu3<%Oraxd{tQ z{xFSYx{awk4{HfS5kum1L48@_>F<_vA=xWm#E{RB$WQ`t8G{mo6@vnU0)rBRGXq#= zI^$!dxnLJcRxzY9Br{|nsR;q|Urcvg%kBzx%ft^XoQVv144DkY3>niuCd!LX&oJe% zgUPX%GL(R{O!qdISDc=9nG+&2-Qf%i8*e&84n!YAD1-O(gXZ$G(^YKceL#BCrZ2d{ z$HtA24~EFku$A|M$QOjjvv8L%4~Ns5HCzGU=m;vEn-Mz$OAc*!5I`|42cXW42jb>+RMvN-(ex|1hKS1TYyCvrp^r% z!eBkA5Op>VFm(caN-XR}47nharW-oTOHY3?TdiqYER)3a32e+DBT^Z%k%HBop=f$x z33KIigA=@J(;f5}S=f^pKrSku{xD5me7f2XerUiMRH%SbR~}00nx8H&jR^MX4YLG5 zL6Zm$UQp1icafKzzRg|)Vg|nwLl#3KLjlNfpyW6Gpsa{EW8(D0%bd{krI5_T!kG_t z07$!kuDtm46Kz}&?b8n|Wn|$7C7?1$5}KZPP)c~ZlbzZeu#{jXLkU9$Ln+vJNb2WK zW0FRWnsv- z&gUub2G+w5O8?+EgSzTtiM-_WZ%YKA9xrfZW#KMmC}sfVOi;k=FO?Ua-tiBXs6Q+h zXJan{7YK>d4_fjFPk-Pi&jKkGJ}eh!Vb5X6XDDMxoc^#}UUqtwA1qEma{LfEP}+io znSTYy?*H6SyFqHiAyEd-Y7D*%sSFjMqK6@W`oTbX`RPx>3qUlm$gX3N#lYih^K?A@S@^TTu>>mdApYA~1Iq4_OnuXI89k==)hn@0 z|Cgu6HT|EdTHf@4`=TtJJsf>KnZMJc6OrND9Dlz%PWR~d<{wQ)y zKQKdqAKbXWRKHXtG zH_PN_0Wn}pKiF||se%fxN(N_eK~lny$dJrXf|M}>7%~}B8B!)Q+KNt>F=XeM?lGB< zk6V{Pfx#1;^K+)3Z4lC)UcezHGF^>d(PKKuOkRkYJ`DK`=?wYPYjZgzSrr&k7*eM@ zPUaI;MA8ikD27x91%@0b3DHrwkv)E50vFgYW>7*qxSm6l9jjYd!KO{GJSHzc{X&H( z%XEh_QI_d-8`*=v229{$nZChMmW$byA!WK?tf>0*0y#D=(R_wd1_g#(hI|H4+^2y( zSv6h1j!k-cKrI{F^b2#9`KAlpXJ?uIO;|Jz#iZ#jn-wLd|NE~XG+ob}nQ!{4ooXJ_ z6PWqfraMe!X5sV%S7V6`$$7$v7)a8?zW?xG^0FrAHGTwwaMI35R(#c-pi3(b;}nBJEy$TPiQDl^aYGY2@J zwg=4OfV}8Er3nB%@ zrYA+o%1sZL$1XIzhErT@dcYx8kLh)@1lTys8GOK1Q}%SlWLDAXPf`U1rXOpS6=F_d zD4ot|C#*faAduN@`o5)%Y}5H>tFcX=v_n~8dWedm2qakV9TEkH7^r*(D-d=CM@9)l zB||VnDmaZLPnZ9|E;;>zq8ta3PJvgdEYsH<65~Si*yL#$BGW(dh{{cGNay65PMV+K z?qr2TL8CLH==24f7+IzVG_eazx2j_kKu>IL?>S?@aj=w;1?+?AEwklBrVDfnvP}Qe z$I3C?K$C@S`h;*c7Dx((7YWk~jF>#8Z|D}{Vb5d$wOUf9HqP5?qbL%{GIHr48i%U(HGn5mXZV<-EH~m61BhT~? z*Vw?31UFwi72Mz`U;tH{kSZJEf!dvFx`<>4@gZCnb1H++^vpSG($kGJVQxVS4FyYK z7D-SQ0IID(?FAQxRE9K$Ld2_?cffo!p(2Z0%3}u#f`WC- zY|}q*ii(gHjNqsMRh7*74CT`|8c1kP_vug*n;xX12+jW!_H(c>7c-Ph_synt<^bcRyB|uIiHs_IdhZM0?pn)$L^q)tZa|+K3^Q delta 176 zcmX>xa}MK=<+B+#9CK8+_+#H~7xo zZt$I_-QYWKyTNz9c7yNy?FQck+6}%7wi|pGYB%^U+-~q)q}|}VXuH98v37&+;_U|C zCE5+XOST()muffoF5PbMU8ddOyKK9`ce!?h@AB;i-xb;ozALsHd{=5W_^!O&;Jb>$ hs^%k3?MIv#+mARgZ9n3~oVBIh;g;%lhg)hLMgUtGPPza9 diff --git a/Documentation/Strings-hu.json b/Documentation/Strings-hu.json index 6fe057d6376aa4bb8224776035838ffbc86503e0..a1095ec6871d8e884e2dba2fa59c46ace04adfcb 100644 GIT binary patch delta 3529 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 delta 186 zcmaEGXC~u<_cItbEOMHjcY%?kz3)A9d*6GO_P+P5?S1dr+WX$KxA(mViF3C1z2|E0 zd(Yk8_nxP{?>%pO-+R9HzW4m?eeVU@``!z-_q`Wt?|U!Y-uGUlz3;tfd*6Gp_P+Px z?S1bh+WX#1w)ef4YVUh5-QM?JroHdIYxuIASx;2nt(q>kRgrCy0Y`I#Q+tCGV|#-W zQ+tCGb9;jmOM8P8YkPweTYG~OdwYWuM|*=4XM2MaS9^mKcYA{qPkVzCZ+n9iUweZS ze|v+IKzoCeV0(j;PIvn`Ed}O;50ARGPX#iA6Y*A&()Ip_n0+A($bPA(x?mA!mC3 ze5?>GH| zfKtkIfoohWyhRN842cXSQ2PzTn1rXRq%+T$n7{&-7p-DQWk_boU{GSPVo+dEU{GRk zW=NfW(3R00WMkO$4H`TwoQVv144DkY3>nk=W97xCyYVX5Oy6)zP;UAHF(ww)5|9DY zZ4Kq6kz_V3;$z`WXUKu*V+dvNp8nBXUUvE{b9o<#^8y(8Sa|aokkm|nZ!Vt=k#z8r zXOk{r$Ol^tvL4|+SB7GSlIaIGsP;}T2xStP{-BMYjUDE`|MBwjNUr!`CC?(9%8&gxJ*ZoF5cQFhy<*MbiWCF$+)MWhpN*eU+8G3q)DnTShka zB8FU$8PjiD%S%q@m@jMx3Ztm$dLc|~qNxn24B1G*=+01t5|9c00xX=V3`rnihVtp% zN%E4@UvRKPjR48=mok8Y1Cd(%ljUWRJk#(=78DhrAO)qR!U!hu>647aAW1_|i6M(2 zk)Z(OK1h0+uAPPy77CpCV4FcYe`m-`PM>BZ2DQ84KNA~g2}2n)jpS#^OHMzrLA4DM zyat^tEXpMe84RUhqrvGI$(ue5nG7W$x#<&)#GE1F5uho`#$Civ&XCHG4l;E5btidw zegy^%1}BDmhHQphhNlcU(;0o0W>3HHRFsPul(1wAKDF7?73{=W*mD^28Oj(EryJ%nNl%xM=XZbv97v8IA_q#3 z;IN*4KZi+t`V=EEBsJoYXa;9V2499$h6+&O!;n8+(O+JEdR7oD(SpnqMOGUOP9T{K zc@UK{f$~m}U;wG)21Qs3B*RW$8zwJ_l=cqXVPp|bWXMGFRR}`{L*jHnW!Bl#57neO#KL27!{bV-rv zmso{FrcW_Zm7BgHiic(Tfmi{y=_SWmgr+a@MtAXA2I`k8h~j_LP0ghZy_Sud}`s>`6j;5mI^ zse4ub*% zC_R7-QD8`!zOaW$e7Z#hlgac8Iw}&=9UgPBF@tjS$7SrItR#6sbh^$KWxnYb%EY;* zuj*mqLozkNQ$5$$2L9ShXMXw-AC}4qPydjv!Z&@x3wfdGeh(DHKp`VC ztw=>|`UHJ8mgxbutSr-WEMfvC`QITt~m>3KzB0;2BVq7GDD z7c(R?WHKm#S_jilHw&syzjlC~Z+cjatibdQmdZNQ13Kg!U`}8xpU#-0q&a=U5eb&* z4$=Y~)AcrUa!o%~z#}ldM^FypvHwggte_I3Wcoo*UeW1!>T(>@4@{KhntraAPh&dU zInf}nasQcEB*DrUT)|OP!cfToD!_6;4Tb596O}Qvnw=39!|Tb(pZ17Muei_2H@%=p zjE@{Y{%2z0hByimCxO02(D%;D7+7o9RVD;$qVkrZIC&-yqE>G<}<&pcg1fG;}kuh!-=sFr+f1 xF(fj8dITj5po$@xA#r+PpOWx&m3yob)4MDfZKgj6Wt3>|>sQ_0*ROWO2mqFw7ES;F delta 189 zcmZqpF`MyH%WTFCB~H@?5>#0x8E~{0yk%}Lc+1jW@Rqf`;4NEw!CUtBg0~=X&h~=0 zT3*O4K7rd2iFL*20Uhr1Fz2L1vd%;`9_JX%c?FDa@ sw->xskyzAR>;a*xGGQs&2PAsdmH&0N3JJL;wH) diff --git a/Documentation/Strings-ja.json b/Documentation/Strings-ja.json index 2ec37b377d1297005e22cf3dfe4f448dd75815bb..b280aad61629dc317f026af70452e01250eb446b 100644 GIT binary patch delta 3358 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 Lw!i3>p7b36oZ>C4 diff --git a/Documentation/Strings-nl.json b/Documentation/Strings-nl.json index 6254fcf10539dfbf9a656ff6757498af3ae53604..99f475f83c4c49d54c475eaab36e732e0c5e7e12 100644 GIT binary patch delta 3506 zcmbQ%KArKzx9N-VwZ{gIPI z`y(gG_D4=q?T?(K+aEc}v_Eo^ZGYq>*Z#;!e)}UQ1-1RtWyBS^CcoRwH+@|MpV;I* zm))kveN>SG@%W}MP-bSCzQR|5hp~8i>=lK;=>jL1LZ)As#lpf_#E{64#E{95Jbhw- zob>crZ`tiYvQg7NC~~l7&=23Kn_b`$ejM3gI9d|t!O!s>6a?xe5P;EWK98E#9PFW&ydJa0&&@N z%NRLXB-eusWUpdKWk_bonC{piCy$Vu_<=gHc5NBaXT}+lMhD)(X z7c-PF(v=EPxvEXh1FVu;i6I>nK@7PJ ziPPiDgvF;nJI4l15q#HJID}IfvXNZw4oVr*>nHNKg55q@&XA2gi2>xK^65K!B-wH62OTEl#{qi7!tuDo5+wi{e704>~t-5rWw=Y zCd#qN7Jz*RNmqzu=*5u8P{5Fg6eu6c1Xwup!EOMVqCG`U8f?ns2^-nOOBl*9Lf?lW z6%qQACv0R9%w#A5yB3m4K&HH(Dkll|%k&4qjBMOR4CM@|4Cx@_rVDn82n!Z56f-C= zXfQZ2^@0nR z>Cy9%93oi^idV2BL0Q0;A(f#5R7^4CPk&e|Cp~>iEi7$=%o2s94oH>^2J6gZ$b+an zP$9=NJ+4O13=#q$<=mjCOM&Fz>H8by#HX9^vCf!YFjInsHG?6MA#?iDEGB=5dXOM@ zDMJxMHdOt?OeRqzuPn$=Vd2jPM;55ygLow|mq~m&-x4{t>0i#NT$^4uOOb85+*cK@ z>2Lt_TQw1cae^8ZSV+WPL z;F644Sa|v$6K;;_J-Xst(;x5%vP|E{EXp>$ZV@Bf^jSXKeADk0b4g4-;T|`=!HLCV zdct}xE`(>Yp{ZKhw?q9iqa!agoGU5Hse4EYS{4EabUfj2`wLjhI;8Fi;Sn#l@-lR`Q} z{&dC`WoLwe%;3}$FDfaV%7EQLF#UN9i42Jhxk&m8vK6?PT^UlQ3!V^BomMBrGF@S^ zIGb=jLmGnuLlQ$OIER8FPGR~(RTG~O@E;x#W(#ziW1xOOVuhO)BikUHB(AID}Ie zQW+E&iW#!NH7_U=VDb^JkckN_(;IHd@l1br zScZ!+b$Xx(OW^drRs0;BMGUzN!3?DgNz(;u8I7ku;NoGKUdE&%F#XnHae?UvX7k!j zS74UsnZDqM90y~`^o5gURHrLEW#O2fl_~&nJ~uRVF_bXqO)pdu6`uYin^9!CL%#^y zbiHB@4na_j0CIIILk>8G6{hn)77(Al;V2^;e>u3k$z}lgBatCx`o}I7;pq-5d0D2v z@>G(UULh|gHa$T>jAgoApaREqpL4=|)5RXM3rtUQ5fqqSw?xnZ>^kO5hVto!FJy(M zzX{^xna(3DAvB%CNStr_CM`~>=?69n@k}!ogL)*OjD=;oL7ytibQf<0k?C(Vn53q6 zlrZv5ms+jL1B+fzIX+#lPnAv76r43!MQ3?L7Hngk`&7v2;WM$^ieH=W;yS(5&q zpB@175i2Aj6BSj&rw82U6`Fp;i%n$ui-Qt8)7M;<;DIMLzUd1(L@|QHt5T7}d9<+Ji|x`Tr!pCNnt z$7*&_VyxbZm#JUR0KJu&pD?cF#T03quTVmr7{B3a}t%jrax#DW}E(D zA`6!&s7+JA0IHB74Fgbi{zz3u1eDd2rZ>bgu}FgI z1W zH!zFIG3PUsPoJnGDmp!-M_gpO-F^k0=`4?Ugr*;eP~@1tEDn-P1*SLrVP%c)+GS;eQn6PM?h-l8imgj5OL<5p0a zKJOqm$8d-C7HGNa6m>8=MsA`*Dn9eUg-Jn{*2i$*BFJ?fA7zR-7 ok_>JMrXtlap3@sosfbU1BByFMeZw0@nf6c9RknYcuDV1U0EIFj`Tzg` delta 196 zcmX@{Z93z$_UVipGMuJ&332mGKjyEbH2K_nkLd}|SyAFn677d>NVXrkA=Q59hIIR(8#3*OZpgMDx*^wo=!Sgz zp&JVAhi)jgAG)Em{m>0%wf)U$PVH$*1?o_Cyut9{9NmF-K;t1i(7 E0Kf@kU;qFB diff --git a/Documentation/Strings-pl.json b/Documentation/Strings-pl.json index 6c8013587152ae3d7ae1bc6f811dee4c54033303..53dff3b47d1e6e61bf8ae346bb3d59b861c2829d 100644 GIT binary patch delta 3417 zcmex&docY>MIPtzZqBzTr4i(BuYI7S1AuM1~}WOors?jPv9qr-wzeR!mdnQJOAb%gUmf z!;sF9$WX+P$&kp9$DqVu#h}2Tz@Wt7#8ArM#0Zfqo*o#@S_{^5VFDM6a3(_@Ln=ct zLn=csLncEmLjgn1^#1QmqSLLG$_WXUG88ZrG2}B8GgL7oGgL9;PoJpI>k4vC)O3Y* zW)}Gj280123?SE~Fk~{6Fk~|1GvqNOPIq);5}xj`RE~$g1S(s}kjzlYkcDaxn{qxw zB3K)$%bgiA81fm47|IzE8Is{H=L9(=l_8lSWBS7@a^kR1P>}{{&SWTN$UySE3qvV` z3nSdyD(s~UC19J?L_f7rvv zhN2)CqQGsvTm)EwgEub=Z!tp&*w^6TpI&%PP8w`HIIIt7v$9C%G2}t5K*Wt3LngBG zl%^jzq0Azj%8&7ZVW}!1w9#s zr_b3aCpKMUlbj1!l|!&B3wtU<5koFR;`G8V{KC@@Y?0$ZIP1X!7B=QohV1DdZy>@^ zX<9lX3wsg+$n^5*`nTj{;TkkE7)lxPa3r&E21&+rhD-*Keem#B;sqs#L~!6HGUQF) zxDCl7{w#(>h61o3!D(>1<~^i9bOqSHg7S*ySi8Biz6GJQg`D2r$*Lpnn#H19Zp6L%Fu=JdqH{G!tpcFPG( z-?K~34IBvy-YRThEt1Gu0>GXtVE~CG!nMVKbzHc@#G;%JiZpPF0eJ$EVuBb-8FEn* zwbJwhy38!{#SF!e@IXrbLEzk5$&kf>h?40F4;Vp338)|e`8@t0Qc=QL%#g#7&rrsY zI9>YK+1DnKO_L;m!_BXY{q51oW2-3u&C zETWKDhbRpOr-4j{Jdi@usVhVsKv57i9i)&O6h)vi1r!y!=a8fMz%dCH=0t|f>55rQ zfuL}kT=0Q~yOg1bAsdp-rh9)t@)&<9LpC^?KqXctL*n#@d$@%;6CwGJA$z*xd)4ZR z31ZU=bQnFRzk8y{HvP;2Rj%pl+Ew$WKRCt0GTmUKEX(w?I3=y=0R@UI(>-R(3rzo@ z%EvN&M+&pV^a-mtSeSDdQm0=$#3#&HIo)uUiZX8jLq08oORM5bqj2-!_c;F^wPqz^+rLpnn~l3{)fi45rsPK=)!K*5?low0#Y zoe63ncNT*JIO@|G@~1!iz~v1yjTw|i8Yi=hPH)KLU}4Q?z;p~BNN*lPB108JIfEqQ zbi4n|LDS{hnFSbKrwiVYQlIW{S)7kIhoO`qi9vxOl_7v2TcD_P8GvD-Qtt=AL-vvqXO=oFf6qwGog4+S)m;!x1w&@29nOV3!!8KJPLo!3j zbj4gbVNq9*kqpTUpaMmKp#+?*^Cvs1ica6+#w#?vphKE%I#U~y+;o5I+FmC#PmCzEPT`1MAd|*bFAP7`$0fio@e@jZdNYF^67?mxMD$W2bI^;1CH>s zu;(%agTi6@!7xVA=?c6mBGb>rsc=l6a*RV}`mB$_V$%cWF!4YYI?

|`8Dtt227223sraP4Ls7;^L z%qTJagPF+*pfqktYBE-T9%Frd#9mSO81wm~FP-6vD zn&dHjW+s&6NWT7A;#KWG+PzA~p z(;ee@B(bysB_yN3`7)aUQjJzIGcfXg6->4gdk!qWqIMOdcau~Olh-msfr zV0zkSS-I&A(PC=TtNK~Iro(Lz1+`HMz>Pkb^HLd7raOwW$xnabC?o`Om>fJ2!?iK` zOgDU|D$R=$lG7hL3V{O%MFX2Sq+$cLJ6sr28PXUM8A=&)7)qv3ELV}7E^vvLkGl%o zE(RyH=@V-ig{NygmjtKE3DZSbrW>3W5yKL&T3A93RP{3FGn7wP%n}uy&bCfjVtRp; zFxT`1CKV&b;_0&7YT45pt}?StKX8wQWBQX%VtSJUrm;=uYGV?c{v(@*XZkTqHX&TO z5IGelZswGpexQ<#Kq>^)Y11!Mv$9R!!=@%TeL^=g%k*=CYJ8mVYGwMzIQih|4t~-y z(+ds@a!p?%!z?y^%{^u@c2EN@ogs7j##j8{!W@*H#fuqG!jJ(}NhC8QPCu9-BRsv} cDl5-)CmW`K>2~iJx!ON`QQ7|Ciz=T!02Aif_y7O^ delta 186 zcmZ3tb0*`z<1-jHoN}JtWyQ_Ye&jK8`;o^i?MEK7wjX)S)_&wMd;5{c9PLLQbG9FO z%+-G6F?ais#~^jQ?MEK-wI6xR-+tt=K>Lx$g6&5h3$-74EZlzNu}J%o$D-{=9*eaf zc`V+3@&itR@pE43ea uti1imV-+RA<`d5CC!87EPdGDeKjF;$ZvONKj4EvHb97a=&(T#A(gy(L6Je?V diff --git a/Documentation/Strings-pt.json b/Documentation/Strings-pt.json index 9efa1b40becfa48bae1885704d58305d7b0d80df..bfc02a543f217e8f28dff2bbc8ce8dec5cb7b402 100644 GIT binary patch delta 3269 zcmaDbp^Ndz-!8@tdu-aX1m)VZ1m)Ya1QoVt2`UD}Ht(`&-(|ztzRQNGeU}Y$`z{-n z_FXot?YnH)+IQKox9_syXy0YS*}lt$t9_RZcl$0Ip7vcfyzRSe_}X{b@VD=>5oq6K zBiO#nMyP$4jd1%e8+1^QX;{ zW@AreNMgujNS=OihP3!}vv4-M=?5B^qNZ>7%gn-G%8vd`$&kj7$&kvBGJWA9X<1IV#Pq$Z zB)uU>#E{RB z$WQ`x$;ZXg($m$>GR^?Wu~#vqG9)u(Ot(KTEjr!oD@(=n4U4%|I1?H27%~}(88W7? zKQAplo#h;}8_2w%=?<~XEbOHWC16d4OQl7p?{1X%_AhhD309fWHRJTPpoAVp5Cwx8X+L%^61I~7(m{E7?B9m z@?o2F7|4c{=>igrEWG)U7=*g*q8cnIfh6Ti8HyQ-AyP=u6vO}(2gkzH38HN5Mc{m% zIGs^ZRCxM_z0w?D-%p(&%EF$*kk3%YkT|_jlSy)V$z4uJP5?>qL!?0I5mEyDe=02t z*C-B&J8%|b@MTD4r~s8D4EfVP9+H-we&7f+t%3{^MOGRNj`U21Jcz|564Upslj581a**8z;JeG?0}(DY@Cge9gINU*bk0v&3sR-wGobd7)V0@JNp z<@uNs8H%Pm2Jwha@ADAmm_AKdR$%(C#WEh#VP;Q%sl6CqAZ9W$ET!vtVQii1I6Q3%`Pj`65$RY^w zaxOzYC=?jd7%Cy&Hdw>!1=8AZLyn8FWICgiqB0`22!b+bF+(ClIzuXh9)kiy$n?O~ zjN;Q3TI9H^aU9_9MkhYi?U5mc+I0WeMSR+0LUeva+k4ux}deR@boz)VjR;i zY?I)a9^k;n#~BVT!iyO)r~mw>;5dE4V`hoz2EUnD7>lRB&z6;B%%2{ZBp^P0PJt2+ zECQ#43eo8wjw-T=x`N}WgrSllm?4!R2VC)%Og|{cD$MN1fTWeZm`uM)Pv5XgifwvL zi8L3HeuX=Z6%t*78jPaTC*0>}nf|~~f@k`x3mk}S3r#@+p)3Z|8}3NUfju>SiL|uH z^na^`Fj5*qUBYXA4%SSDDu&eQ6JH8Tqcy9hPvB6<#sx_4V5zee7daUbhqQOeA6dzNwG{%_$SOZJtRp$1RM{HI@90Y zk(ZyYBBmfR{mLE*5mp6;B!i zn>Z*rgG$hJ1{a1@hBSsm22eAxWO`y8yXf?SbUA_P7h>hvrmt{kgGF6f3L8 z^a6Vs^tLD@(B^<7V5KT@^nk*O71Zi0pDtLyEk8Xcj-6||4j;SFao1g%EiVRCsVrS8x_)VI)2Gk(?qy^${R^Mk`1A+7GAz>@Tshg$YK+3k!rq`vtMG%LXL^W_jM((Nz49E>ogOjzfE!Sj#i&6I uj;3UAqbe1t()VO2W>7#?Il0lue)u-0dB+c-lK=@wRu&;%o1i#oyjBOQ5}DmSB6w zETQ&}S;FldvqaiEW{I|U%o1zwm?hrcF-xMoW0qul$1JJ#j#<*}9kXQGJ7&qYcg&J& w@0caOy2Z8@DYy{V^jq<&0_?>M zAq!j?g6RjYGqETaGn6pogPjF(9Ku<;ERHNrEOsomC{7cw;b-H_11m3P$e14O zgW^X48-5niB8F6kJdo2FoI$Y(4%@`(jOuc#(@&_%IYF!jspLhdbYm!*zHvIU@N^z^ zIjQL}(Q+;jWp(Ej*jS4gav2h**NX~>PSZe16Z4E2*;rE(R&-Im)o&M)LZf9NMCI=#$X8k*ifvizkCc_`^^p+8D2uG5xd<4gpHF(@@UYRf4i zB4B!7kQ|$Q0oZ4dgop?-eHMF+0Naovz`~gib_~d{^iVljB*Pk(39=}Hl2aKZK_Mjz zX>hXeX7NA?e~ z)ARJ?c%}y(SD7_Qie-AkTP8MUP^1RVU>0UXN{=APd6J@RqNNP!45iTQ=LF6*RScQa z|NHQZPQMq##4)`f)RJLtoAdtaW-q2ouPyxd`7) zZ;V9=w1f~QHqK&(Vvs)=@}?)op`^hJhnU$oi@>D~D8TQVqLeoVt;{T(ISly>WekZ7 z+0#EJ$O$tWu(%;*K9CB2hzd|T28S<59dbSgsS$^y0Z4B4Wk_YH0F`eH`O_a-%PCHe zvV$dIkXlh>wZRM^UM52xM5UIc9N+X^7SK#P9i*Ha6iuK42^1Ugi6|au_^rain!%9B zkU9NxB$F>B%s_(Nr3^(3*^ts@`uY?UO$Em#SopKSF$O9?A%5yjm6MImj6)%+x z&fvnPgdve3nV|$J-O939u$ZyfvRHtPv|_Piu?FWQCl*k8c4o1jesChA`1E((j6y66 z7(^7NPdFnZGM(cv8{hN*dr_9@b0l~KreE;mvYVK|1-6eDVxJE~K0`V~{`C8g1m&k6 znaC)DW&|(D8e-;RU8e_RC`nB}Fp-Om8I*zouQQ1%lH)uvW*ZiNBoi+< z%5X8eGNep5%wbWTF7TX8t)^_!NUz&HKSe@2<<3Pv{og!s4sIkXrcX@f5JfVc*@nepdf*LNX=YHd(dfe>I{k&SipcbPQ@BM$ z6&QTMC5jV^0t4KP>4whi&Y++MSv+0Hlu=^3!c9J|=>;t^9Mhw+RE6L!164B97jW@$ zOqVNW<(jT!#+v}r2dV(3KWN}*Vb5gx=@vxh+ z*sv%tAcev7cbtq|(?3eE+WWt5(NEQlGD0_}fG%1&Q0 zS43#~yfj8BQB#%}1|e54fel64Sk23TW_(vly_Luo!?- zq3Lu+Q9k|28~9kJ*NH1|On+0(!#7<*NZA6EIwTY`8Oj-az^##Nq(rR9;>hC7V$EX3 zVlchBnMrc`B3~A%=^wsvu}ydQD#JImN){YhphA55JXuw?=}zm}Mff$a#QpR<8Cfq- zIKkD5x`Jc3grSllm?4!R2i(dinZB@?RT!%Y{Gilh%VNsngdRGArYt%P3JjnmZv}2C zSx)~rQBrvNzCJ~^=}XcW#ipN|BPut&>;bn3S%EXXAWV>D`T|*17FKx7icg<#gq??A zGVgMfaYFI+^ef(sBHTzJG`+uoNqYK)5@}dS@~~zyR57GZ7wiy~Mr(#n-;lw|GhN1t zpKJPqUF;&$Tg=%6rcWtg5`*i%U@6QteS&}@*K`wm1*vK3EG*OGHpmK1e>Fpij~6Mq zv)F=jB%|f@gCCVdr#B=rvP}OppHYU@j>UwX6#oC8`jG~jH=6g*C)zs4$WXkePkK*T&nXa&%OJsV75VH`Y zR?#OWWKRD`E*n8qkF-L6^1Zo0!gMw#}1ek$Al`KbnI0RYe}3swLC delta 181 zcmbR9bQat}G%KZ_vujC?$e!zZ0ED%YUi`#Zs)V(Y3H-!ZRfM&Yv;4$Z|AcU zXy>yNZ0EBRYUi^PZs)TTY3H*OZRfKSYv;2QZ|Adz&Z0EC+YUi_)Zs)U;Y3H+( z-Ogtxx9s5bIgRoX(+k|#S*8nghzd=gvx3=ea@{&9xDeNLBTZJJ=@a}|gQg#tz!WsC zPKHf7ks*m8lOdTwiNT6NfkA;mi6N1phyg4*eWMe*D@bM3bO$jG7WGnw9ENnTbS6V0 zLmrZrBnBioBy9(HxmdI_7&0017*ZLE8B!U788R7i844J37%~~s7%~}B8B&mp$(|nA zCL_w5#_)}yh#{3Bk0F~OXL{ioCP$DX;--U4(?vEd1nkljhD?SMhD?ThhCGHuh8zs@ zrXQLiBQgC;tB?c8m?*F@%0&$M42fWEs6NSNfXkryL$-<`l_8lS1IhdnhAgmHHbW+o z;twK>ETSM&GZ~6el&4Hz>%{H}aRf+_aw$Uznu(xrN?}N4C}PNAc*2m!kb-3Hh6%iE zlIh@}1DPAj;Em*z)ai`9GQ!id`endzn=&0kbugytXZgDU@<1aWn|K~W9s{~3(-<EJ|$8g~!k71?Byz!K$1N;4Qz86cv_5q&_OiAA}TArD8UfXJjW6d@ck zxqzERyab#|(E~Yi`o(E7!qay+vD<+>7Nw}fkj0S5PyqH9CLEaPIU8Y=SK6pxl+gPzrVkrY4YV zB10)k;s}TmW-}~eC}&7zNXM`z5A393hHQpJ1|0?kh9ri3hHQphhNsgPS}IphS19IG znr`q{m_rzp$Pqp%V9004L2}v#9uYS6B8C!%QigPfQfTqw1Wqnh44Ej!K*4m|*)r18 z@6D3&00nKzbdX+cbiDy!cR|cUEk?ll6Cqjy7K*UQ=R=bldT10elrrQpJV8qT1uaT! z;>8Tb7@<&vl0Flzi*iVV%3;*l1C^LXpz;~X-v_2JvMA;-Lre|dF3rsh7Cc`rQ-ye3N=}F)C zq^6%aF3vHX<)5Swb0$Oa^v2VIlGD?+DkVTnJHX4uB@Bw}N(N_enF}fuk{L>-Ukv1x z6wYKwVMt@hXD9*J$slFv(;4&Ggr^HMa0^W@m@H;DF@XzIk8$yWBr6$w81fm?8S=rp zB|*AD`L&FplpzIS0z>Nb#@)=qte~WjK3&k9*BxdEb0S0Dbi?zK;?o`Exws^C!O0cF z1q`Xv4<@pUPQNyj!v(67W%`AqQe2F#(;5HCsZS43k>s2H?vsQJJE$OqV0y$fb`f?^p;E$-IelU&yZH3HYGsb;O)&~0oW%?Z;KDX% z`bJJ^aX|%!6ow}ZMGOky{0nknp}DZ=^Z-#o2auECHcl66<&~KJ&zo6j`YdOD6eo#I z-()7@1yT*F+BiX_Yc4}DL+SL1R!ZX23p%8EroZ_l!883{kQmo=uS8zH=|zc*5fc;G zKt=!b2kRNxCVyfSntnlAiDz=aDK7NT`SD0tV7kL;UY_aGwz3K^=P^`HcMRqhogOrk zTWb0t7ZI`PeD%C+(@&(xicDXS$}KXzWhtk?bRT8`30?&TM{re?%AmlII^9=?QE~bN zS2mExKvpxBPj3{L5uTp&T#jS9gcUE(^mY2u0@EMd5fPYf)GsJDJ+Bv%sz60PIK^%> z5D=ekH&L2xy25=H7D(KHL)J)y%@15NNP-H75(Zar^pr4EG6XZEGJvX)(5{Bl1{`rZ2E$lbLRyEyOatAzGe`+mQiMKcq9{O&7c@B|KeV zi=5u%k_{qYEzGG5dD9E^B}AtSq|32P|8sjN|^ku(=_@)~y73P}Wrz+<$J>UTo-*mS7A_~(RdZY!WyZP|)O)p7g6qtU% zRDxx?ou3Tb^a(53IcSqWL3P#ibxN#k(~ZiN1pLkc5TH<+lrNq6aaQf4VeG{ delta 173 zcmX>!rJr%rvOdNIcGD-Mu<^C$Y-DcF*~rqKvyrtuXCqsC&PMk3oQ)jqIU70Kb2f6d z=WOI|&)LY+p0km+J!d0GJ%4-7MuGO6je_kt8-?0)HVU`rY!qqF*(lncvr())XQOy~ z&PIv$oQ;z0IUA+gb2du1=WLW|&)F#3p0iP|J!hkQd(K9M?KvA2mmO^WXWRbIma+Yx cEz|aYw#;$G(;t|ya<%KMQrfPwN?A++05UmB761SM diff --git a/Documentation/Strings-tr.json b/Documentation/Strings-tr.json index b1ec607e4e8305dc17f1468bd4cccaf9729f5067..6846c4e9c8a88a197fef23648fd82b7fd376aa2b 100644 GIT binary patch delta 3613 zcmaDbdm`hi&Pj|LYV6t**2uRftWjuBSfjW-VU3bq-Sh?)W`XGoI%O563wW}4O#iS+ znWg!gUHdmX#`bS^Ozq$7nA^YEv9y1)V{QLt$JYMMj=lYx9Y^~&JI?lRc3kb>?6}*% z+3~c0v*T_5X2;k5&5pnQo1H-WH#@=hZ+1fM-|U3jzuAejf3p*9|7IuF{>@Ij{hOUc z`!_qu_HTAl?ceOA+rQb#w12acZU1H`xBZ))d`9kc8v_N2=?ik$S*9mkG{`$mcUa04GW|mdGYe-CLn1>GLncG=^p6U% z;*(2uRZL${!lA-n%8hQF!`=S;{Pon$rc}FwUHA5UI!} zj?f*#0CGeMNG(I=^p8wJ!eA2w-5F9Dau`y?4Lx26o$m<{9A=Yr>`@U z<(dA&L>8P7Ql^8H^CFbHF%(S~Y-16gF11yN3!*kF45oI0EqeEPEwQg#prT=*u(##zEp22E6nmMA)>Z#XBw!e7FW!B7e| z9+EdC)1Z0dL8Pz>Kgj5EhE#@hs1g6|nZ)^@Go&&oFgP*fGh{R5GCZB$Xs(hwxnYjp zbOAdNmgx!MGHjx#QR>5x%8&s|sbEEU6(Vfnr3~o|rO;gG1kN{A44Di$(-+#wDo+ov zlXV06A_Zb9NP{%8h5)d)OBg_6i4aYh5cL;+v#==UgW?pNx=_<%5Ccdi6(xmT_|3v5 zT@23P=!#1jiWwl;u;GHJiaaQ-fC?B?Wx))Fj71CuND38m81fm)7!nz>k&;L-140yG zCO|kUOhr~Z5Yx^>!GE{&HIfne{g`Tp?({K66xB{wKyK_yi&L&kJRHzrX=XjwAhzAPJaB17i%U@s2$*#@{w>8 zm_eEL;beBv=>qe31(4hU);(QpzC7RbXVLs{tHD*p^aZiZT#T;M7p{_5pZ>sHT!3Ez zlx-MN!L>&*L+14P&soK%AGshWF#W?6K9=cHOL(NFKWGzUnXa=)&}m`<7s8n7kF*#i zrr(>%!!!LwEF<6a3z{+@FHR3&=4G24z{SGt39bth8Il=FraN{jNKOwZa9jW3yl zr{6op$HomRsd5>D8A=(FrcaEM5ug6RN``Oxl4*=m(~n({SOyf~G6_iwm=-fa~te>4s5^ z!qe;2n4`cB;w)$I0o8sC+0z?iL^XxO8B!UN7!<%wk`i!1nK}KTx`OcZ0##9#>HoNt zjiyi7!YncULYp$j^pZ`=Lesr|3i0tGMFd0Xbla6Yp5U;v5M+@A6(J=IuHZ;5VW?yX zhBix*rzhqqh)(zUDa0d+qMZTcnS79g7=^`ALqcHs0S85v>1nf+z`>#9N?J&O62&)$ z9ELv(x!_Pj3KGfbTLgFn82?O3K(N?Ez42P|Y3 z!Wou(rgP&BJW!?1oX=1`-B6cNboz{?Vj|NG*c3#jd)?*dK}+x#?UdXh`68h~Mqv7` zHes3R3R_sXrvJ+36+o>Yuw`(xWKE@9E;(I8l{soUs2-i}XU@vT4$6a|I`$&FtoZaZ zI;^0&B9%dxp#WT0fGVfr>Ax><`$MxX&-9RQOk&gR9*FQTCQfJUk#Pk{fVyqs#SAEs p!2qg{k{J@G`^PG)GP^LOPLDsX>^l8`KBG|kJT2wz^R!f)lmXJCC*lAA delta 177 zcmZ40If?PX?1_vUYV4-faImx=*u&g@U=N69Z9lMwt^L3r_VxpNINA^F;cP#!hpYX- z9`5!7dwALp?BQ)cu!pbxz#jhg1A7G859|?aKd?ur{lFgK_5*uF+7IjzZ9lL_to^_q z@%96IB-#(`k!(M(N2>k69_jW2dt}-V?2&Chut%=_z#jSb1A7$O5A0FgeqfK%z1-$1 jyY?zO#`Y>ZrtMXB%no(a|FyBOwdW-&Z_i6qu~7y9&kI%> diff --git a/Documentation/Strings-zh-chs.json b/Documentation/Strings-zh-chs.json index 9efa1b40becfa48bae1885704d58305d7b0d80df..bfc02a543f217e8f28dff2bbc8ce8dec5cb7b402 100644 GIT binary patch delta 3269 zcmaDbp^Ndz-!8@tdu-aX1m)VZ1m)Ya1QoVt2`UD}Ht(`&-(|ztzRQNGeU}Y$`z{-n z_FXot?YnH)+IQKox9_syXy0YS*}lt$t9_RZcl$0Ip7vcfyzRSe_}X{b@VD=>5oq6K zBiO#nMyP$4jd1%e8+1^QX;{ zW@AreNMgujNS=OihP3!}vv4-M=?5B^qNZ>7%gn-G%8vd`$&kj7$&kvBGJWA9X<1IV#Pq$Z zB)uU>#E{RB z$WQ`x$;ZXg($m$>GR^?Wu~#vqG9)u(Ot(KTEjr!oD@(=n4U4%|I1?H27%~}(88W7? zKQAplo#h;}8_2w%=?<~XEbOHWC16d4OQl7p?{1X%_AhhD309fWHRJTPpoAVp5Cwx8X+L%^61I~7(m{E7?B9m z@?o2F7|4c{=>igrEWG)U7=*g*q8cnIfh6Ti8HyQ-AyP=u6vO}(2gkzH38HN5Mc{m% zIGs^ZRCxM_z0w?D-%p(&%EF$*kk3%YkT|_jlSy)V$z4uJP5?>qL!?0I5mEyDe=02t z*C-B&J8%|b@MTD4r~s8D4EfVP9+H-we&7f+t%3{^MOGRNj`U21Jcz|564Upslj581a**8z;JeG?0}(DY@Cge9gINU*bk0v&3sR-wGobd7)V0@JNp z<@uNs8H%Pm2Jwha@ADAmm_AKdR$%(C#WEh#VP;Q%sl6CqAZ9W$ET!vtVQii1I6Q3%`Pj`65$RY^w zaxOzYC=?jd7%Cy&Hdw>!1=8AZLyn8FWICgiqB0`22!b+bF+(ClIzuXh9)kiy$n?O~ zjN;Q3TI9H^aU9_9MkhYi?U5mc+I0WeMSR+0LUeva+k4ux}deR@boz)VjR;i zY?I)a9^k;n#~BVT!iyO)r~mw>;5dE4V`hoz2EUnD7>lRB&z6;B%%2{ZBp^P0PJt2+ zECQ#43eo8wjw-T=x`N}WgrSllm?4!R2VC)%Og|{cD$MN1fTWeZm`uM)Pv5XgifwvL zi8L3HeuX=Z6%t*78jPaTC*0>}nf|~~f@k`x3mk}S3r#@+p)3Z|8}3NUfju>SiL|uH z^na^`Fj5*qUBYXA4%SSDDu&eQ6JH8Tqcy9hPvB6<#sx_4V5zee7daUbhqQOeA6dzNwG{%_$SOZJtRp$1RM{HI@90Y zk(ZyYBBmfR{mLE*5mp6;B!i zn>Z*rgG$hJ1{a1@hBSsm22eAxWO`y8yXf?SbUA_P7h>hvrmt{kgGF6f3L8 z^a6Vs^tLD@(B^<7V5KT@^nk*O71Zi0pDtLyEk8Xcj-6||4j;SFao1g%EiVRCsVrS8x_)VI)2Gk(?qy^${R^Mk`1A+7GAz>@Tshg$YK+3k!rq`vtMG%LXL^W_jM((Nz49E>ogOjzfE!Sj#i&6I uj;3UAqbe1t()VO2W>7#?Il0lue)u-0dB+c-lK=@wRu&;%o1i#oyjBOQ5}DmSB6w zETQ&}S;FldvqaiEW{I|U%o1zwm?hrcF-xMoW0qul$1JJ#j#<*}9kXQGJ7&qYcg&J& w@0caOy5oq6K zBiO#nMyP$4jd1%e8+1^QX;{ zW@AreNMgujNS=OihP3!}vv4-M=?5B^qNZ>7%gn-G%8vd`$&kj7$&kvBGJWA9X<1IV#Pq$Z zB)uU>#E{RB z$WQ`x$;ZXg($m$>GR^?Wu~#vqG9)u(Ot(KTEjr!oD@(=n4U4%|I1?H27%~}(88W7? zKQAplo#h;}8_2w%=?<~XEbOHWC16d4OQl7p?{1X%_AhhD309fWHRJTPpoAVp5Cwx8X+L%^61I~7(m{E7?B9m z@?o2F7|4c{=>igrEWG)U7=*g*q8cnIfh6Ti8HyQ-AyP=u6vO}(2gkzH38HN5Mc{m% zIGs^ZRCxM_z0w?D-%p(&%EF$*kk3%YkT|_jlSy)V$z4uJP5?>qL!?0I5mEyDe=02t z*C-B&J8%|b@MTD4r~s8D4EfVP9+H-we&7f+t%3{^MOGRNj`U21Jcz|564Upslj581a**8z;JeG?0}(DY@Cge9gINU*bk0v&3sR-wGobd7)V0@JNp z<@uNs8H%Pm2Jwha@ADAmm_AKdR$%(C#WEh#VP;Q%sl6CqAZ9W$ET!vtVQii1I6Q3%`Pj`65$RY^w zaxOzYC=?jd7%Cy&Hdw>!1=8AZLyn8FWICgiqB0`22!b+bF+(ClIzuXh9)kiy$n?O~ zjN;Q3TI9H^aU9_9MkhYi?U5mc+I0WeMSR+0LUeva+k4ux}deR@boz)VjR;i zY?I)a9^k;n#~BVT!iyO)r~mw>;5dE4V`hoz2EUnD7>lRB&z6;B%%2{ZBp^P0PJt2+ zECQ#43eo8wjw-T=x`N}WgrSllm?4!R2VC)%Og|{cD$MN1fTWeZm`uM)Pv5XgifwvL zi8L3HeuX=Z6%t*78jPaTC*0>}nf|~~f@k`x3mk}S3r#@+p)3Z|8}3NUfju>SiL|uH z^na^`Fj5*qUBYXA4%SSDDu&eQ6JH8Tqcy9hPvB6<#sx_4V5zee7daUbhqQOeA6dzNwG{%_$SOZJtRp$1RM{HI@90Y zk(ZyYBBmfR{mLE*5mp6;B!i zn>Z*rgG$hJ1{a1@hBSsm22eAxWO`y8yXf?SbUA_P7h>hvrmt{kgGF6f3L8 z^a6Vs^tLD@(B^<7V5KT@^nk*O71Zi0pDtLyEk8Xcj-6||4j;SFao1g%EiVRCsVrS8x_)VI)2Gk(?qy^${R^Mk`1A+7GAz>@Tshg$YK+3k!rq`vtMG%LXL^W_jM((Nz49E>ogOjzfE!Sj#i&6I uj;3UAqbe1t()VO2W>7#?Il0lue)u-0dB+c-lK=@wRu&;%o1i#oyjBOQ5}DmSB6w zETQ&}S;FldvqaiEW{I|U%o1zwm?hrcF-xMoW0qul$1JJ#j#<*}9kXQGJ7&qYcg&J& w@0caOyp(9 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 delta 126 zcmbRCBI7_$#)cr>$vFx%HICrDo6W=tDNm0 zu5z`1xXRuB;VMWiZ~KR5oq6K zBiO#nMyP$4jd1%e8+1^QX;{ zW@AreNMgujNS=OihP3!}vv4-M=?5B^qNZ>7%gn-G%8vd`$&kj7$&kvBGJWA9X<1IV#Pq$Z zB)uU>#E{RB z$WQ`x$;ZXg($m$>GR^?Wu~#vqG9)u(Ot(KTEjr!oD@(=n4U4%|I1?H27%~}(88W7? zKQAplo#h;}8_2w%=?<~XEbOHWC16d4OQl7p?{1X%_AhhD309fWHRJTPpoAVp5Cwx8X+L%^61I~7(m{E7?B9m z@?o2F7|4c{=>igrEWG)U7=*g*q8cnIfh6Ti8HyQ-AyP=u6vO}(2gkzH38HN5Mc{m% zIGs^ZRCxM_z0w?D-%p(&%EF$*kk3%YkT|_jlSy)V$z4uJP5?>qL!?0I5mEyDe=02t z*C-B&J8%|b@MTD4r~s8D4EfVP9+H-we&7f+t%3{^MOGRNj`U21Jcz|564Upslj581a**8z;JeG?0}(DY@Cge9gINU*bk0v&3sR-wGobd7)V0@JNp z<@uNs8H%Pm2Jwha@ADAmm_AKdR$%(C#WEh#VP;Q%sl6CqAZ9W$ET!vtVQii1I6Q3%`Pj`65$RY^w zaxOzYC=?jd7%Cy&Hdw>!1=8AZLyn8FWICgiqB0`22!b+bF+(ClIzuXh9)kiy$n?O~ zjN;Q3TI9H^aU9_9MkhYi?U5mc+I0WeMSR+0LUeva+k4ux}deR@boz)VjR;i zY?I)a9^k;n#~BVT!iyO)r~mw>;5dE4V`hoz2EUnD7>lRB&z6;B%%2{ZBp^P0PJt2+ zECQ#43eo8wjw-T=x`N}WgrSllm?4!R2VC)%Og|{cD$MN1fTWeZm`uM)Pv5XgifwvL zi8L3HeuX=Z6%t*78jPaTC*0>}nf|~~f@k`x3mk}S3r#@+p)3Z|8}3NUfju>SiL|uH z^na^`Fj5*qUBYXA4%SSDDu&eQ6JH8Tqcy9hPvB6<#sx_4V5zee7daUbhqQOeA6dzNwG{%_$SOZJtRp$1RM{HI@90Y zk(ZyYBBmfR{mLE*5mp6;B!i zn>Z*rgG$hJ1{a1@hBSsm22eAxWO`y8yXf?SbUA_P7h>hvrmt{kgGF6f3L8 z^a6Vs^tLD@(B^<7V5KT@^nk*O71Zi0pDtLyEk8Xcj-6||4j;SFao1g%EiVRCsVrS8x_)VI)2Gk(?qy^${R^Mk`1A+7GAz>@Tshg$YK+3k!rq`vtMG%LXL^W_jM((Nz49E>ogOjzfE!Sj#i&6I uj;3UAqbe1t()VO2W>7#?Il0lue)u-0dB+c-lK=@wRu&;%o1i#oyjBOQ5}DmSB6w zETQ&}S;FldvqaiEW{I|U%o1zwm?hrcF-xMoW0qul$1JJ#j#<*}9kXQGJ7&qYcg&J& w@0caOy function Get-ModuleVersion { - '3.1.6' + '3.1.7' } function Invoke-InitializeModule @@ -27,6 +27,7 @@ function Invoke-InitializeModule Title = "Application" Key = "EMAzureApp" Type = "List" + SelectedValuePath = "ClientId" ItemsSource = $global:MSGraphGlobalApps DefaultValue = "" SubPath = "EndpointManager" @@ -72,22 +73,6 @@ function Invoke-InitializeModule SubPath = "EndpointManager" }) "EndpointManager" - Add-SettingsObject (New-Object PSObject -Property @{ - Title = "Show Delete button" - Key = "EMAllowDelete" - Type = "Boolean" - DefaultValue = $false - Description = "Allow deleting individual objectes" - }) "EndpointManager" - - Add-SettingsObject (New-Object PSObject -Property @{ - Title = "Show Bulk Delete " - Key = "EMAllowBulkDelete" - Type = "Boolean" - DefaultValue = $false - Description = "Allow using bulk delete to delete all objects of selected types" - }) "EndpointManager" - $viewPanel = Get-XamlObject ($global:AppRootFolder + "\Xaml\EndpointManagerPanel.xaml") -AddVariables Set-EMViewPanel $viewPanel @@ -157,6 +142,7 @@ function Invoke-InitializeModule PostFileImportCommand = { Start-PostFileImportEndpointSecurity @args } #PreCopyCommand = { Start-PreCopyEndpointSecurity @args } PostCopyCommand = { Start-PostCopyEndpointSecurity @args } + PreUpdateCommand = { Start-PreUpdateEndpointSecurity @args } Permissons=@("DeviceManagementConfiguration.ReadWrite.All") GroupId = "EndpointSecurity" }) @@ -170,6 +156,7 @@ function Invoke-InitializeModule Permissons=@("DeviceManagementConfiguration.ReadWrite.All") Dependencies = @("Locations","Notifications") PostExportCommand = { Start-PostExportCompliancePolicies @args } + PreUpdateCommand = { Start-PreUpdateCompliancePolicies @args } GroupId = "CompliancePolicies" }) @@ -222,6 +209,9 @@ function Invoke-InitializeModule PreImportCommand = { Start-PreImportESP @args } PostExportCommand = { Start-PostExportESP @args } PreDeleteCommand = { Start-PreDeleteEnrollmentRestrictions @args } # Note: Uses same PreDelete as restrictions + PreReplaceCommand = { Start-PreReplaceEnrollmentRestrictions @args } # Note: Uses same PreReplaceCommand as restrictions + PostReplaceCommand = { Start-PostReplaceEnrollmentRestrictions @args } # Note: Uses same PostReplaceCommand as restrictions + PreFilesImportCommand = { Start-PreFilesImportEnrollmentRestrictions @args } # Note: Uses same PreFilesImportCommand as restrictions QUERYLIST = "`$filter=endsWith(id,'Windows10EnrollmentCompletionPageConfiguration')" Permissons=@("DeviceManagementServiceConfig.ReadWrite.All") SkipRemoveProperties = @('Id') @@ -238,6 +228,9 @@ function Invoke-InitializeModule PostExportCommand = { Start-PostExportEnrollmentRestrictions @args } PreImportCommand = { Start-PreImportEnrollmentRestrictions @args } PreDeleteCommand = { Start-PreDeleteEnrollmentRestrictions @args } + PreReplaceCommand = { Start-PreReplaceEnrollmentRestrictions @args } + PostReplaceCommand = { Start-PostReplaceEnrollmentRestrictions @args } + PreFilesImportCommand = { Start-PreFilesImportEnrollmentRestrictions @args } Permissons=@("DeviceManagementServiceConfig.ReadWrite.All") SkipRemoveProperties = @('Id') AssignmentsType = "enrollmentConfigurationAssignments" @@ -387,6 +380,7 @@ function Invoke-InitializeModule CopyDefaultName = "%displayName% Copy" # '-' is not allowed in the name Permissons=@("DeviceManagementServiceConfig.ReadWrite.All") PreImportAssignmentsCommand = { Start-PreImportAssignmentsAutoPilot @args } + PreDeleteCommand = { Start-PreDeleteAutoPilot @args } GroupId = "WinEnrollment" }) @@ -834,6 +828,58 @@ function Start-PostCopyEndpointSecurity } } +function Start-PreUpdateEndpointSecurity +{ + param($obj, $objectType, $curObject, $fromObj) + + if(-not $fromObj.settings) { return } + + $strAPI = "/deviceManagement/intents/$($curObject.Object.id)/updateSettings" + + $curObject = Get-GraphObject $curObject.Object $objectType + + $curValues = @() + foreach($val in $curObject.Object.settings) + { + if($fromObj.settings | Where { $_.definitionId -eq $val.definitionId}) { continue } + + # Set all existing values to null + # Note: This will not remove them from the configured list just set them Not Configured + $curValues += [PSCustomObject]@{ + '@odata.type' = $val.'@odata.type' + definitionId = $val.definitionId + id = $val.id + valueJson = "null" + } + } + + $curValues += $fromObj.settings + + <# + if($curValues.Count -gt 0) + { + $tmpObj = [PSCustomObject]@{ + settings = $curValues + } + $json = ConvertTo-Json $tmpObj -Depth 10 + + # Set all existing values to null + # Note: This will not remove them from the configured list just set them Not Configured + Invoke-GraphRequest -Url $strAPI -Content $json -HttpMethod "POST" | Out-Null + } + #> + + $tmpObj = [PSCustomObject]@{ + settings = $curValues + } + Start-GraphPreImport $tmpObj.settings + + $json = ConvertTo-Json $tmpObj -Depth 10 + Invoke-GraphRequest -Url $strAPI -Content $json -HttpMethod "POST" | Out-Null + + Remove-Property $obj "templateId" +} + #endregion #region @@ -892,6 +938,23 @@ function Start-PostExportCompliancePolicies } } } + +function Start-PreUpdateCompliancePolicies +{ + param($obj, $objectType, $curObject, $fromObj) + + $strAPI = "/deviceManagement/deviceCompliancePolicies/$($curObject.Object.id)/scheduleActionsForRules" + + $tmpObj = [PSCustomObject]@{ + deviceComplianceScheduledActionForRules = $obj.scheduledActionsForRule + } + + $json = ConvertTo-Json $tmpObj -Depth 10 + Invoke-GraphRequest -Url $strAPI -Content $json -HttpMethod "POST" | Out-Null + + Remove-Property $obj "scheduledActionsForRule" +} + #endregion #region Intune Branding functions @@ -1242,7 +1305,7 @@ function Start-PostImportAppProtection $tmp = $newObject."@odata.type".Split('.')[-1] $objectClass = Get-GraphObjectClassName $tmp - $response = Invoke-GraphRequest -Url "/deviceAppManagement/$objectClass/$($obj.Id)/targetApps" -Content "{ apps: $(ConvertTo-Json $global:ImportObjectInfo.Apps -Depth 10)}" -HttpMethod POST + Invoke-GraphRequest -Url "/deviceAppManagement/$objectClass/$($obj.Id)/targetApps" -Content "{ apps: $(ConvertTo-Json $global:ImportObjectInfo.Apps -Depth 10)}" -HttpMethod POST | Out-Null } catch {} } @@ -1504,12 +1567,63 @@ function Start-PreImportPolicySets { foreach($prop in ($item.PSObject.Properties | Where {$_.Name -notin $keepProperties})) { - #if($prop.Name -in $keepProperties) { continue } Remove-Property $item $prop.Name } #@("itemType","displayName","status","errorCode") | foreach { Remove-Property $item $_ } } } + +function Update-EMPolicySetAssignment +{ + param($assignment, $sourceObject, $newObject, $objectType) + + $api = "/deviceAppManagement/policySets/$($assignment.SourceId)?`$expand=assignments,items" + + $psObj = Invoke-GraphRequest -Url $api -ODataMetadata "Minimal" + + if(-not $psObj) + { + return + } + + $curItem = $psObj.Items | Where payloadId -eq $sourceObject.Id + + if(-not $curItem) + { + return + } + + $api = "/deviceAppManagement/policySets/$($assignment.SourceId)/update" + + $curItemClone = $curItem | ConvertTo-Json -Depth 10 | ConvertFrom-Json + $newItem = $curItem | ConvertTo-Json -Depth 10 | ConvertFrom-Json + $newItem.payloadId = $newObject.Id + if($newItem.guidedDeploymentTags -is [String] -and [String]::IsNullOrEmpty($newItem.guidedDeploymentTags)) + { + $newItem.guidedDeploymentTags = @() + } + + $keepProperties = @('@odata.type','payloadId','Settings','guidedDeploymentTags') + #itemType? e.g. #microsoft.graph.iosManagedAppProtection + #priority? + + foreach($prop in ($newItem.PSObject.Properties | Where {$_.Name -notin $keepProperties})) + { + Remove-Property $newItem $prop.Name + } + + $update = @{} + $update.Add('addedPolicySetItems',@($newItem)) + $update.Add('updatedPolicySetItems', @()) + $update.Add('deletedPolicySetItems',@($curItemClone.Id)) + + $json = $update | ConvertTo-Json -Depth 10 + + Write-Log "Update PolicySet $($psObj.displayName) - Replace: $((Get-GraphObjectName $newObject $objectType))" + + Invoke-GraphRequest -Url $api -HttpMethod "POST" -Content $json +} + #endregion #endregion Locations @@ -1718,6 +1832,38 @@ function Start-PreDeleteEnrollmentRestrictions @{ "Delete" = $false } } } + +function Start-PreReplaceEnrollmentRestrictions +{ + param($obj, $objectType, $sourceObj, $fromFile) + + if($sourceObj.Priority -eq 0) { @{ "Replace" = $false } } +} + +function Start-PostReplaceEnrollmentRestrictions +{ + param($obj, $objectType, $sourceObj, $fromFile) + + if($sourceObj.Priority -eq 0) { return } + + $api = "/deviceManagement/deviceEnrollmentConfigurations/$($obj.id)/setpriority" + + $priority = [PSCustomObject]@{ + priority = $sourceObj.Priority + } + $json = $priority | ConvertTo-Json -Depth 10 + + Write-Log "Update priority for $($obj.displayName) to $($sourceObj.Priority)" + Invoke-GraphRequest $api -HttpMethod "POST" -Content $json +} + +function Start-PreFilesImportEnrollmentRestrictions +{ + param($objectType, $filesToImport) + + $filesToImport | sort-object -property @{e={$_.Object.priority}} +} + #endregion #region ScopeTags @@ -1736,6 +1882,32 @@ function Start-PreImportAssignmentsAutoPilot Add-EMAssignmentsToObject $obj $objectType $file $assignments } + +function Start-PreDeleteAutoPilot +{ + param($obj, $objectType) + + Write-Log "Delete AutoPilot profile assignments" + + if(-not $obj.Assignments) + { + $tmpObj = (Get-GraphObject $obj $objectType).Object + } + else + { + $tmpObj = $obj + } + + foreach($assignment in $tmpObj.Assignments) + { + if($assignment.Source -ne "direct") { continue } + + $api = "/deviceManagement/windowsAutopilotDeploymentProfiles/$($obj.Id)/assignments/$($assignment.Id)" + + Invoke-GraphRequest $api -HttpMethod "DELETE" + } +} + #endregion #region Health Scripts diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1 index b2967a0..06b3cf2 100644 --- a/Extensions/MSGraph.psm1 +++ b/Extensions/MSGraph.psm1 @@ -10,7 +10,7 @@ This module manages Microsoft Grap fuctions like calling APIs, managing graph ob #> function Get-ModuleVersion { - '3.1.2' + '3.1.3' } $global:MSGraphGlobalApps = @( @@ -26,6 +26,25 @@ function Invoke-InitializeModule $global:LoadedDependencyObject = $null $global:MigrationTableCache = $null + $script:lstImportTypes = @( + [PSCustomObject]@{ + Name = "Always import" + Value = "alwaysImport" + }, + [PSCustomObject]@{ + Name = "Skip if object exists" + Value = "skipIfExist" + }, + [PSCustomObject]@{ + Name = "Replace (Preview)" + Value = "replace" + }, + [PSCustomObject]@{ + Name = "Update (Experimental)" + Value = "update" + } + ) + # Make sure MS Graph settings are added before exiting before App Id and Tenant Id is missing Write-Log "Add settings and menu items" @@ -83,12 +102,53 @@ function Invoke-InitializeModule Description = "Convert AD synched groups to Azure AD group during import if the group does not exist" }) "ImportExport" + Add-SettingsObject (New-Object PSObject -Property @{ + Title = "Import type" + Key = "ImportType" + Type = "List" + ItemsSource = $script:lstImportTypes + DefaultValue = "alwaysImport" + }) "ImportExport" + Add-SettingsObject (New-Object PSObject -Property @{ Title = "Import Assignments" Key = "ImportAssignments" Type = "Boolean" DefaultValue = $true - Description = "Import assignments when importing objects" + Description = "Default value for Import assignments when importing objects" + }) "ImportExport" + + Add-SettingsObject (New-Object PSObject -Property @{ + Title = "Import Scope (Tags)" + Key = "ImportScopeTags" + Type = "Boolean" + DefaultValue = $true + Description = "Default value for Import Scope (Tags) when importing objects" + }) "ImportExport" + + Add-SettingsObject (New-Object PSObject -Property @{ + Title = "Show Delete button" + Key = "EMAllowDelete" + Type = "Boolean" + DefaultValue = $false + Description = "Allow deleting individual objectes" + }) "ImportExport" + + Add-SettingsObject (New-Object PSObject -Property @{ + Title = "Show Bulk Delete " + Key = "EMAllowBulkDelete" + Type = "Boolean" + DefaultValue = $false + Description = "Allow using bulk delete to delete all objects of selected types" + }) "ImportExport" + + + Add-SettingsObject (New-Object PSObject -Property @{ + Title = "Allow update on import (Preview)" + Key = "AllowUpdate" + Type = "Boolean" + DefaultValue = $false + Description = "This will enable the option to update/replace an existing object during import" }) "ImportExport" } @@ -127,6 +187,7 @@ function Get-GraphAppInfo function Invoke-GraphAuthenticationUpdated { $global:MigrationTableCache = $null + $global:MigrationTableCacheId = $null $global:LoadedDependencyObjects = $null $global:migFileObj = $null } @@ -142,7 +203,7 @@ function Invoke-GraphRequest $Headers, - [ValidateSet("GET","POST","OPTIONS","DELETE", "PATCH")] + [ValidateSet("GET","POST","OPTIONS","DELETE", "PATCH","PUT")] [Alias("Method")] $HttpMethod = "GET", @@ -240,6 +301,8 @@ function Invoke-GraphRequest { throw $global:error[0] } + + if($HttpMethod -eq "PATCH" -and [String]::IsNullOrempty($ret)) { $ret = $true } } catch { @@ -255,14 +318,16 @@ function Invoke-GraphRequest function Get-GraphObjects { param( - [Array] + [String] $Url, [Array] $property = $null, [Array] $exclude, $SortProperty = "displayName", - $objectType) + $objectType, + [switch] + $SingleObject) $objects = @() @@ -274,7 +339,29 @@ function Get-GraphObjects $params.Add('ODataMetadata',$objectType.ODataMetadata) } + if(-not $url) + { + $url = $objectType.API + } + + if($SingleObject -ne $true -and $objectType.QUERYLIST) + { + if(($url.IndexOf('?')) -eq -1) + { + $url = "$($url.Trim())?$($objectType.QUERYLIST.Trim())" + } + else + { + $url = "$($url.Trim())&$($objectType.QUERYLIST.Trim())" # Risky...does not check that the parameter is already in use + } + } + $graphObjects = Invoke-GraphRequest -Url $url @params + + if($SingleObject -ne $true -and $objectType.PostListCommand) + { + $graphObjects = & $objectType.PostListCommand $graphObjects $objectType + } if($graphObjects -and ($graphObjects | GM -Name Value -MemberType NoteProperty)) { @@ -341,18 +428,7 @@ function Show-GraphObjects $global:grdTitle.Visibility = "Visible" } - $url = $global:curObjectType.API - if($global:curObjectType.QUERYLIST) - { - $url = "$($url.Trim())?$($global:curObjectType.QUERYLIST.Trim())" - } - - $graphObjects = @(Get-GraphObjects -Url $url -property $global:curObjectType.ViewProperties -objectType $global:curObjectType) - - if($global:curObjectType.PostListCommand) - { - $graphObjects = & $global:curObjectType.PostListCommand $graphObjects $global:curObjectType - } + $graphObjects = @(Get-GraphObjects -property $global:curObjectType.ViewProperties -objectType $global:curObjectType) if(($graphObjects | measure).Count -eq 0) { return } @@ -486,7 +562,7 @@ function Get-GraphObject } elseif($api.IndexOf("`$expand") -gt 1) { - $api = ($api + ",") + $api = ($api + ",") # A bit risky...assumes that expand is last in the existing query } else { @@ -496,7 +572,7 @@ function Get-GraphObject $api = ($api + ($expand -join ",")) } - $objInfo = Get-GraphObjects -Url $api -property $objectType.ViewProperties -objectType $objectType + $objInfo = Get-GraphObjects -Url $api -property $objectType.ViewProperties -objectType $objectType -SingleObject if($objInfo -and $objectType.PostGetCommand) { @@ -746,18 +822,12 @@ function Show-GraphBulkExportForm Write-Log "----------------------------------------------------------------" Write-Log "Export $($item.ObjectType.Title) objects" Write-Log "----------------------------------------------------------------" - - $url = $item.ObjectType.API - if($item.ObjectType.QUERYLIST) - { - $url = "$($url.Trim())?$($item.ObjectType.QUERYLIST.Trim())" - } try { $folder = Get-GraphObjectFolder $item.ObjectType (Get-XamlProperty $script:exportForm "txtExportPath" "Text") (Get-XamlProperty $script:exportForm "chkAddObjectType" "IsChecked") (Get-XamlProperty $script:exportForm "chkAddCompanyName" "IsChecked") - $objects = @(Get-GraphObjects -Url $url -property $item.ObjectType.ViewProperties -objectType $item.ObjectType) + $objects = @(Get-GraphObjects -property $item.ObjectType.ViewProperties -objectType $item.ObjectType) foreach($obj in $objects) { Write-Status "Export $($item.Title): $((Get-GraphObjectName $obj.Object $obj.ObjectType))" -Force @@ -797,13 +867,44 @@ function Show-GraphImportForm } Set-XamlProperty $script:importForm "txtImportPath" "Text" (?? $path (Get-SettingValue "RootFolder")) + Set-XamlProperty $script:importForm "chkImportAssignments" "IsChecked" (Get-SettingValue "ImportAssignments") + Set-XamlProperty $script:importForm "chkImportScopes" "IsChecked" (Get-SettingValue "ImportScopeTags") + Set-XamlProperty $script:importForm "cbImportType" "ItemsSource" $script:lstImportTypes + Set-XamlProperty $script:importForm "cbImportType" "SelectedValue" (Get-SettingValue "ImportType" "alwaysImport") + + if((Get-SettingValue "AllowUpdate") -eq $true) + { + Set-XamlProperty $script:importForm "lblImportType" "Visibility" "Visible" + Set-XamlProperty $script:importForm "cbImportType" "Visibility" "Visible" + } + + $column = Get-GridCheckboxColumn "Selected" + $global:dgObjectsToImport.Columns.Add($column) + + $column.Header.IsChecked = $true # All items are checked by default + $column.Header.add_Click({ + foreach($item in $global:dgObjectsToImport.ItemsSource) + { + $item.Selected = $this.IsChecked + } + $global:dgObjectsToImport.Items.Refresh() + } + ) + + # Add Object type column + $binding = [System.Windows.Data.Binding]::new("fileName") + $column = [System.Windows.Controls.DataGridTextColumn]::new() + $column.Header = "File Name" + $column.IsReadOnly = $true + $column.Binding = $binding + $global:dgObjectsToImport.Columns.Add($column) Add-XamlEvent $script:importForm "browseImportPath" "add_click" ({ $folder = Get-Folder (Get-XamlProperty $script:importForm "txtImportPath" "Text") "Select root folder for import" if($folder) { Set-XamlProperty $script:importForm "txtImportPath" "Text" $folder - $global:lstFiles.ItemsSource = @(Get-GraphFileObjects $folder) + $global:dgObjectsToImport.ItemsSource = @(Get-GraphFileObjects $folder) Save-Setting "" "LastUsedFullPath" $folder Set-XamlProperty $script:importForm "lblMigrationTableInfo" "Content" (Get-MigrationTableInfo) } @@ -817,26 +918,30 @@ function Show-GraphImportForm Add-XamlEvent $script:importForm "btnImportSelected" "add_click" { Write-Status "Import objects" Get-GraphDependencyDefaultObjects - foreach ($fileObj in ($global:lstFiles.ItemsSource | Where Selected -eq $true)) + $allowUpdate = ((Get-SettingValue "AllowUpdate") -eq $true) + $filesToImport = $global:dgObjectsToImport.ItemsSource | Where Selected -eq $true + if($global:curObjectType.PreFilesImportCommand) { - Import-GraphFile $fileObj + $filesToImport = & $global:curObjectType.PreFilesImportCommand $global:curObjectType $filesToImport + } + + foreach ($fileObj in $filesToImport) + { + if($allowUpdate -and $global:cbImportType.SelectedValue -ne "alwaysImport" -and (Reset-GraphObjet $fileObj $global:dgObjects.ItemsSource)) + { + continue + } + + Import-GraphFile $fileObj } Show-GraphObjects Show-ModalObject Write-Status "" } - Add-XamlEvent $script:importForm "chkCheckAll" "add_click" { - foreach($obj in $global:lstFiles.Items) - { - $obj.Selected = $global:chkCheckAll.IsChecked - } - $global:lstFiles.Items.Refresh() - } - Add-XamlEvent $script:importForm "btnGetFiles" "add_click" { # Used when the user manually updates the path and the press Get Files - $global:lstFiles.ItemsSource = @(Get-GraphFileObjects $global:txtImportPath.Text) + $global:dgObjectsToImport.ItemsSource = @(Get-GraphFileObjects $global:txtImportPath.Text) if([IO.Directory]::Exists($global:txtImportPath.Text)) { Save-Setting "" "LastUsedFullPath" $global:txtImportPath.Text @@ -848,7 +953,7 @@ function Show-GraphImportForm if($global:txtImportPath.Text) { - $global:lstFiles.ItemsSource = @(Get-GraphFileObjects $global:txtImportPath.Text) + $global:dgObjectsToImport.ItemsSource = @(Get-GraphFileObjects $global:txtImportPath.Text) Set-XamlProperty $script:importForm "lblMigrationTableInfo" "Content" (Get-MigrationTableInfo) } @@ -867,7 +972,16 @@ function Show-GraphBulkImportForm } Set-XamlProperty $script:importForm "txtImportPath" "Text" (?? $path (Get-SettingValue "RootFolder")) - #Set-XamlProperty $script:importForm "chkAddCompanyName" "IsChecked" (Get-SettingValue "AddCompanyName") + Set-XamlProperty $script:importForm "chkImportAssignments" "IsChecked" (Get-SettingValue "ImportAssignments") + Set-XamlProperty $script:importForm "chkImportScopes" "IsChecked" (Get-SettingValue "ImportScopeTags") + Set-XamlProperty $script:importForm "cbImportType" "ItemsSource" $script:lstImportTypes + Set-XamlProperty $script:importForm "cbImportType" "SelectedValue" (Get-SettingValue "ImportType" "alwaysImport") + + if((Get-SettingValue "AllowUpdate") -eq $true) + { + Set-XamlProperty $script:importForm "lblImportType" "Visibility" "Visible" + Set-XamlProperty $script:importForm "cbImportType" "Visibility" "Visible" + } Add-XamlEvent $script:importForm "browseImportPath" "add_click" ({ $folder = Get-Folder (Get-XamlProperty $script:importForm "txtImportPath" "Text") "Select root folder for import" @@ -938,6 +1052,8 @@ function Show-GraphBulkImportForm Get-GraphDependencyDefaultObjects $importedObjects = 0 + $allowUpdate = ((Get-SettingValue "AllowUpdate") -eq $true) + foreach($item in ($script:importObjects | where Selected -eq $true | sort-object -property @{e={$_.ObjectType.ImportOrder}})) { Write-Status "Import $($item.ObjectType.Title) objects" -Force @@ -946,10 +1062,34 @@ function Show-GraphBulkImportForm Write-Log "----------------------------------------------------------------" $folder = Get-GraphObjectFolder $item.ObjectType (Get-XamlProperty $script:importForm "txtImportPath" "Text") (Get-XamlProperty $script:importForm "chkAddObjectType" "IsChecked") + $graphObjects = $null + + if($allowUpdate -and $global:cbImportType.SelectedValue -ne "alwaysImport") + { + try + { + Write-Status "Get $($item.Title) objects" -Force + $graphObjects = @(Get-GraphObjects -property $item.ObjectType.ViewProperties -objectType $item.ObjectType) + } + catch {} + } + if([IO.Directory]::Exists($folder)) { - foreach ($fileObj in @(Get-GraphFileObjects $folder -ObjectType $item.ObjectType)) + $filesToImport = Get-GraphFileObjects $folder -ObjectType $item.ObjectType + if($item.ObjectType.PreFilesImportCommand) { + $filesToImport = & $item.ObjectType.PreFilesImportCommand $item.ObjectType $filesToImport + } + + foreach ($fileObj in @($filesToImport)) + { + if($allowUpdate -and $global:cbImportType.SelectedValue -ne "alwaysImport" -and $graphObjects -and (Reset-GraphObjet $fileObj $graphObjects)) + { + $importedObjects++ + continue + } + Import-GraphFile $fileObj $importedObjects++ } @@ -1111,19 +1251,13 @@ function Show-GraphBulkDeleteForm Write-Log "----------------------------------------------------------------" Write-Log "Delete $($item.ObjectType.Title) objects" Write-Log "----------------------------------------------------------------" - - $url = $item.ObjectType.API - if($item.ObjectType.QUERYLIST) - { - $url = "$($url.Trim())?$($item.ObjectType.QUERYLIST.Trim())" - } try { Write-Status "Get $($item.Title) objects" -Force - $objects = @(Get-GraphObjects -Url $url -property $item.ObjectType.ViewProperties -objectType $item.ObjectType) + $objects = @(Get-GraphObjects -property $item.ObjectType.ViewProperties -objectType $item.ObjectType) foreach($obj in $objects) - { + { Write-Status "Delete $($item.Title): $((Get-GraphObjectName $obj.Object $obj.ObjectType))" -Force Remove-GraphObject $obj.Object $obj.ObjectType $folder } @@ -1225,72 +1359,7 @@ function Import-GraphFile if($newObj -and $objClone.Assignments -and $global:chkImportAssignments.IsChecked -eq $true) { - $preConfig = $null - if($file.ObjectType.PreImportAssignmentsCommand) - { - $preConfig = & $file.ObjectType.PreImportAssignmentsCommand $newObj $file.ObjectType $file.FileInfo.FullName $objClone.Assignments - } - - ###### Import Assignments ###### - - if($preConfig -isnot [Hashtable]) { $preConfig = @{} } - - if($preConfig["Import"] -eq $false) { return } # Assignment managed manually so skip further processing - - $api = ?? $preConfig["API"] "$($file.ObjectType.API)/$($newObj.Id)/assign" - - $method = ?? $preConfig["Method"] "POST" - - $keepProperties = ?? $file.ObjectType.AssignmentProperties @("target") - $keepTargetProperties = ?? $file.ObjectType.AssignmentTargetProperties @("@odata.type","groupId") - $ObjectAssignments = @() - foreach($assignment in $objClone.Assignments) - { - if($assignment.target.UserId -or ($assignment.Source -and $assignment.Source -ne "direct")) - { - # E.g. Source could be PolicySet...so should not be added here - continue - } - - $assignment.Id = "" - foreach($prop in $assignment.PSObject.Properties) - { - if($prop.Name -in $keepProperties) { continue } - Remove-Property $assignment $prop.Name - } - - foreach($prop in $assignment.target.PSObject.Properties) - { - if($prop.Name -in $keepTargetProperties) { continue } - Remove-Property $assignment.target $prop.Name - } - $ObjectAssignments += $assignment - } - - $objClone.Assignments = $ObjectAssignments - - if(($objClone.Assignments | measure).Count -gt 0) - { - $json = "{ `"$((?? $file.ObjectType.AssignmentsType "assignments"))`": " - $strAssign = "$((Update-JsonForEnvironment ($objClone.Assignments | ConvertTo-Json -Depth 10)))" - # Array characters [ ] is not included if there is only one assignment - # Added them if they are missing - if($strAssign.Trim().StartsWith("[") -eq $false) - { - $strAssign = (" [ " + $strAssign + " ] ") - } - $json = ($json + $strAssign + "}") - - if($json) - { - $objAssign = Invoke-GraphRequest $api -HttpMethod $method -Content $json - } - } - - if($assignmentsProcessed -ne $true -and $file.ObjectType.PostImportAssignmentsCommand) - { - & $file.ObjectType.PostImportAssignmentsCommand $newObj $file.ObjectType $file.FileInfo.FullName $objAssign - } + Import-GraphObjectAssignment $newObj $file.ObjectType $objClone.Assignments $file.FileInfo.FullName | Out-Null } } catch @@ -1299,6 +1368,227 @@ function Import-GraphFile } } +function Reset-GraphObjet +{ + param($fileObj, $objectList) + + $nameProp = ?? $fileObj.ObjectType.NameProperty "displayName" + $curObject = $objectList | Where { $_.Object.$nameProp -eq $fileObj.Object.$nameProp -and $_.Object.'@OData.Type' -eq $fileObj.Object.'@OData.Type' } + + if($global:cbImportType.SelectedValue -eq "skipIfExist" -and ($curObject | measure).Count -gt 0) + { + Write-Log "Objects with name $($fileObj.Object.$nameProp) already exists. Object will not be imported" + return $true + } + elseif(($curObject | measure).Count -gt 1) + { + Write-Log "Multiple objects return with name $($fileObj.Object.$nameProp). Object will not be imported or replaced" 2 + return $true + } + elseif(($curObject | measure).Count -eq 1) + { + Write-Log "Update $((Get-GraphObjectName $fileObj.Object $fileObj.ObjectType)) with id $($curObject.Object.Id)" + $objectType = $fileObj.ObjectType + + # Clone the object before removing properties + $obj = $fileObj.Object | ConvertTo-Json -Depth 10 | ConvertFrom-Json + Start-GraphPreImport $obj $objectType + Remove-Property $obj "Assignments" + Remove-Property $obj "isAssigned" + + if($global:cbImportType.SelectedValue -eq "update") + { + $params = @{} + $strAPI = (?? $objectType.APIPATCH $objectType.API) + "/$($curObject.Object.Id)" + $method = "PATCH" + if($objectType.PreUpdateCommand) + { + $ret = & $objectType.PreUpdateCommand $obj $objectType $curObject $fileObj.Object + if($ret -is [HashTable]) + { + if($ret.ContainsKey("Import") -and $ret["Import"] -eq $false) + { + # Import handled manually + return $false + } + + if($ret.ContainsKey("API")) + { + $strAPI = $ret["API"] + } + + if($ret.ContainsKey("Method")) + { + $method = $ret["Method"] + } + + if($ret.ContainsKey("AdditionalHeaders") -and $ret["AdditionalHeaders"] -is [HashTable]) + { + $params.Add("AdditionalHeaders",$ret["AdditionalHeaders"]) + } + } + } + + $json = ConvertTo-Json $obj -Depth 10 + if($true) #$global:MigrationTableCacheId -ne $global:Organization.Id) + { + # Call Update-JsonForEnvironment before importing the object + # E.g. PolicySets contains references, AppConfiguration policies reference apps etc. + $json = Update-JsonForEnvironment $json + } + + $objectUpdated = (Invoke-GraphRequest -Url $strAPI -Content $json -HttpMethod $method @params) + + if($objectUpdated) + { + Write-Log "Object updated successfully" + } + + if($objectUpdated -and $objectType.PostUpdateCommand) + { + # Reload the updated object + $updatedObject = Get-GraphObject $curObject.Object $objectType + & $objectType.PostUpdateCommand $updatedObject $fileObj + } + return $true + } + elseif($global:cbImportType.SelectedValue -eq "replace") + { + $replace = $true + $import = $true + $delete = $true + + if($objectType.PreReplaceCommand) + { + $ret = & $objectType.PreReplaceCommand $obj $objectType $curObject.Object $fileObj + if($ret -is [Hashtable]) + { + if($ret["Replace"] -eq $false) { $replace = $false } + + if($ret["Import"] -eq $false) { $import = $false } + + if($ret["Delete"] -eq $false) { $delete = $false } + } + } + + if($import) + { + $newObj = Import-GraphObject $obj $objectType $fileObj.FileInfo.FullName + } + + if($newObj -and $replace) + { + if($objectType.PostReplaceCommand) + { + $ret = & $objectType.PostReplaceCommand $newObj $objectType $curObject.Object $fileObj + if($ret -is [Hashtable]) + { + if($ret["Delete"] -eq $false) { $delete = $false } + } + } + + # Load all information about current object to include assignments + $curObject = Get-GraphObject $curObject.Object $objectType + + $refAssignments = $curObject.Object.Assignments | Where { $_.Source -ne "direct" } + if($refAssignments) + { + foreach($refAssignment in $refAssignments) + { + if($refAssignment.Source -eq "policySets") + { + Update-EMPolicySetAssignment $refAssignment $curObject $newObj $objectType + } + } + } + + Import-GraphObjectAssignment $newObj $objectType $curObject.Object.Assignments $fileObj.FileInfo.FullName -CopyAssignments | Out-Null + + if($delete) + { + Remove-GraphObject $curObject.Object $objectType + } + } + elseif($replace -eq $false) # Might not be 100% correct. Replace -eq $false probably means that the object was patched and not imported eg default enrollment restrictions etc. + { + Write-Log "Failed to import file for $($fileObj.Object.$nameProp) ($($objectType.Title))" 2 + } + return $true + } + } + # No object to update. Import the file + return $false +} + +function Import-GraphObjectAssignment +{ + param($obj, $objectType, $assignments, $fromFile, [switch]$CopyAssignments) + + if(($assignments | measure).Count -eq 0) { return } + + $preConfig = $null + $clonedAssignments = $assignments | ConvertTo-Json -Depth 10 | ConvertFrom-Json + + if($objectType.PreImportAssignmentsCommand) + { + $preConfig = & $objectType.PreImportAssignmentsCommand $obj $objectType $fromFile $clonedAssignments + } + + if($preConfig -isnot [Hashtable]) { $preConfig = @{} } + + if($preConfig["Import"] -eq $false) { return } # Assignment managed manually so skip further processing + + $api = ?? $preConfig["API"] "$($objectType.API)/$($newObj.Id)/assign" + + $method = ?? $preConfig["Method"] "POST" + + $keepProperties = ?? $objectType.AssignmentProperties @("target") + $keepTargetProperties = ?? $objectType.AssignmentTargetProperties @("@odata.type","groupId") + + $ObjectAssignments = @() + foreach($assignment in $clonedAssignments) + { + if(($assignment.target.UserId -and $CopyAssignments -ne $true) -or ($assignment.Source -and $assignment.Source -ne "direct")) + { + # E.g. Source could be PolicySet...so should not be added here + continue + } + + $assignment.Id = "" + foreach($prop in $assignment.PSObject.Properties) + { + if($prop.Name -in $keepProperties) { continue } + Remove-Property $assignment $prop.Name + } + + foreach($prop in $assignment.target.PSObject.Properties) + { + if($prop.Name -in $keepTargetProperties) { continue } + Remove-Property $assignment.target $prop.Name + } + + $ObjectAssignments += $assignment + } + + if($ObjectAssignments.Count -eq 0) { return } # No "Direct" assignments + + $htAssignments = @{} + $htAssignments.Add((?? $objectType.AssignmentsType "assignments"), @($ObjectAssignments)) + + $json = $htAssignments | ConvertTo-Json -Depth 10 + if($CopyAssignments -ne $true) + { + $json = Update-JsonForEnvironment $json + } + + $objAssign = Invoke-GraphRequest $api -HttpMethod $method -Content $json + + if($objectType.PostImportAssignmentsCommand) + { + & $objectType.PostImportAssignmentsCommand $obj $objectType $fromFile $objAssign + } + +} #endregion #region Migration Info @@ -1564,13 +1854,14 @@ function Get-GraphMigrationObjectsFromFile $migFileName = Get-GraphMigrationTableForImport if(-not $migFileName) { return } - $global:MigrationTableCache = @() - $migFileObj = ConvertFrom-Json (Get-Content $migFileName -Raw) # No need to translate migrated objects in the same environment as exported if($migFileObj.TenantId -eq $global:organization.Id) { return } + $global:MigrationTableCache = @() + $global:MigrationTableCacheId = $migFileObj.TenantId + Write-Status "Loading migration objects" if($global:chkImportAssignments.IsChecked -eq $true) @@ -1940,6 +2231,11 @@ function Import-GraphObject $newObj = (Invoke-GraphRequest -Url $strAPI -Content $json -HttpMethod $method @params) + if($newObj -and $method -eq "POST") + { + Write-Log "$($objectType.Title) object imported successfully with id: $($newObj.Id)" + } + if($newObj -and $objectType.PostImportCommand) { & $objectType.PostImportCommand $newObj $objectType $fromFile diff --git a/README.md b/README.md index 9c0243e..3785451 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,22 @@ The script also support dependencies e.g. an App Protection is depending on an A This PowerShell application is based on the foundation modules CloudAPIPowerShellManagement and Core. These modules manages UI, settings, logging etc. The functionality for the application is located in the extension modules. This makes it easy to add/remove features, views etc. Additional features will be added... -**Security note:** Since the scripts are not signed, a warning might be display when running it and files might be blocked. The script will unblock all files. This is to avoid issues that it fails to load the MSAL library etc. If there are any security concerns, the PowerShell code can be reviewed. The DLL files are downloaded from Microsoft repositories, see links below. These files can be downloaded and replaced. The DLL files *CAN* be removed but MSAL is a pre-requisite for login. The script will try to find the DLL in the Az or MSAL.PS module if not found in the script root directory. DLL files are included to reduce dependencies. +**Security note:** Since the scripts are not signed, a warning might be display when running it and files might be blocked. The script will unblock all files. This is to avoid issues that it fails to load the MSAL library etc. If there are any security concerns, the PowerShell code can be reviewed and the DLL files can be downloaded manually from Microsoft repositories, see links below. The DLL files *CAN* be removed but MSAL is a pre-requisite for authentication. The script will try to find the DLL in the Az or MSAL.PS module if not found in the script root directory. DLL files are included to reduce dependencies. + +## Starting the App + +Before starting the app: + +* The CMD files needs to be unblocked before the app can be started. The app can be started without it but Windows will prompt with a security warning. +* The script will unblock all other files + +Before logging on: + +* The app will use the Intune PowerShell Azure Enterprise Application by default but request all permissions required by the script. The will most likely cause a consent prompt since it uses more permission than the Intune module. Enable **Use Default Permissions** in Settings to only request the current permissions granted to the Enterprise App. + **Note:** Using default permission might reduce functionality e.g. permissions for one or more object types might be missing +* Enable **Get Tenant List** in Settings if accessing multiple environments with the same account. This might cause a Consent prompt + +Start the script by running **Start.cmd**, **Start-WithConsole.cmd** or **Start-IntuneManagement.ps1**. **Start-WithConsole.cmd** will leave the command prompt window open so you can see the log while running the app. ## Documentation @@ -18,6 +33,30 @@ This script has an extension that can document profiles and policies in Intune. See [Documentation](Documentation.md) for more information +## Import + +The script can import the exported json files in multiple ways. + +* **Always import:** The script will try to import the file. It will not check if it exists. + This is the default behavior +* **Skip if object exists:** The script will look if there is an existing object with the same name and type. It will not import the file if existing object is detected +* **Replace (Preview):** If a existing object is detected, the script will + * Import the file without assignments + * Copy assignments from the existing object + * Run PostReplace commands - Priority will be set for Enrollment Restrictions etc. + * Update PolicySets object(s) to use the new imported object (detected by policySet assignments) + * Delete the original object +* **Update (Experimental):** This will update the existing object. + Note: This is not fully implemented yet. It only works on a few object types + +**WARNING:** Use Replace with caution! Replace will delete the existing object after the imported object is updated but could cause issues in the environment if something in the process goes wrong. Verify the process in a test environment before using this! + +**Recommendation:** Backup all policies before running Replace/Update. + +The Replace/Update feature can be used in a scenario where all profiles/policies are managed in a separate reference (Dev/Test) and then implemented in one or more destination environment. The existing objects will then be reset to have the same settings as the reference environment + +**Note:** This must be turned on in Settings by enabling the **Allow update on import (Preview)** setting. + ## Comparison This script has an extension that can compare objects in Intune with exported json files. It will display a data grid with the values and highlight updated values with red. @@ -114,9 +153,9 @@ Some MSAL functionalities are based on [MSAL.PS Module](https://github.com/Azure ## Known Issues -Device Configuration and App Configuration objects are split up in different object types. They are using different Graph APIs and each object type in the menu uses one API. This is also why all Endpoint Security objects are of the same object type. They use the same API but are separated based on the Baseline Template Id they us. +Device Configuration and App Configuration objects are split up in different object types. They are using different Graph APIs and each object type in the menu uses one API. This is also why all Endpoint Security objects are of the same object type. They use the same API but are separated based on the Baseline Template Id they use. -Android Store Apps are **not** imported. The create method is documented in Microsoft Graph but it's not working. Looks like these apps must be synched from Google Play. +Android Store Apps are **not** imported. The Create API is documented in Microsoft Graph but it's not working. Looks like these apps must be synched from Google Play. Using multiple tenants support causes multiple logins/consent prompts the first time if 'Microsoft Graph PowerShell' is used. Querying the API for tenant list uses a different scope that is not included by default in the 'Microsoft Graph PowerShell' app. @@ -134,7 +173,7 @@ See [Documentation](Documentation.md) for issues regarding the documentation pro ## TIP -Check the log file for errors. The UI might not show errors why login failed etc. The log uses the Endpoint Configuration Manager (SCCM) format and it is best viewed with CMTrace. An old version can be downloaded [here](https://www.microsoft.com/en-us/download/confirmation.aspx?id=50012). +Check the log file for errors. The UI might not show errors why login failed etc. The log uses the Endpoint Configuration Manager (SCCM) format and it is best viewed with CMTrace or OneTrace. An old version of CMTrace can be downloaded [here](https://www.microsoft.com/en-us/download/confirmation.aspx?id=50012). ## License diff --git a/ReleaseNotes.md b/ReleaseNotes.md index a6cb666..f0de9f4 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,28 @@ # Release Notes +## 3.1.7 - 2021-07-12 + +**New features** + +- Support for documenting Notifications +- **PREVIEW/EXPERIMENTAL** - Support for Replace/Update existing profiles/policies during import. + See the Import section in the [Readme](Readme.md#Import) file for more information + This is based on the feature request in [Issue 17](https://github.com/Micke-K/IntuneManagement/issues/17) + +**Fixes** + +* Fixed bug that caused an exception when listing App Protection objects and only one object existed in the environment. + + See [Issue 15](https://github.com/Micke-K/IntuneManagement/issues/15) for more info + +* Import Priority based objects in the priority order specified in the files (Enrolment Restrictions and Autopilot profiles) + +* Set default settings for the options in the Import forms (Based on Settings) + +* Delete Autopilot profiles with assignments + +* Moved the assignments import to a separate function + ## 3.1.6 - 2021-07-07 **Fixes** diff --git a/Xaml/BulkImportForm.xaml b/Xaml/BulkImportForm.xaml index d9c420f..9d0a3ea 100644 --- a/Xaml/BulkImportForm.xaml +++ b/Xaml/BulkImportForm.xaml @@ -14,6 +14,7 @@ + @@ -68,9 +69,25 @@ + + + - + diff --git a/Xaml/ImportForm.xaml b/Xaml/ImportForm.xaml index 5eea87d..2fc7644 100644 --- a/Xaml/ImportForm.xaml +++ b/Xaml/ImportForm.xaml @@ -13,6 +13,7 @@ + @@ -58,10 +59,33 @@ - + @@ -79,8 +103,10 @@ - + + + + +