From d7a4077c8fdc0bedf71c890f60497d15ce801df7 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:07:52 -0700 Subject: [PATCH 1/4] Lazy auto version packages and remove versions from packages --- Directory.Build.props | 4 ++++ .../Animations/src/CommunityToolkit.WinUI.Animations.csproj | 3 +-- .../Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj | 3 +-- .../Collections/src/CommunityToolkit.WinUI.Collections.csproj | 3 +-- .../Converters/src/CommunityToolkit.WinUI.Converters.csproj | 3 +-- .../src/CommunityToolkit.WinUI.DeveloperTools.csproj | 3 +-- .../Extensions/src/CommunityToolkit.WinUI.Extensions.csproj | 3 +-- .../CommunityToolkit.WinUI.Controls.HeaderedControls.csproj | 3 +-- components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj | 3 +-- ...munityToolkit.WinUI.Controls.LayoutTransformControl.csproj | 3 +-- components/Media/src/CommunityToolkit.WinUI.Media.csproj | 3 +-- .../CommunityToolkit.WinUI.Controls.MetadataControl.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.Primitives.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj | 3 +-- .../src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj | 3 +-- .../CommunityToolkit.WinUI.Controls.SettingsControls.csproj | 3 +-- .../Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj | 3 +-- .../CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj | 3 +-- .../Triggers/src/CommunityToolkit.WinUI.Triggers.csproj | 3 +-- tooling | 2 +- 23 files changed, 26 insertions(+), 43 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a622b455..f9e19e81 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,9 @@ + 8 + 0 + preview + CommunityToolkit $(MSBuildThisFileDirectory) $(RepositoryDirectory)\tooling diff --git a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj index fde8d32e..47d9257d 100644 --- a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj +++ b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj @@ -2,8 +2,7 @@ Animations This package contains Animations. - 8.0.0-beta.2 - + CommunityToolkit.WinUI.AnimationsRns true diff --git a/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj b/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj index c00f146b..ba1e8334 100644 --- a/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj +++ b/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj @@ -2,8 +2,7 @@ Behaviors This package contains Behaviors. - 8.0.0-beta.3 - + CommunityToolkit.WinUI.BehaviorsRns diff --git a/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj b/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj index 3c9c6c1d..3ba4bffa 100644 --- a/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj +++ b/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj @@ -2,8 +2,7 @@ CameraPreview This package contains CameraPreview. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.CameraPreviewRns diff --git a/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj b/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj index f5948a05..46ae012f 100644 --- a/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj +++ b/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj @@ -2,8 +2,7 @@ Collections This package contains the AdvancedCollectionView and IncrementalLoadingCollection. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.CollectionsRns diff --git a/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj b/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj index 73be6dfc..fbaef3e6 100644 --- a/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj +++ b/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj @@ -2,8 +2,7 @@ Converters This package contains Converters. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.ConvertersRns diff --git a/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj b/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj index 56dcc128..95866e1b 100644 --- a/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj +++ b/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj @@ -2,8 +2,7 @@ DeveloperTools This package contains DeveloperTools. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.DeveloperToolsRns diff --git a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj index e4df1fff..76fe733d 100644 --- a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj +++ b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj @@ -2,8 +2,7 @@ Extensions This package contains Extensions. - 8.0.0-beta.2 - + CommunityToolkit.WinUI.ExtensionsRns true diff --git a/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj b/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj index 9eb353a5..dd63e8ce 100644 --- a/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj +++ b/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj @@ -2,8 +2,7 @@ HeaderedControls This package contains HeaderedControls. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.HeaderedControlsRns diff --git a/components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj b/components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj index e1a964e6..53916c9e 100644 --- a/components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj +++ b/components/Helpers/src/CommunityToolkit.WinUI.Helpers.csproj @@ -2,8 +2,7 @@ Helpers This package contains Helpers. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.HelpersRns diff --git a/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj b/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj index 456e38a1..f85e9ca4 100644 --- a/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj +++ b/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj @@ -2,8 +2,7 @@ ImageCropper This package contains ImageCropper. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.ImageCropperRns diff --git a/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj b/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj index deaeefc4..5277f8ee 100644 --- a/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj +++ b/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj @@ -2,8 +2,7 @@ LayoutTransformControl This package contains LayoutTransformControl. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.LayoutTransformControlRns diff --git a/components/Media/src/CommunityToolkit.WinUI.Media.csproj b/components/Media/src/CommunityToolkit.WinUI.Media.csproj index dc295949..281fa37d 100644 --- a/components/Media/src/CommunityToolkit.WinUI.Media.csproj +++ b/components/Media/src/CommunityToolkit.WinUI.Media.csproj @@ -2,8 +2,7 @@ Media This package contains Media. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.MediaRns diff --git a/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj b/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj index af6f4eb8..602b8aa3 100644 --- a/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj +++ b/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj @@ -2,8 +2,7 @@ MetadataControl This package contains MetadataControl. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.MetadataControlRns diff --git a/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj b/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj index 8f092180..be91a84b 100644 --- a/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj +++ b/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj @@ -2,8 +2,7 @@ Primitives This package contains Primitives. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.PrimitivesRns diff --git a/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj b/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj index c2745c5c..3bf1671a 100644 --- a/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj +++ b/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj @@ -2,8 +2,7 @@ RadialGauge This package contains RadialGauge. - 0.0.1 - + CommunityToolkit.WinUI.Controls.RadialGaugeRns diff --git a/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj b/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj index 1d9be7e4..8c05ebcd 100644 --- a/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj +++ b/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj @@ -2,8 +2,7 @@ RangeSelector This package contains RangeSelector. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.RangeSelectorRns diff --git a/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj b/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj index d6789075..8e697f0c 100644 --- a/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj +++ b/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj @@ -2,8 +2,7 @@ RichSuggestBox This package contains RichSuggestBox. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.Controls.RichSuggestBoxRns diff --git a/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj b/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj index 2efd8774..f93a2340 100644 --- a/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj +++ b/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj @@ -2,8 +2,7 @@ SettingsControls This package contains SettingsControls. - 8.0.0-beta.2 - + CommunityToolkit.WinUI.Controls.SettingsControlsRns diff --git a/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj b/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj index 65e78dbb..f519d94b 100644 --- a/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj +++ b/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj @@ -2,8 +2,7 @@ Sizers This package contains SizerBase. - 8.0.0-beta.3 - + CommunityToolkit.WinUI.Controls.SizersRns diff --git a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj b/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj index 292dfbb9..36aa368b 100644 --- a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj +++ b/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj @@ -2,8 +2,7 @@ TokenizingTextBox This package contains TokenizingTextBox. - 0.0.1 - + CommunityToolkit.WinUI.Controls.TokenizingTextBoxRns diff --git a/components/Triggers/src/CommunityToolkit.WinUI.Triggers.csproj b/components/Triggers/src/CommunityToolkit.WinUI.Triggers.csproj index 1f6f494e..32d1aff8 100644 --- a/components/Triggers/src/CommunityToolkit.WinUI.Triggers.csproj +++ b/components/Triggers/src/CommunityToolkit.WinUI.Triggers.csproj @@ -2,8 +2,7 @@ Triggers This package contains Triggers. - 8.0.0-beta.1 - + CommunityToolkit.WinUI.TriggersRns diff --git a/tooling b/tooling index 36c23c82..ec70cdff 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 36c23c828c40f0a7b92af542f83d47ff3e1aca16 +Subproject commit ec70cdfff37c8ac49663068f0064387e4b19613a From ac98828c9033dc70134361ae02b57a046864b276 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:18:39 -0700 Subject: [PATCH 2/4] Attempt to fix NuGet icon Add License to NuGet package as well Checked, we currently have no third-party notices brought over from the main toolkit. --- Directory.Build.targets | 9 ++++----- Icon.png | Bin 0 -> 33602 bytes Windows.Toolkit.Common.props | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 Icon.png diff --git a/Directory.Build.targets b/Directory.Build.targets index af422ceb..b716bac5 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -11,12 +11,11 @@ $(CommonTags) - - + + diff --git a/Icon.png b/Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3e4e0a8974c1cf9f232d2475243684e678db099a GIT binary patch literal 33602 zcmcdx^;Z<$(oAdUOC9SlWsflzOhe#_@2Fa$-w+pctEt}Rmv9dI@)~NUaUUylg5X8 z29kj+(S~}lEPH(U2aE5sYy(e7rx+4Gv&QRJh~W}AJ%nWn6Tc2Rp&%3KTZc;p&v#5D z?Z|)}W#O6w{`qzp-s4?&?eON>B!rZFB4WoF8H{hxxja|v(_CeG`t|=+-4pFSu(-<$ zJ>5V(?Y%ig{tMm2oD#u(FEDoy_~2aa&E<0TrywtE)eAQ5w50n@$TbN2QVzO&K#miH zf_7hoGw*7RYRJcrE`n|zWuJvTL;V<9V-7vqxJR({9lQ&?#5v!hgj`@&IxikxpalPe z2>n&slN2O}(<>sg)e?bx=g1htcbPv|4}G&J~wWeORu8asGGwRtpRjQk}ptou~My zE)Z)casT2!bONcbecAj-pu{pU#O6p$+wvSZEbABn@1eEVVkh_%MEsvC{U_SPUw#eO zQ@ESJCHY0qJ&eKKUq|>xzE?kcs|r!rK_T1U|ClFOywPgfPFX3!4?85l`On1Z#{EXc z+1KynW=S4~)o$OC#;!q711fIKRo%rm!J(K0%A+W@0XvI-+^A=OcG(c>^Tsi3K5!tk zS;f9{V(sdN6~&t+6Ao|o3&NR%CO($;V#Lk?DjuZsAK1I;asFe&Ah62^x95MsR{^Xz zy53m$#R3os+cCyeA^$_C;&{XPP@O$Er|L^Bb*JlvywJiuV{CMm79kWMva-fb{(JC- z72HL0?qcA!q3?o0|8wbZhN^NzpP^x<(RzE6Itv>+6SR2Y|KU8XyIey_h+I8X79won z;ta=Qeg8#1zr)e`W^9x<@8>JxyJnzj>mI zy1+FTD9ku$eHprx6uvovS9_zoeAY9xU*vsot$U5Uz}-A;EpyC6kVdNK30&O4o@{%n|;_vSwu8deYouF;<<;BvKW{#Z=m9-bcb;_%c#5l4TKdGMuFG?LGM`OY8v9}hw+ zh}L|8Uv~=W8Y*esbF`jcDDiuuLr)$+;A^m}_L|(E>@IAJ{F|+{(ecNsZv z-=Al3G3~CQuv-CZ>#wa(;9Z*6==^(1NNDp}!u%T(jQ$~LLGQfO2|eTMIt=Z)-P!O* zGe7!BAAnrLj<^1Bab4Ybn5@hiPDAJYvcq~4=L>ir>-g|sbBziD*qr^-x7VkRc>0Ibaxs&_kwoe)k8lp6IF z1D||!gaj4tycEzkZyxOEWa$euSZAAHKV`Qj(&V}3?dw1mTZs8Efeh#CCk8kmS52io zRp+C%JGLPC%lmfl#SsK;Cl^I@(CG>aLIUr48(n$5cS0BI3hlr%x9DQsHxlswrol121~waIiXq$2^x@-H~4k?om3tk$(aiOCSjn zzLpd+pZr5FzMV2*0KGN2hB;wb$rd@o(90hk z*!+mq4Lt433NGzR=VZWg)$D<(&Hh&<0(p>$lAahAf4X;jxrafn04=7U*VH+WZ-{b4EFKG#=2YY8=VW{|b)hjog)T-T9v zx)*iA6(;RFy%MvrSRb=;7C|T9Poo&jVfSii;S{$o)Ez?jaX-!U{umB}psZ5s`^dWr zJ3U_)w*#rNrY=Zreq#Zsh;UDqwPBVLbJlnue;AyYPZYY>8M>{t;TsUa5luZ$Z`_@) z@BHY3LGrorNEGa$cCpgI&mI{@V0jz_fn(~TI}22%%4ql4Wkt|z2ghZQ#Ggs%I=|ja*)z4KIH0u5kHot#zdO1!$6NlvT~h!%LcPxLkvt2hgK)`1gDYpz-?mw5w(iWAq2E8-f0_L} zc_WS+&MQmYlZj29WUKVGEC*v)1mGr@dBYSkc=C!@#B&PfhLS`#c8vgE~(LE z8F_{YOxQ9HSA)nadqDrsm(dI)5tELV`0>N5W{yB0&fwifz|H;2*;$zD1}Q+|h&#{T zCn}0Z^fVSo)%p0>pp}qZ+KEi+w0MMQ?a=n3lVzTzaeib7EO&Y3aea6un>8v3!ef@n zjuKN*oNIG*2UW+7Y&ftg9rb(R&$(5;@RiI%EFdAmt7`7SfdfUg><&R4o8x3orjXJH zTn=;&h4Sy<`Aw;t!jEfjirf!_b78!~H%4fO9uh-TX7~#EMu@Nc34Y>48pHRk52kj* zPk6=Yf7D!?8K^(qcFwxl+BSA-;0o=UubEo0m*tXU#dFc$gL&;_?-vI)2tIYTk_LWl z3zQ2Tt9C?3MEL|0el$&72muY}^#udiGZNwsY8-PB2J}{T$s^^L`$(n3f900~16)UT zof3>s1B%`F^M#}5!(vC`16U&cQPzuDw}MOX5Gn|G39ElV5aA_PsIOdryXz z|0+IeiFp9sf*k>=VHrMV52&xGYk33o)JWa_Iq|OU#PiE81zs8Od8S^|CB*tu?A3Qf zrMN6UL*L8f-|E``Sdcn0AZTa2ACVyi_&y}d{We>D#MYMmSX$l@$QYuMXEhb+teTm- zpBWD<6AFHPJ#k24a+Ga9lN0*tipoqvCO3`#jl>8TTiLVRQ^zE)8RjYsrght6<~iS| z=Gozv*3I)34*{pgc9lZLg9=mARDzu*Dny)peAs#%fU`>rZnsH|n7Q>~|3g26YiVFj zkDa0`{11h))kGfuKTAwTMYu3@;|^Aw^q9r>LEosHVTpG!rbp?`U$}pw3A?77*&nNc zlIQu*aZ&Cmv83S;3DLg!w9A^<-%VyaUUU~$j0xESp@xdK%DrwVym}PMz*SK{s zmquo=IU$LW%!%hCUO$;vCq;Ytz zWg8$>pZwI$2;BqM4QWuAoaWtJvx}5l4r6dW+XI*p<3#V>B`3JXh&o`B!k?Ih-+T4; z+RSaQKYEJ9nWVOOpGUBbR0^IpDXQFnd&Y~|_TuDx* z^M{;E|67G#|E(cN_@F>607f^J=UJ2Z#qR=h=z@HzX;MxD_t-{YGzoppS6o;3omrFvZ{sL!sJ!s*h!uimshBDk&>F*$Lv>KlfK_iSc4v(hNLDIfogFt8C*^Jj zP#TfWeImI4LcpDi4mt;!q__e~Z00N1AqW1$f~iSwkzzsrXl92v!!wT}pKb0Q^;e>% zLpV$1ts5Q@jY+maAYx3mU~}|YblQ{#vWZK)(i10v&7*oy-!yU5INpbS=2yLsFK%^L zv=sg5rTyp;Juz+oU zPk~Aqg8_Q$1^OaB{ip)ERRCUM!^N-LOfUmz^}mbROo86ftDox**=4d2Ym#=jwY`q> zB-L(k6diD;;TL`2$~Iv^*N&YF&a1|U`PEP!+K6>wP6idwFh`ay2V_ZnmV+XGrc2ZG zVBSzjb99DTduWN4f#;#ro-Nw%p;M$ED3mVym}f6`iPgP0{)lAp{rzG*BtJ6$eHLOh zZF+*l0J*=T@8v~!YZfH)i7v`tPiD@NJP!h=ZVCmzbe<*qZ7=#N*=z62;?SDKkh8S* z3(NSviy@cnSW@ zXiU(!tV72Vp=1iFo$}x7zP3&fmUsKvGA`*sF#4;}i%Fo|gSxtxm17`Z`3qd=fwZCi zGscMC78FWoMix{(m>V@hR0I23W+6TXPSN8u3%6-Jc-e6h&JXdY$Q`J*f8$)aBN;|# zdG#1roT17ROr>D(4O9s_m5c7qIJ_KR7&$yy^0K^HcgfSq-!->W(|J60t39ts`}_B} zo>12iZ2TT%Fmn!&k~KQD2vaI6h1RzLyGCQSE{SWpDtzrW3oHy7OVmN$m@}eXR3#;k ztlUBGKZVl8SVh>>9gFS#Ld!B@l~jd}tH97+X7O-0B| zPZP;b$A44kRR;XVqF?6?bCS?VzT*HICa_v_0nqo5TCy@n&g*n#M?rnN9V@q^##c#f zm&*Q1V1{k z((yS>o|zmf$(S$qC{ZKiFmTGjtm!s)u%nG032W-t_BseT_+dsrOrbDrtH{Tu-y5g;?(qtFt@Ju*fpgxk}B1g@xH>iU!Z) zM9{ZIv{y7dVxSJ+)=g>wRNRYfg1P%sae}oYsbV;+{~Fc}hI;GE5mGdfKcCMeV0RAD zKdZDu48K(xxK>csYq#y+dVsVYakcGA1FJBmvZfLd=PVZ}mbGj?n>o3uO z)lbTzRSyRCpiPc`46f)+o+n8!%ST#-H4QNQWsRT2(@y#cz%jn#$p!;PX(t6kE^@4u zY;OK0#i*ol-}O)lOqxYCffQym_C9&5ZgA&XTBmys zB#@ms3UIV+(+71FvX$S*4X-?a`2`UM`pAj-dCiYv>rzth;LmrE-d1M03o0urLR~Lt zQ*Qyn_acKmo*Do~)|U%|0TlvLj5Y*_NcUe>reE@`oA}Rev}>Bh&?q|lX|A_)#-Xe; z$Hs?Mcu`5RiIU6do)epsGKCXS(ld&%oZYtS@1x0*Px$Btbqa<#uey3#V>2vSb=3Qr zQvE{Tbk72;^-0bF#5CAvR?&OU9=;`uz|1v-~j+$SwQV73I`4H zlPMT97>-UAf#-Z#FINwDh= z&VITdLCJ+e4!#|IN36PQ*_CXH=|ioO+%a*Y#%JrxOz)&0(_|2|cGV&tDDYO-E4C0< z_kM1AzrSYKsn^nyNzj_rZ=MFHC&Yo58l`Q2LWJ8|oykxrZ$xP2; zTlzD_?Bo_-Gs^L29ozE%@@s)r>oP=eA)CU;7M)x7GGQ(Jf%hwtp^aFnSpliorSmw< z;nM1X_o_j;imxw&TWFI&~z$4{Ki{(io3f_C;CtOEMC`=x!BRgoBRAroI zS)=gqD1L9$b3^Y{ky3LZcO8W`1LuveL?8(j>2@iUA9mt?2}wKuR4v~6dy3BQNpnOV zr+yiH6=hfO&ro8VrI?Hjr4xr-gAXYQxGZCv`Y>v(`x^l1JXQsS}-`zSite%M>VQ%h0 zO}@2}T~^(3PRv$TQowwBtWMho8mL-k0J@dtL(FP`7J#jKyCY3|uq%{lQitcJ4}F}Y zo#9V8_5yXup^?LMExV&?7DUItds@Z$7G8YL~3Yo;qXe1|q5_>sAQ^VP#+nBGEArQEH_-7N~Ki~FFi;G}qnKLt+cLNbB zE~X9)SBph-Ova(LC98E`JG%aDQUw+Q_f)gIKaX%*nVvC=+S=S3-}EFFA~`V4u4%`2 zDh1MmzD%|Ng8+RP%rYUU<_f=yYp}uGk@d|TgFlCr*b$^NjqSPL;tB=fn0B~;w}P0u zsbvo-H}uz^eGPmbE&St1ogIt*6W-5gc(IezhMg3;D6=IkCaUqmzjHm`zgb*8q!G^$ z00)E`XWxl3=_mb;qW-ECI>j3xlCOyi zw71g?U%JypZ_~#zwM|dkV9BzBQiBOY4q?A8;HS0sdCS9pgw$}x{5g{Wom4fZz58xn zm&7DqMd{O>i4iq@h@ynkp1!cBrY02l5jfYQ0fXG&0Qcu=Y5dt z$dW)(RO8}mIE>hg1%d(xnqvPhan7yo>A_B z*^~i;30A#FjQK=H9*$e1Wq@M_;bgBwJ~|KEmgqBN$l%?#>;J+^Ft-pl^wlDj$6WiY zh+|~o$;{xs#78cG3!?r?0U>Sb-%(GvUc2y_BRCoI$NzOdH}WSqM!81xs$K>x-K93_ zKP%$`s|eoMd*VF(`&r}pW$;RUZLbBO)y!&7yJI>h_?1@~rTCy4S9%lTA@Wj$Tn3vt zbq6SI4?a;1hdsw!4}QHfG(Sz#@0ss5%2WvlSEy2mLN+G*(L50roANvF%(jG_g%3Z2 zf&lVRqGOkz1Ccs2nIZdIY8akRBU7ZClSay>t!f81!Vc5X0r|^!>S>;t zJTk#0;~5VcyqQFeB65}VJeOMtG0|a3cUQ2tb0AHFMAti4$LkB$oJ2sZYVE~#{L8%RBeWhqiiO1nc~iZ9!NyG?_Ln}+@_DLU z=te4e#QT`@V$UviNU01Pi7c&KfsbFxX543abKWi@!dOj-axDfIw*MYZNXCSnw`86m zZ=1)HA`On35SX+Z3PEQPzuFu{qSo3)n=eHPuVmqT;c)fP@Zyy45@y$S2t#MUZ}zfm zgIe#hRrzF(G2o;5U+(RH)rg|L9Itw2zuT&1mix`@_&z({Nj#_Hq%T%_zha~>HiqEb zJWGpIwx~SgnBT@HiQbU9iL;(`_q79hkW!f?H>moF;^}+6tiX~~9`ueeeum!Ax}CJV zoHVGY&b?;0kGtQaqN&<*40WDdcomXzKgH6IA*f$b1;8L-foyR4%29gfvnwM=y?h0F zcsP2Nb3v%jH>mF zkXMsKBu?R8kynzw6KRfKO;wJy5rEvx-`My0nwK7%BgSj2ClT7`N^GhRN9u{?t zA#|vIVD3Tw!t)6Vj3H;@DVaEY1i+HL47A&h`(8q6K0lMef%_jsV19#Ks*nsvUdqYZJeCj$Xm1 z_lVRlKJwz`0bawSfn1ElHZ7`!bohCfratHy2uJ0AofJVCEE%w7To2H%cVkvijT<-Q zD6lK`byxL`XXt^%1qbF7%ao6rUAZ`2ct_(WFBNX%OM#}a9@-%hxat?rfW3T%)N}Dp zp_USf9ToksQq@v-yxZTg0QWZxE;UXk=@Zp7gNJ+rg>0;S6vK1}U#Ei;vAcm_MtHDB zGSqUx?s3lc*S6*Wvm{Ls%2|h#HYvF#kJ>liCPc!z9bMBFU>sxi*Ci)KkXkYJh0+I| z1#qaOk=5+a8);_Du>1`Yth=+ZBC)E%D33A?-OY>Q10+3u&^KI`WXqk;wB4>D=lk13EmJG|_(e3ob)+{9ko6l8QA5{~Kbh zf7DjjXZaI#6rJ-vk#g?+6T7*)RTaL^Xr3E1wGsG%F$n%qJj6Bho(;_uGH&kaW)Xh!{!aTsLhlddK3WI|DRfcv zR9MdmCIvbtxHx(H)cgVE=8;US-*YsTaGfy*Hu32T$s15~`mNy{`0SVY!TTD1)sQ@( zyX*)Ia*l#}Twd&<@zHv|`n|z5D39|Fz+LyfkD}^|=W1TJ$E4|X#&zSFZ0*i!RND{Z z+bHp0Gt&ndy`708=ss4p-9OGR)XhR)+X6OZLpaC`A432VBbKbP7FlvF!YtS&Y#=3` z$0(%SVKGP7==b;QIvA+lNw z%NvwlJT`)+&**FM)XG)&DMMnj+AemcVw=gI+-j!uSF_2eyixD)8KkY1r66g%+wHke zR_&T^w!8|t|30^VY@n-`gg2JA{l(eLtkEvQ18R&M+Ha)c#%3bh2mWHdsV%8(Qtj2M9~%qASpFM=LWow!MS z9s=={tZ7`8$31&BLD&KODBvy;;m9RXL$cN>s3f#?qjU8WJJ4Xkgw4w}M=>|SvoF0v zU7^#xgjDWMM9{lBD5o@AmQ8uHsg)v6)Y53v3ber-5t*k%kO2pUWkZ+arjM4}NO6kJ zK;JHz+R*%E9Mg47@JLNqnIB0ZAVGYM^l-;Jz2!j2wxa?GcbLc*N~*SVAMPEZF*hambNTd?%{l)V3Mx{kGpRC@AvSH z90h2QIL3idYQq)rvh8sA&A+pefMstR*0cSWdS*NiL*5BYCAY{o$XnXv_AKo)taX&M zEaS{|QDUXA+`8kbbfMW<{&+YW>Dx=NEO&txey!~9F=@{CTY>i>7-I+1Fr`j5Pz+)2 zfo9enZ_Zl z+baT%J(740s#Hq~mG_uA)<(88Wbbt6jXuj&VE$gKbK7$(0|-0*2~i?EU0$oq%EB|E ztlV13IY2ILX9jl}UUXi_TkA#?-1RZ6cpi2Y;By8)+5kYq<>*{Mk|0=!108lWvUx5bTBj=|Wfm z14PrOBqN-N^q{hQqUbQHlwyoIE^@g(*-~nr)aEY>b=xJPG=LJU$MAsan0q+gteOIk=2h)OzTMO^6p=^x_0!;dK3$nElyTzWnBM+6j!$+#`kJXS?qowp0#&83 zz^os@M+tyy^KBumh9h*BY&dFbCNoCP89}Vc?xuM?aWhS4QYJPJom~(E+`aqrE(Y6r zuHs#P;6kYveNb*eUcEJ?brpAA41^OLKR|rb>b%Q;7udY2B<-hj(pQ_T7HRW}bV%pn ztJT%8n9vV$aF&RD2rph4-_VR|ziQ!#1*)LmY(w_DMb2MO$8K#bBX{u|x9k4uf)e&3 zj4=U925B?fzQj!v@>6C~m60_(n%%3f*DjhyLPE(8$yySCl(~OcryYbX{v2)AI44lZ z+}(91(m8z*pdq0>rGG8@g}2h2AkgqA+~~q?FTi>ydPZBXn8GCqhP-m&}*q zno^-`?_-{nfB6@nJvn%T9AIByUlhE@f(p=j1-;1=iO;^Yj^D7SOD%hu{)|#K=HF#^ zj&b${=o;jhqo_V!e=G_Le){Ln2cvQdqsOJ#l)2#9I|rP`?b!vsWG*!kxzXy6X@TEM z^?s;hclpE=+P`ulG-aT0j}dCveAR>`5R(hIoC248Mg6K}fmQdJ>K~*H{@2kpc{BCg zwF2S6C%>E12NZPKgAQj}`c@iW9?Re+lI}p|^bWY&#;Ai^r!HA~6eRuVHC0NwT%!E* zURsv?Wfh9}WEu!~%OP-ys);M}|2wde_HM4!@Q5;kG^vWDuC!Oh$CYzpQNB#2IiTSoZ#c=|T>h>~T72w_xyyUfnn!-6Ppk6JMtIuAp#(LaqxcA|2tWn7 z1@tV7P8xmfZr@YhxXl*pc~5-clu@-Yi{G&=np71WviT0cpJ#Sb6Zn8OrQo3S^hPhQ zONZWsYHb$b6rKKCqnYnKt)6!9cWb!d`?nH9o7n~C@1Y)RyakYGAaTx#z_-l4L$cO3 zkU}Xlwxi*p^KBEOlaK-_iw}u>u#2_fm%eZ)kDWaCBeif+J*=L=1;+i}9c#9_-qPxI zcPg>B)M?gd)oieiP(uBbzt>3i4HY^+NyFXlOJlWG3$Gxb5tynX9ZIVhy0IT*xzWa- zq7gmCsV(ULiXF`=$X#p)q@}-xW;}wpWN(S^{s~HPZ`%Kb(Ck65=~` z>|&c;WzP!!h{XItEJx6!2iN*~F<;j#_aVgQj8J{sw~Ay_3R=mKdP#5S$q57PL0fF+0{E&s z@ZeFnkjkgL_kf#HzIG%Wx^d95&{CcxE}#5&?JglMJL)f z!;;yIp6$hS)~amZT6&k3EAUEgsL=qgZa_omr+0vlQma2`&>QkQUx*@%!c1Dr$wRg5 zE#=R}e2uDt7r661FIaopGJTTJ=Rn^lnsz~qy#Lj^w2$uAscGJcAx&3QpQp-S$2GW3 zAZ!MGBAef9)w0sLkzfbp4(KEb_V(2NrAvz(Zj0Fr4Ae(|yNEmioLJ|$Ooc-R04J~Ls& z;QQqTZSIbEjkT+a;_oV+xQ}A?k%?i?sMJ?cjOJT}e`Q`{&Sa!R;uXJaQRF}OzSYgT zs1XBj+JB?D$ixC3_#~)m*uc!f&Gu3A>g}|K+W!iUhI7pcgWD+T`2Pj;oKOWhtsqBT zzXB&$dW6@j>RcA=9e!lRv%O5F5nArPu++h#afPHgHFbu2{K-_NobK;n(pJ0g#tO`Z z@zk@uz9(xgE~YNyDY#{E0%c;D@)#_IvI5oLnyItzs%URhFLPgFC!R0|w#BOGN7`S+ zz54-=VVE*Ho0Hvp)U~_kmFXI|=^D0KP=A5b2j8vJ*lG|hZmJj;vHR|k@v9E--M2E< zengL;pq!%j(8KO2Ae3`s5rj+jQZ^R~zc)9H8)xlkNWc(g_!aL{m1TAONaLUh5mgh( ziW$ijwC|v3ODU7%G&I=mxEK_$eq?#CfG2W*_im-eZz;C+$bB%5Owv^03o3|}{{y*o zbYMbFc<;}~lR3q4+DLj_#>BnPT7CDF<}*=BQp}_!+_kIOjF%e40dZ5KYgQ?}ZE1O4 z=gyAno-5*BKPk?r zS3dYBx4Zg%?bMI;jD99T(^0DOiL!z(cyl={kU}Xcoe_^>Z)ClNBEXBVSY|2NN+1q(AcEA1chYp#!!mv+oiZ5>-2y>f#Jc?toqkpPbZBM1V%~7U;#}DL!@A`0;#=NE1 z*uOlr!Pqvfz95cGl|@H&D-TJ-2qRcx0<`dIrF0^l1j4YkaeXQ8iza)}&j20Gt6~X1 zyJM)sh+~@bh=q(x1{tyuU3xkW3X*S--X%K7s-$X~=w7zK3(6laimm@@LFu`nt`P+TPVXde2!^?$V_;-~w;dd+{rjmLum)a3O4v#jo7v_i$ zDMO5QpDq*;zHD<}gov>Nn7yyap<9F6B!2a3&bcY00cJbTU3pg(ShuWbz7sNC6m8Lq8)p<7LyZzk--jf;H0U2=`oCx*1f$Ck;KF$;H2rbncpP#M0 z*)*8Z-iR%4n>Ql(12h-UQOaCt6+iMRs6Ty=Xt{{w_})r3wEuzx6s*zw;W^k`QCl|d zzZRBL#^l3QLy}FY#AOcMh*ItslTYuTAu+X3DTb{)u&@l(d)D5(Zx?V4^$UDcBI}55 z2kJcAS8|VP9GskPl^r9kuZ(bp~Yznt{Iq97iTaMYjQnArstK99<)ZDe<>ablhQ43jeIA zlt|wya&Dy{GCqmbZOG(>D}6BuOP`kGGyYq8L>F9*c#biyr%TEuG}K->8c7a?SVm<> zak2FKW6$U7&Vz04MY#~{Ib@t)NQQ-(h^yu(a}n=q6G7LzrOyls%I99_$D-3&3a!Kk>P75od$kL981v*Gp;zGVrUwQ zzUF*_-aI_jj;vLv+{K&gb~JkqKMUgg12~e19qS|H{dOqjt{BUFas8~M)I_-t1v6uN z63$3|tEy26R)96@;$fqyUROlrJxyBP$N*Ke|2H7O7yZ(%{A291U{|oUYglpfN&VUe zwqY`nzkvPQ*&Ol3L%!NS+nsXnIY_Y)4lPY&+u2c7y3$Zo5raVkADIDH6B`c0TiZYK zHx-dY1ALVJPpZ6nVDw};(g2nN9<4uzJaw!tf2SH4Lzvj{%i)pJFSUmrWwrFovlCn! zf04-H#k9Mp-yR;)>8fvF*S=0H9cSIPSAq?B{av;p7f8_!=yj>{nWCbr8RM@1p|71 z4*BIpFyR|58sV5Ko04UT^S=;Ed=fRq*om)YCs)VkoCSOOtfAd?%ZArAGQfCfy=$Z{ z-$t3(^#|SePlq&sf^X{N(z&S5+Rb~W+HdIG1$dGGIM3c{N2LfZ)32i@O!R#23o0Lo zK}v07UjO9vMq>|d+IfQ{07{~Co9~{DD)AKHISCAu^t&4Mxi6C$;(bpZ0lvSpYEvfG zv47r9q7*@JVzsXUklvSm*`aMp`h-t|UrI|yMkAxUX*i}=5Tk78ZYT4v!Upq(k1EE^ zyq0j@YA^+_DG2ZCo?PY&Gv3g>CG&I1z&0BFuX5gm$wc^n?c=7OGHJvVX6Sl;v`(Sg znbGsR5`WZLvi+IVRfC|7!dhqoB@^Pmp1l6o84iu?=yu^~FXu?HzsZY8-jV?1yF6&z$@28d}N2QKYAfvz*J}@HHxR^Kb7z zx5UdhW%;0owGO+}?UXPJ-f+zD}CMD$rxht$1NP-@N^G}k5( zzLi1u#7WUmetRQp8}_SSml8G=*HG=t#I-o2LtbWODT$jkML^=~yhfA2BG4!D^Fncr z=eNOUx;wuM+OS}1eUA&jkgg;zgVX9JWu<>m_gd~kBS~+2a0Z8PQCk$I z2}_{0G{N{sXEU4!Y%SWKEJ_1YEr()t@nWn7#6-G3$v!Lm9{pMC$@EJ3ZQJRTH*Slm zgl?IsY}r%I%z-#_rTCrqTFa<010+A$>g|_+q3JYrRV`D(LD`z5%K;{f@W8(%LC$Wu&scsx>zh?^`b_riF)QeU47NdDRVq184QtcH2NJ_x z3`9UBMrEx1%=Jb@Jo0%4Yi@tMIH=p|))k3P4H{BneEA(9xBOMRdYq?xtIVitZaPyW zX>pd(WvhycGmX8YsPWRO_xJv6vg^o{WWXELGncLB0{HQ~#JD9t#E-et03+qr$+aVI zOIciW%z*2i{B8V=6HVXhMKLocg#a`;$-XBsXdSv+XmzB&+8TWCUo7Ug zJEBISvOY=@v2C5Ik#ULckrB{*Q3H|#%atqR^y67-(4{uTba@7tmbfu>`Rc+es2OP= zlQj$=S?q8`y1u740rX*g?5d5a1SHAD;KSk|exu^4)*!K3)*i@(PF}^;o@zg5;wge( zOAr|1$)$tX_UrOB+I5(0)8zW)OQsM;AnW8QMt-v?eZU#1fM+ty4>2i^P0}5r z=ol*!@lRR4L$BnX+X*ozn;!$3ck^q*O5KKJWUg>9!woVHZ|s}YgagxuP8&ZsDcY5m zjl2!}On*2P!BY!)?aJYDpX2fUKO*W~2X(?#4Iep81nwfHA{H#nd$ znQ2#==dpOPQq-JWn@gmVvGE?8GL)U}miP25`M|3L54YeS;+geTi@uQHuad)MQ>o6m z>on+A+LOqIq|^DG{saJ{EkQO;1w-eN(Qc>lTfW`_I^*g|hj9I(Bb!$Ch4rC#fyXcn z*p$?q%A%jAoT2#CSAvO;688#BvbpMoFT6bggl(ThkDhjF`FPrpuor0vR$eGG1b@z8 zJf<&}yjtsI*|(UGjoBBCz!FZ@(R`HTP%b7&TJvE#42MhWsx_vS4mM&|Ezg-&?&o{%A2XCaw-ckwR5>mpgbP=?HUmikn zS*gQ3tkpE8GXs`)C8Bt}LJ5H^qo)DtCC-UOf+n?mxTd(394z(?ub{Kr2{nhA4}w2v z2^_X!s0aTNe~U3IN#Jqz8gnFuNba|V*!Ufc|A_mbt6cE$v~6=zzo7XiKqm6FrNd|{ zoI;EEnPW)B=;tY;&IGiAV9d#l?`l)P;p(^CsQT@6=f2<+X>nrIo_#z^@3OW zt5QOi=q2|g8*27>sFGH6RM>F%chi{jz!Ns28#mGJue;QnYJ$mm7ChJCoWkYQ8l)@0 zq>IlNOCNHyn}vhVYZz#uOVscw6X`8M3|U;OD}r@l0D0x^cd*ktcgLBCS8HyO{DG2j z^V#)MFrr3@BAXdfToxn9GVCk9Osr(`gjjJ7f}^6U`b~_{;>XTMoS(JqjC%YY$@o80 zzR84_Yn9*3eieMG#ua!GCaoj~;I}SU%A22J+(Wx4e*qlXb|>qHc|q9{jVg0jT#Xi7 zL#A*L@5b<-7mlf4{99K*nAS@u$QtL!0s~rh0^}<#Z7kXGNBm(sEpDH-uE)lsN=N-{ z6}tj2g?Rok#ljbwLPGzh0^-F^8Jd--^lK24&=)Qgxv4r)pM*0ZJys{f`DhKCn^fol zae!h2&z#I^L^hQbkYznUis>z3NX?cZTPL~DZA^gVgA~)8(16by;oplPO9vP0g;h8{ z6)K?wC+uI}*v>IA8ie_5zFu2_bW&-yl@^LCUanofR`mnpDkBtYPDND?5RTcrU<$4$ zy{^;|hs`VweZglB<;R;Du5Fb!Bu^_yWL4M{K9tK%n_Vo`33hZksf8R`wf(R|ZV9!7 zYx&V*h9v0YKUBOgeZIm(-t>f{r_&E(0eXTP-({qP+InemenI)FA3Thk$ssF_9(4`5 z)KlPdJ*E34 z2U3A96t8w0&6I)~oFL%(dfytt7fnM_R#6w!%Q`|YdX=|zK7aXeMYfeyok6Mce)|)h9i${6*3$`tKZ%hc@lM z715;YZ3W}CA-Ph1{DwX&_Z@2|Vv9ewY^y+R|FViz3(L#e-hn)bhrmQ!cj}in(BrK| zZ(6C%zmWt}ggh=5!{en6zaDUbU;uZV|lll9;lx1@=t%v~c#dcJr$%SItP^0wyUjD7#?Y}ZJ3{)xjete@h z3H#TT>>HRXr=QR?AG$_B;Qe>EiTu74|ZwfUuvVV)%(j|BjEFEI^BdqUYEa%PHG z$hyX`#$DRHqdo0HQj>hEjYon^gLm5xPo4>D1q!$g@xbRH=L;AC8Ra|5kmLUYJ3z$0 zqxksm+`o9X|E|s)5oNBQDPGh)bn%gF!~;(7ahw)qKNQF8>y){Mo&~@}ir^ru6rBL$ zTY;I;LWzkJ&uGOc7oIqpD`=v&c{82zd}MxDyaMO@g#Nyfy?1A=zqq?f8)3Cvf9Ug;}iH(|MCB_|0w7VLgF=&jIp|h=VKb*mhE52Zpc7=jshC~ z11nU#JH{zj4x@upqI@hEG|~7Hr6I!Y1PEClK_$4vq~rf~a1%PvJl-*G;{nMhj!-=`2%WGl z#L@x!ti8@cJ;Knf>uUV?-bjQ)=d@k^zQ6LTWlFJ}(S%0fOQM>PcR}PU@n#*ag3=2$ z1@80nkz+sJ2<59D;~?Vgx8(U}KB?O$eqH{cenS7$H+&iX(3ihQzUueA7oUr^8~)$; zr8n`HfA-h#$@lzzefC9P0(te_xIKF|BJu!!#0|3*=v_IsVuVK9n~f@x_6V?VOt=ypHwt>4A= zsZU`0?cc;#y!C7Nm;RBjldu1Z_u+l7zYCv>_Vd5|>-gcn`EmWJUlZKk`=xSw{eAZ` zf0tSv-DFzjIJTr!UQ=(N3cAO3&lcjWn}eoOUJpTzd*`xx!* z--V^Xsc+82Tsyd7iYw!IhmISMY=d}u_bTLF?@@X8dvJT#d*t@o>&MT6%WbBuf-5PC zDf`w8vKStNqXGpKMS}CJ1j8Xn$v}cm?{|CU zRqQ$Vv-@;F?+sGkdJFRW?Gb*77r*;A8nMJ%vG6%Sz&JewJjRDorVO%GIXOBOS(#kw zQPZSpYW5?xHgK? zg%6RsiQ0Yt{CO6=_U+#8?hXI8A3^4%y&6tHFldgG0paV+>tNv6c;07DwbaU#z{ZhM z7;uzOo(qXiGaG*jrx>PYLT)HC3XS>TLMl-zuEu!de=&xLk~ob>vE`F%u0EgUkYVX?C4m_C42H9|WNXWUn>sEd@I2Y;4?BVZ} zt5yMe&Pq{3A|4@YXOtTN41g9b48`Mp6QGcoLYljzV{VD+>@m+F{F~+0k*6WT?x3sY z?FJHA`4$H#IleYpmjcR-dep(;9g_B;^WkJPKOP*zfc2h+ymZRzzS6g>K>8zEz+w(4gKMTf8mNKh5Y4cR;mv z>);Q29224cHk|Xl)9=a?VKHizdxX1N{=B(nRKxdk1TV4+fx0oTnw4 zhOarVy1d$Yp*J#~HtiMrM*G~D$6@RU=a&3Uo`<#Z7yvybb9*`d(Kq^%ZJ~JjvZhWt zBMa~7&&-UuB=~XLYD}_3F=0h=v^TLD2ZGUVEEYJ0koh$mz5{`72`nHF8jLaOTk;|4`+mFSeJM7xO7k0ALiZtU_n&b_3x( z3g{$3OW|?S-|9@n0)RYwcfNS^r^H8b6F*Gnro}PZF9S2r3t(>TsXw3qKIxfLCLUeg zC{zmDMn-M}3=~sA)166+0s;`M_Q5j0OQs^j1#xECYoRYcRBZ*pS}ZauvH<4H=@EcO z3CLX*<^576yo^J9%k4#+dq5Q}yQQ60krOC^;p@HYNiAXU}3`qi$SqCK3A0aRh zjufTIog+O7&_;SkKe9&CUy~U^m-GA%lW}l1+|Ay+sp27lUq{ zZ=^u!Od1%2qM+jbJs~KXFIDb2R|2mlf4$uzWGEG1@0e&fb zAn)Wn(k%?j_ZeP!C%GAatVMhb!ygK!5nZw4@V$yCf0NZQzNBD?$Rl*MIlle=MxYh+ zNIq$s^dP{2KPpaqa$+Q+Ak(q*tmwd>bK3s=Yt=?w3MD=8^=|%#J>k&kYJ3#JNh%g1 ztSE{JRE2L$5r;`lqmt+zRh4{1+0zD6Jew?jK(R9=yd$KCd0O^kQG)Nx1u}S1y%z6{ zlsQ6P<4FOZ66!mzjmJ2txd3VH#XE1A8u6Y(4#w*WboErg*YQ2|{S4fl!QDZPyp^QF z$pC*U7zdAS40&P$cqu&Mzx6vF&F}`phOCBc3xKgf*C;3TmqYZR1+^YC#gM%qxksq|7EG?Mj)`w!+8GAp5Su zm2m~=hb0@fI*q%T6kl1D5sB| z+}<|g36BRGFNSp$!~jj#)j5P;vD!Ssx0J4k6KteSR@m5f*Jv^@*V#+os>5Ei$}&6=RLWQozbim ztk4lslY$DI=@PEypo2k+L1(Om@M0(+Qo`K5`ETbPJ+}oQ$KLz|18}FXjRSB6F}p;3 zP8abDJ(aV4d%q3ke4NrD$6uKKH%G*LwAG6t6OVacCBpDxUq&h8?J3iIi{&&A?q*vMQvt8p>YMJqCSysxdsp=R!lx zU)@-GD|uGS(|oejXVI<%v^SW^i3h=+hj5tdv@npUW>wo~<`k+JpYsghG{JWtAh!Z{il^xz~JcD!zrvp~|TWSCn7hJYe< zW+(F12V25eGyO=RQ@HJuhM~CvQf@>{Ji-crr)Ge~ASJJzls@t~_IgoS` zLeH1@eF6*#JS=?RXv;drGXZ0&l#!6*NTUqERIq`PkLgh#U@lq#*1=elqKX6;qd8|7 zP8E^N3+vE9uWE6~1%%nb2o=D$nr4>%O=t4nFuptVP?s1TOr~>c%-h0imt*S1s6|PA27vV*bv~N|Hk0J<0t85vf|poCWPqx(FoOXp zcqt3JhM7@jut0Mh#xiOH+B}6DWArylMAO*Xh8#U-ClQL6mT^i=9duhO9G zeuQfQfUcOE_33L!eEwg_*%(q|YQ>-dwp!4Tpua~aZT%>8CZ7$|XkG%fG5OYLAmeg{ z4DU}V5+r$a6Vq)$Nm<06?sOhXMk^Mb84bo;1{nwC07Om;#2)bJ-c!*+f0MWB1Qy9h zjICt2UW}ad+jvCjaiv)tz=BsvNJN(vc*%SFdLkrSD^#kob6{{OvJD^)hw8r!M1%%2 zjL1Mr3ZKS{nkSjwM{eG86`#ZZ1#w$@?3eaC2~hZfh#X^zm^F&ruTz@G7(3FUJ=o-P zMUjteLyvD-o%Ubo^}>!lLs0fkYmASXs=HK)bxbk&U!R}XHV{`%y;yFf0_QK((t2Sq?qOA@qngHOiQ%CD;>C@sRMLugJyhMO{=szjoSYW+2Wy6W zHkYdu{?Qy^{1Vt61=3~+X7d6LDHwzznl?Fj6fl^Zsi)F@SMx|pFZy-k3_Uj9JH3S= zhmLFN6sn^e{4|0WM(*C-?IGxhxe*@P^@sOC6QTSlPfsg&J{P4LdZIm;raBd^Jq@y< zgP+5GlZUXc1@}!1Z-G)w=^oEQhhW%7iXQ-h&~`|uiZAM}N2htcs8QE)5Wo}$vq0jl zj2*b6EhyYVH_FSYpA$N#7BSvEZu8)zaG_ip`_v2#HBmbF%z`09CQur>!jYHOQwxr2 zB(^EUYgK=y!}-`jgN`NKAxv~C;NKV(`zfA{8ao9GS1T|mlS}d>or-WJ8C3Lx^n#g~ zD8$QzYjsx{n5TccgA`)k5off;$^cJ+U(Fe zlYHn1JQ9r}U=HwcJ%n$$NwNs3^t-m-WNdaI&~UWuT`k<1al9!+4rX)@V!gw(B5(2#tanWysB)X3JfP7Kas!dL$H&yRlcX zwOs}%fH^id&f^#Ll9)^Qsm|OZAvk+~TUeQ9Dd10T9m-*~DY#;5=4rIm6hO(iDAfs> z7T15as5owVst=YrIm&5&_TGK+%~F zL3Iw=z$JJ?0!S3y2XPec6pyZ%0ShJ95e6j##zfn~+$jWadnsNb4cny<`?EU4oO5b> zOqIe)26PU;yJCTaYw=G;biz;KRqyNj;MSw0(w97wx-n4HQR#Hv@dDy0j$?XwFjJZ8 z;V?FZmJ17tPB`G&9J$4$U-w7eVhxIt1`xDwt(qJYvVP)!QCaAGvLA-g7GW7k@Z-F` zN2;eFc`}|c@zjcSx1}pR8VY;%dKo=j#QJCx=*>f#Nx?nTp`zXq+H6HDYhGyKw_juL zDO9x&f||#Vb<9|b@oTG$*8Cdba|G_XLI9jfC>ev~*wC;La7$;RuZEIke^ffbMaJQI zl@$yWx+6Cc;L-Vqo_7-6$qVtXe~-KF-K9u_#+lQ$S>wMZ!vlb{obWkl-BAc)CxfO$T94sW zNtxgVIYP&rLyN+>Vjfe{MC#1pP%FGNGg9i2iZc;NMhWbZ0_SQ=BU~Yw`6J}>5ZM`6 zJ!78>d4_KNl<9Q74VflCRhyRvfebR*iM`(c-69m%3E_puC%w)mQ_Kh{g%r&Ve;`yS zOv<|(83X5W$qe5WG8adr)?*&qmqv*0M^8#Ll$Podc@-t&l97|;*GQlX{uoI5gz9Je zMGtI^SQVjrT6o1No%hyaWXjQx4<{gW*+xnl?^&M{t-zkU@C12`tQ^q-WcxgT zeP&$ELl2FfjK7R0c$D-Y;bq**^14AsDrNP)Mpw|pg|VP5_&r5hR4jzWY%uUB{ASNB zsks&<35A@)@KtLuE7LS_Lc*i?J+?~^X@QJ6M z9mJHs)BeMr(jWMYUy)jB)OG6rvBPDP|5KN2s#Nv6SWVju*f@;QTEYUHVAqOFcij>kh~IyF+JDg z&<8btHRhPYAj4*O$gTBkm>KRlmGjDYoXlMkGSDJX7RcN-J7}46>ynL66jw zfoXJ}XrKk>vkTYiH0^CmJ~}--f|UxA`9AMIl!)p^V_Yg+$P58Sz7gpL#vUz!ZXhoIwpQppgB$}n0pKxL=n8_?lo{=pz^Xf2*TV!2lG(z6 zb-iZr(`1A3lr97>C1m4!&7TK%By%L(J>-@^z>H1-&g#~X-$5e_Q9>2|V0aovHyWSI z(ajkZsfT@pn3a+RnnotEj!90JsPCcDK9+w*8xB-OsE5)AQ}@4%2bSA4a^FX zbPo$kN1V^*I*f)Q^#p4-8uF4o*PlSZX|O8LBsX#fdItAJ-`><(VxGT zC>cdzh^7K=!@Z}6M0j1WQo7*-H5_JSjX5L=Pys|`U+x{qOSzIM7LQlDavw^ti4gNe zYqT?Y_V(JtesE~pX`xWj1?YTsv^U;JnVY;{1Uv+8tXPzi#iOS2U{g!Sy5I%m2oxES z5%~CfmUGC`=V_p1pc89m)P#%>f*zgdVwuI-Ju+yzFBJ7)YX%JZSTY-P?8{;grlUGR zuPjPGxNIgFy(1jXNVNDNP=G!%UqAk{z2eR{A!L)#WgPXN(P_}ND*4- zmG;S*)Mg(jO8{is>0>+34jT~GBNfMmC_wt0`_QeVd_{-$Kes^YKyE1;uin@ZKZ)_Y zBD~jNz#LX4!)uLzLtXa9;$PIL1px=SR7`S#bGW=^sKY?SN}R-5?xyLzeE&g{uo9_e z0dgo!&?EKBLd)J_kFWv;qA*laEM!FFXr0I(#-Cq>-SW>8Mr+Q&K+p0RPGk)7oRWb! z#!vK_!Klq6`Nf)OxoU*nl1Fw!cQ6&VT+Y630FgcWt_lj*sjw#bwcO0BB1 z9N`3m7JzI39)TV-))cYt-3^=G=X#!QNg+?SVx~Fgt>$HTYP>W8J&-0Pm zRy`^==9$=h9uhY%O>(Jv1K`%ePR(tlyq}uWbR#&L~S8wFpxO~g-1tWq$yZ>N#i0~sLp83jL8q?UCi#3hNqqr?Y{!qH$bxfK^!c1f1pM&UF#^?&B zNpRjk03m<&*jo$vyUxYBT%SP5%KrC+<%5JS4xcjcY-EkeL%dncO;TeAp@ z^&_07?ImnL34}c|t`S*DQ*IuPh9NuJ9&>LYpdvVAsOOt>A+3~gRZ!{S<*`o>Yk>ro zLH#tG6)r;8QBX|lrMxP@1r#o7+lOXFTf<;TnY9_232pU0m1I=;eXndBrSL^4Jv@%* z(?*h4pD_a`f`K!C{5A7{BcrAq;M6a8qB(g~?8jVb@T8!$j=F(4P?fbX@?k9nz2lBn zCq#0{2ukXG_|6hUy56`0pn-Na6l07Dg$ILf6kotJtZc(RLO#aRNkNjLnD>aPYvf#A zZ@lOle77;;n$l!P>m5!p0Kxj)TyRxD6`_VuB`WZI9b{z1%bFlXF@?7)#@Qsn;KA=C z)D4KeKhNP_E#8xnqzAM8(eWP7S93MDlRSE=kr0vXpb;n>LJYw(@Nf%WhBtJTl&tEu z!V>BX8jp{`N0qVU5-}Q2$S+Uf%7OoW3Wd6un2B{ zvBA;y_(|eT^T{_702ZNK-*^xAf>Fk_jqyK<78c_45Sel#n@FdhhiXdiOr<+4Kt>+t$yuKC&NrV|nAyb}!Xw(*^&eyzNhJAU`P}b0LBoGFqFf(C4y&#gr}!ET$WPGPp4IUUMOficNzkCEC_EAp6r5k~ab&2S zX^BBKX&mQtZf_#GYR%VVlK@pwnmN_A`sHf-& z>2c5__S7u>4kf&PBc_Ft&y-Xi%Uny!NFt)fYLgNt2Q6yRJN5>_kz{Bpk`|9cE%WVz z8>JRd1cveGtbY%wQBHF>((~+rbQ|4kn|FE{xQ=mz;4raD6`oDyDR)Kbh;$m#GHsxk z)#v9mS>gS9dSp%f9fAUT65gLHK*{qhrwqlZ;HO^SrU=H_&R$Bnx}}zf2Eej6XOB{RCMz`oL_8pI9Bbc00Z=Y&vTAesk9Q6uPhfJ#rXJ~y8Uo1b z^ErtGlUrOHd*(f4WLNl8btdaliYyvWDNISNRJi8S9V6EQj4ws^j0X&g&TO}n{9zDR zF3yc8XKfoBeQW(^Y9TyLb>b*P)9A@N&$WX?NFx;}=)hi}0F%bzp(Ks2AyiPF=qDV= z@Rr95dG++5l;0zxCEk0`X2!?S#bIb;eDK5uNJa~y>|KI3@^ImmI0_n@l=O6VN75@h z2!(e!%tMHMC~J~HOzHd>J)H)5BaNRIb5CXw`mji80z;&GGyhT^zD`5|Wq&~6P}5B< z<_UCQ4lhn8H$o|H(XS&jk0K<=vqrQrkI6FRiQ#}i(W_V#T68e@ZV>}e931Ukic>^B zui|_2&)IbT-aM>Gg&2$Qml`%EjtM+><3a`#o}L-WKuIV>Lu@WYQ7$ijjMNOId*V_c zvdM#4$CWKT|B!YlaWIN$*F1`1hJ~>WwN|Egj*gIqLmKGxgb=kx8Zl1moV*{CQSdy9 zeg4(tO(uiKw*e)>PDPhM9?C)h#{eVkNZ9#8{EvIN&omZaU+Abe^pD12K^p<8IA209 zH6y>cHUI}5+{b>nXBw8T!*W+uLZ##CRC{3u*+3&fnfK!Vrxd2}h=28G0?uLhu@`CI zqfj~$upv{6_&6{NA-=3p5_K|<9iCqrLm82sKUx?g;E!xF5zbst4$5AffAW}7tSG=? z6iHhO-VKY>kokynnOB08&F0+vfXkWbxf>~bqJ5Qe-cyO3*m+S5b^%IA<>aE!W-#eq zJY>)+{9&L5KEv=N#{iKQbt7QI55Q=3fEF9hL2;B}!19*9WxBuBx38T4{AeLQ!-va)&u(vdPR!+-#E$7=Eo z9(R!SeNObJZ3bY(hk@#PsG$a+(}NJisOcJ`p$_YFr3?km95&F8=c4yAF;we=B8Q$e zDmY5F3AG4Xn{m50BSA)Aal2{WiuStd$klGeSG&6okOxno(<1x$8);0Yf=+wzHi~W>0Z7V| z^^jjtF&0i))dDyY2!mI?6`ix z;Vl8iLB*zJP0~?G-IJi#zax*+u1N~!IW^x#_&)U`-nrbywPBFCh8zDubnKDm2|Z(H z#Cx^fv(Wq<&z0xbo0LTRL>G};P`sDM-qk?uR4_R(FpcnQT{IGLbBb*;oE^9}~b zWlr~UFQLz7F^np3L*{*9kzT5DjYy?C$)ZCoZ!fwDU$WZb3e3EA!_Ej&4WB_Se#8Z= z_vtK(<7)T({jKD!q@Wr+tqRWqBh;0FvvG0;lSN@ri5lGS{ImP2r7~K)D(Xp-Gph@d zz{8BFuJ6s~WMk{XIrIh|yE#a|cVppaSTr`l0%MRU#hM|z^sbo0BwdADic(CfDvHTVxOWTG)ADS%hhcuf zbi=%!*Dt0#kQm!j8&Z0jKb5)zh#QNoZ?zaK_dts423CYcUf5szFT@$Ym zc*nCQu_xwFHx}3_iZTxtUOsdN6&&o2gM1vz4Wr-MRH<{~H4=6t86j7BE%?llniA{T znS`FY3@G}(3*iifvuEt9=BnSTl}Z<+!edNSCG?jJ9X98?&1e07rk(P(|?1`jSnvW1WLqQ=~tee`yI7}--K~VrtD=#|FLjJ*P zWqJDk4Uji4T6(9HTRJ38aflZ%_RV&1Mi+dkKpmAfyy{x4GhPS+7~BB`sHHyGK3d8V zvLe?<(TZZx{ChK=h(wwgt!vJ>zhIzPHUcB6wN-6puuyLG3B*V4M9;hPW1@5 zy?OM(f>R_ix%Vm|UG%kIJ!*&?p4R8HkT<*$lI9Q|g=@w@4FulC4B<&TZOQa}DD{9? z^3cj&6B)XTfGsTMC682inmp7L?pPa?M)CN^xAqihN+nBP_qq5g0gXp!6-|Z)(W=1*IC~U_4BvIWonK z;y2MKj=!94rGqisBA)p=)T*u{?pqB&fUO<@mBx9Nhdt_(XzAy3u+iuJq{jv4L~+;~ z>maus^A8vAN@8QWGRYG6f(f>He~^apE)0Scm;W;AM;#*Yp9+1_LQYxJN+)Zx&oA}Z&760Ll{Tlv5+ogoku3n5$apNNv9Z!8=4nKTP@~T zMe6rh_}yXpX`KS5tpBpp9pmW(ljjCFKQhs3*SNHe@q@PY*7bH%B+hx|P>M1+nO z3KC7KlW^JN#m8rrcvQSpRf+&L1Ljg!>7d0*T0)H$9YL$n@gCKl%+>Xy+#z?cfo3tD zJ(haN8?chk7a06YmviU<9H@{J41ov0(!P}eGx!#fuMvqfJoAF$I#YQmN&wd7KAfVh zd#u9`-EsY?c=(h{zjqeJ^uBwqTV*^U)==Q#^+UMy|C8nnw~)^j!5E&(5o>rTqbidE zqAH~untvyMC^4$%3Z-Jh7kXTI>rZQe=3@gv0+m)la@tV@1w;-eA!7~02m_@x{ITG1 zU#ho8f(WmoJXuZ3)UZu(sY^qettoYM{jW9TI1usE?X+IhF%<}c|SU`Qt? zy;*+Dpu?b_`~!jWx^9J5OtifZ3e51Gjsk$zpVrohF1Hrt!Xi*f5Mdqw{;UQ$!RpkK zL;4W_hT|8|{McLR=xT3)PuYXt(_*jpgJ)x^{&MK5AC2i`*={)?{R^Kh)7R(s;XJWpv(UGXsltoSz&Tv;JrXc)rg7 zM~*gQshF`o5JbSPfo>Av8wDxvKoJW}OBL>LhbHQLaNo)KLM(WA;yRwyEaVKb=kjxAMU#>Sox zLPs5gfiMhgJPcj;zq>wABWBimqHQ8|}s$b`NkU*G3N(2q8IpM%TJ31BTXc1iu# zpjZ`gS& zCYa&J8YIurWgB}zbtDdYymsKDafEqPbYj(nQn!-c1;>g`_x&Z!QXE-0MT!&-UYq=x z$?4@0QNaYzl1G)Xcg+X2IAY-UzVExxj$@Pj0T!n<9|Y-29eEN(zs?vT1tTUWBauWq z8pq0>rw)}01q(zPf@ApfIbzW;Vo33FM<1#Spn3S=^^FYUfsHRf)0=4IS|!4W_hwwI zl%e?4T*-#KL<_79Yj+aKh{#arTJSAp*l82185B zBLd|CEV14AVOR&Wsuu&jJlr3uqZ8kFDVs0!2GYJg$LMsvxXvE*+pjALGA9}Q^2p<$ zk~d9GagsHOx?;ln&~nbemO1kIsKQI(V{YceS`4X_)S%j z#SIq}Gn$RbL!?CA@!yiGbw!xJ-6R!5{G`C+sRSLa@H!nWrwTp2e818U7bHZrm(hFu02dls3>b*dK+I)ouJM1(rbI4Jn`?`lX?Uy zEo}p(8t!%W7x^K%n*N3{Cgb%?4&l-|Xp$Z9xMNJCjl655F1&}*T3WiPYK!)i*Sndq zAU&lf{3unf10?1}l)|k}Y$&$Y=g31jJhU9wEhbiv00vF%mxY8Fno$TBMSQ6)7s0cCCqIlD|iMK!eC zw*w%_2Vwj{Li!}`=kf_)^V1Z{&uP8mPVmp)YVx@0Ns$RR*Ljvt=vf1fzPF&+<_R6R zzkjohkE1nEh(KrqsRfVYW-1FAQ3|N$vu@W&WhElr!A0Si(+5Qf+jzr0Z*s#&rUdBu zef*^&mthWLyu?SFd*t8(QpDP!kS*`_kamQh!}Eu?0v+ABXnc%+UYvxlsGcDVpK?s+ zSK162O9B{XAdz}XfZ?J;{s2nkpyNwAecl{X_wKYaT}8HFOG~-A5qor%X@Iel$Mk(E z(AVL8@ar%jA2aqJdT?~>bu5>I)uJN*C-5mz8rh5=3C6m_*AA8pCVlUnAKX|+L;rh} zOY_`>N?TJ0H)=0FXmG(5rsh;wdmA^FxG%}L*oXsehT@r5v!Q7P2vB9y@8`O$_(A=# z%A1Ej(~Z`g6xPhl>2^Nxeq51E3&ekhiUBD0MZzEJZJxe_r`Q@DEI?#VXtkKCBqdz5 z{w&`Bzo_O9f%P!6fB~zKub6cG9z+(njdsQlc)S(`$=1IZ>os!rmwy=zQ}%#NKWHPD24bpKC+_T2P*t zkzpS%Vn`dpbCgj!Hx{Z&IvQ)u;ass@z1TQJ5n*L`kmgYWjqUG7-web3x?v8+jVZjY z;AzK3VOc0n0iLAaX=QIkG=(CumvDLq&rriYyF2EPtUWZN3pq*jaTN~5D8fg4D|3lB z5-U^L(&T_{012=tpkvWe%oCtEawv5VP6~9m)(HREyIMNP(b5D!3j_7NhvF01uv2p$ zcAz>yMEE1tat zCT}E}GZ?%@jxI%6nqjlD4+k>@!iH~)JL&|gns|#hVB!l?f?;;_)N`pt{%5qgF&ki+ zWebIxE#&i}RpAR-C~36DC-}DX$Si2zGbkO1Vx#7w{k!!#`iFP$pEq~@5ZdbyGy$Kb z2U|_if(F!mhd!u<{7Od7AvMV*>5F#-+&4;Nkle8UZ@!#%I)d*BVxkR<6L{*FVhA=3 z6_x2|ZB+V;!8@%Q64S0@f`}fFk(|cw9|UlrIi^NukueB_7v4VjK)M86J)^ld@2}kbI{VB?pYVCz*^4nn!(x0@T;nOO!X7ltQUSFUsSu zgK2{-KIcVaCWn!{J9}R}rvc2NTw=#g#27(wGEypLh_nODe^9f*rVPW#c&}lMntU$` zW&CrVILVfFfQ>l7H;Z-|hO%Nh5V789LLWsB9<^ZBF;|bFGx>rd$t)xuAQC#D6Hb6r z7YF?StRo#$s7R^%MC6C&*gz3LO+SY0TZE8uBmB?(4moGkz`72ahu56;#x0CLQw`}#<-wlGBY`}h7ah#Q1flE|G;@6}ayeF=ZjwD%&?d@&7z(1TB27%f zl!|5OhZg>Nh{@l%7ISJoT@@%yp}HG?57XRei`NH=H{P_?IJ(f%zNO{vrpGI^*+PbwleVP1vqk9#QSbQD37ahH(aS7uo)4Ef+P zhn=3-F~QwWE2h3RbgE|^Ux6n0v|m3kTi&0HMjscFwEx>auLJ*hB2)SgMjS;w4-SUtO7sZijc~`654EPyH^}Sdc(@x1s##g-7N_@2boe@rw)Ix8Q z?uxU(o|SI`clGplZWpUEviGI$w+q{Lh5I3D^J@Z8r6ET z!1IK&mHIiE!f(Y--vhwyBS3oO_?KXFl|+S_F&#GgT}$-h^|n^7DTU}2*LXR zE#omfbs(i7NkeVy5$bA&r@@E#JB&YgNcD{ZD$+vlWLhdb^7)8y3t@Nzf!EKD6uvWK z6?rVY(zPZV^c0r%hWIMnlP^@_bn$UlgFRsjQUkoC=Z?p>%owd&9v3( zf6NaQqZ)Ihqgh34uE@m``n-vOc4=3G@mq*aQ#IOJ2il{7j0!PUqG)Bvz`&V+x6|j8 zg#3|?)#Xt^7-gUF-ksD!H{H;?mn?L|#RRC~2=F7n@@KyCW8(`!?&Le~ue{ke5sSk^ zid42h`S23JxazpXA#*W@DuT&t2_noS52Q-kq&N%JDT0Xo1;6!Uckg=bjs5ij03ZFQ zzv83!vClt|f^LdOC{%LxuwlCmEtT~^N??gI;lDcW(48#yU5huGlg zK*A%9(S(kx2qGAV^!S|8bFt6E2{)qf3Tk&Us~dZXU1HVLn@fKQWhgD%51^~ zhrt4m6nI}H(ot>2ASnhIU;`#?rXjqP^HE$4dT2e^b{ms2P$+vsPXp6Gz<*PaLhWXN zT8n<|IgOzoFz^LMnGB@yKNS5WCnJ*y`^Sp4R_kp}7q(7@j+KtJ=tv?#mM#MZnU##e zQ4l%0De4M_>EFHk|9<PTf{r==HzHc3V9un)Sq(mmW z-+RXLZ4tZp%!tC0==Q2s&M$U0E)`SPzG=_oVZ6M<>2}VHo9sq!Z@zr3A#?wncVLs5 zvion93EeP4E_ynf!{r^aD?b-NA~v>2b1 zer)*iw(g<099`2)LFUh@zb<}!7FN>ju>5n#>v`RMJg?I49&GyVqx`Y?rTyaD&pBtV zSvUXU`HA8O64u!Cl}`EbYx4RN+4nzc|3CEMkIDO8vJM~K{M@fo^!vfzHS&A*fBCoZ zWv)mOe_GB|fi0&N?^h8>d}P|NhLID%VA=w6`9*%i`doyngEaRo+ec zJa3)E_D^*^t90k&Y(w6^hgH|uaJNQie!5W?yI9NY?er-fjw`ks*3UM6CXwm?O`5;A z>%M+*!oBz}t5=>}xyO}jZxlbLhaI=W@ejX_7Np1NFmSvu(aBs|dvs6k`!&_t8)6v` zG0o}X6^)xXSxNfV-oNhe|Ns5*cmMp9_4QkUcdloJ@4j^vcvt-3WBzad_Mh<+i#e}j Shttps://github.com/CommunityToolkit/Windows https://github.com/CommunityToolkit/Windows/releases Icon.png - https://raw.githubusercontent.com/CommunityToolkit/Windows/main/nuget.png $(NoWarn);NU1505;NU1504 From 068f4794125939d9104dd0293a85cfb5c6a0b5fd Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:32:58 -0700 Subject: [PATCH 3/4] Automates all AssemblyGeneration into the props file for libraries Also Automates the InternalsVisibleTo into the AssemblyGeneration vs. specific file from template --- .../Animations/src/AdditionalAssemblyInfo.cs | 13 ------------- .../Behaviors/src/AdditionalAssemblyInfo.cs | 13 ------------- .../CameraPreview/src/AdditionalAssemblyInfo.cs | 13 ------------- .../Collections/src/AdditionalAssemblyInfo.cs | 13 ------------- .../Converters/src/AdditionalAssemblyInfo.cs | 13 ------------- .../DeveloperTools/src/AdditionalAssemblyInfo.cs | 13 ------------- .../Extensions/src/AdditionalAssemblyInfo.cs | 13 ------------- .../src/AdditionalAssemblyInfo.cs | 13 ------------- components/Helpers/src/AdditionalAssemblyInfo.cs | 13 ------------- .../ImageCropper/src/AdditionalAssemblyInfo.cs | 13 ------------- .../src/AdditionalAssemblyInfo.cs | 13 ------------- components/Media/src/AdditionalAssemblyInfo.cs | 13 ------------- .../MetadataControl/src/AdditionalAssemblyInfo.cs | 13 ------------- .../Primitives/src/AdditionalAssemblyInfo.cs | 15 --------------- .../RadialGauge/src/AdditionalAssemblyInfo.cs | 13 ------------- .../RangeSelector/src/AdditionalAssemblyInfo.cs | 13 ------------- .../RichSuggestBox/src/AdditionalAssemblyInfo.cs | 13 ------------- .../src/AdditionalAssemblyInfo.cs | 13 ------------- components/Sizers/src/AdditionalAssemblyInfo.cs | 13 ------------- .../src/AdditionalAssemblyInfo.cs | 13 ------------- components/Triggers/src/AdditionalAssemblyInfo.cs | 13 ------------- tooling | 2 +- 22 files changed, 1 insertion(+), 276 deletions(-) delete mode 100644 components/Animations/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Behaviors/src/AdditionalAssemblyInfo.cs delete mode 100644 components/CameraPreview/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Collections/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Converters/src/AdditionalAssemblyInfo.cs delete mode 100644 components/DeveloperTools/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Extensions/src/AdditionalAssemblyInfo.cs delete mode 100644 components/HeaderedControls/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Helpers/src/AdditionalAssemblyInfo.cs delete mode 100644 components/ImageCropper/src/AdditionalAssemblyInfo.cs delete mode 100644 components/LayoutTransformControl/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Media/src/AdditionalAssemblyInfo.cs delete mode 100644 components/MetadataControl/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Primitives/src/AdditionalAssemblyInfo.cs delete mode 100644 components/RadialGauge/src/AdditionalAssemblyInfo.cs delete mode 100644 components/RangeSelector/src/AdditionalAssemblyInfo.cs delete mode 100644 components/RichSuggestBox/src/AdditionalAssemblyInfo.cs delete mode 100644 components/SettingsControls/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Sizers/src/AdditionalAssemblyInfo.cs delete mode 100644 components/TokenizingTextBox/src/AdditionalAssemblyInfo.cs delete mode 100644 components/Triggers/src/AdditionalAssemblyInfo.cs diff --git a/components/Animations/src/AdditionalAssemblyInfo.cs b/components/Animations/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 08adeed5..00000000 --- a/components/Animations/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Animations.Tests.Uwp")] -[assembly: InternalsVisibleTo("Animations.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Behaviors/src/AdditionalAssemblyInfo.cs b/components/Behaviors/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index a909d34f..00000000 --- a/components/Behaviors/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Behaviors.Tests.Uwp")] -[assembly: InternalsVisibleTo("Behaviors.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/CameraPreview/src/AdditionalAssemblyInfo.cs b/components/CameraPreview/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index f3578634..00000000 --- a/components/CameraPreview/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("CameraPreview.Tests.Uwp")] -[assembly: InternalsVisibleTo("CameraPreview.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Collections/src/AdditionalAssemblyInfo.cs b/components/Collections/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 07f1c63e..00000000 --- a/components/Collections/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Collections.Tests.Uwp")] -[assembly: InternalsVisibleTo("Collections.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Converters/src/AdditionalAssemblyInfo.cs b/components/Converters/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index b2af446b..00000000 --- a/components/Converters/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Converters.Tests.Uwp")] -[assembly: InternalsVisibleTo("Converters.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/DeveloperTools/src/AdditionalAssemblyInfo.cs b/components/DeveloperTools/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 683e5390..00000000 --- a/components/DeveloperTools/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("DeveloperTools.Tests.Uwp")] -[assembly: InternalsVisibleTo("DeveloperTools.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Extensions/src/AdditionalAssemblyInfo.cs b/components/Extensions/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 660b712a..00000000 --- a/components/Extensions/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Extensions.Tests.Uwp")] -[assembly: InternalsVisibleTo("Extensions.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/HeaderedControls/src/AdditionalAssemblyInfo.cs b/components/HeaderedControls/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index ea96b9e0..00000000 --- a/components/HeaderedControls/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("HeaderedControls.Tests.Uwp")] -[assembly: InternalsVisibleTo("HeaderedControls.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Helpers/src/AdditionalAssemblyInfo.cs b/components/Helpers/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 72fb045a..00000000 --- a/components/Helpers/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Helpers.Tests.Uwp")] -[assembly: InternalsVisibleTo("Helpers.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/ImageCropper/src/AdditionalAssemblyInfo.cs b/components/ImageCropper/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 4f64050d..00000000 --- a/components/ImageCropper/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("ImageCropper.Tests.Uwp")] -[assembly: InternalsVisibleTo("ImageCropper.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/LayoutTransformControl/src/AdditionalAssemblyInfo.cs b/components/LayoutTransformControl/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 4da0bbee..00000000 --- a/components/LayoutTransformControl/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("LayoutTransformControl.Tests.Uwp")] -[assembly: InternalsVisibleTo("LayoutTransformControl.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Media/src/AdditionalAssemblyInfo.cs b/components/Media/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 7e58d70e..00000000 --- a/components/Media/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Media.Tests.Uwp")] -[assembly: InternalsVisibleTo("Media.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/MetadataControl/src/AdditionalAssemblyInfo.cs b/components/MetadataControl/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 1b1c483a..00000000 --- a/components/MetadataControl/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("MetadataControl.Tests.Uwp")] -[assembly: InternalsVisibleTo("MetadataControl.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Primitives/src/AdditionalAssemblyInfo.cs b/components/Primitives/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 6654231c..00000000 --- a/components/Primitives/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Primitives.Tests.Uwp")] -[assembly: InternalsVisibleTo("PrimitivesExperiment.Tests.Uwp")] -[assembly: InternalsVisibleTo("PrimitivesExperiment.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("Primitives.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/RadialGauge/src/AdditionalAssemblyInfo.cs b/components/RadialGauge/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 343502a1..00000000 --- a/components/RadialGauge/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("RadialGauge.Tests.Uwp")] -[assembly: InternalsVisibleTo("RadialGauge.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/RangeSelector/src/AdditionalAssemblyInfo.cs b/components/RangeSelector/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index fd2dc7b8..00000000 --- a/components/RangeSelector/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("RangeSelector.Tests.Uwp")] -[assembly: InternalsVisibleTo("RangeSelector.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/RichSuggestBox/src/AdditionalAssemblyInfo.cs b/components/RichSuggestBox/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 35626ccd..00000000 --- a/components/RichSuggestBox/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("RichSuggestBox.Tests.Uwp")] -[assembly: InternalsVisibleTo("RichSuggestBox.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/SettingsControls/src/AdditionalAssemblyInfo.cs b/components/SettingsControls/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index c5daab42..00000000 --- a/components/SettingsControls/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("SettingsControls.Tests.Uwp")] -[assembly: InternalsVisibleTo("SettingsControls.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Sizers/src/AdditionalAssemblyInfo.cs b/components/Sizers/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index dc2a92d0..00000000 --- a/components/Sizers/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("SizerBase.Tests.Uwp")] -[assembly: InternalsVisibleTo("SizerBase.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/TokenizingTextBox/src/AdditionalAssemblyInfo.cs b/components/TokenizingTextBox/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index cfffc6c1..00000000 --- a/components/TokenizingTextBox/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("TokenizingTextBox.Tests.Uwp")] -[assembly: InternalsVisibleTo("TokenizingTextBox.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Triggers/src/AdditionalAssemblyInfo.cs b/components/Triggers/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 243967be..00000000 --- a/components/Triggers/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Triggers.Tests.Uwp")] -[assembly: InternalsVisibleTo("Triggers.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/tooling b/tooling index ec70cdff..4b02ae7c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit ec70cdfff37c8ac49663068f0064387e4b19613a +Subproject commit 4b02ae7c8827152d3be05de5834fafa7849b67e8 From 0c8a06db9d6656931bbd73ffd98fea49c67cec04 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:50:26 -0700 Subject: [PATCH 4/4] Fix extra InternalsVisibleTo needed for build TODO: We should clean this up in the future to not be needed, at least for Throw helpers to start. --- .../Animations/src/CommunityToolkit.WinUI.Animations.csproj | 1 - .../Extensions/src/CommunityToolkit.WinUI.Extensions.csproj | 2 ++ tooling | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj index 47d9257d..ba23950d 100644 --- a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj +++ b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj @@ -9,7 +9,6 @@ - diff --git a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj index 76fe733d..9891b024 100644 --- a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj +++ b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj @@ -19,6 +19,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/tooling b/tooling index 4b02ae7c..bc519fe2 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 4b02ae7c8827152d3be05de5834fafa7849b67e8 +Subproject commit bc519fe2e008037ac9c844be452d84356dcce213