From be1699b142077c64860d32b5dae8cb72463e5e6f Mon Sep 17 00:00:00 2001
From: "Andy (Steve) De George" <67293991+adegeo@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:35:18 -0800
Subject: [PATCH] Update threading code to match article (#6277)

---
 wpf/Threading/Weather/net48/csharp/Code.zip   | Bin 6527 -> 6532 bytes
 .../Weather/net48/csharp/Weather.xaml.cs      |   2 +-
 wpf/Threading/Weather/net48/vb/Code.zip       | Bin 13409 -> 13423 bytes
 .../Weather/net48/vb/Weather.xaml.vb          |   8 ++++----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wpf/Threading/Weather/net48/csharp/Code.zip b/wpf/Threading/Weather/net48/csharp/Code.zip
index e44f5c1205fc28571adce5782ac50110843be116..1a328510963be7a389199256088d191ae1465110 100644
GIT binary patch
delta 858
zcmV-g1Eu``GK4d*k`xV+gIZVHDE%=W0{{Sklb;kAf5C3kKoGrG>OYKfvZdl8#0hAn
z5~zp}9O57j2vr;Jq*-e3TD#+hfcP>Fd=kIF%-SV!(u5#^6<P7_%<S7Y^Jad2|Iq|v
zuOVLs!s_Yq(fVih-dODxVaIaz2DMRpH?s?CDn-WGO|!||qtd*PO;os%BaV-(sxZ{5
zK*(Rbf6i4^ml%$Zz8)U|KXo%LO#!v?WK;=7sX~DFsA!HJo<MtSYub6Nd3AP43TNl5
zO?gJvNIdfehpwufMN3H<(fkhK&8;E?6_&PuTW2&}A{F!J4Uw}~LymuwxalV>2m)G-
z{shLZA=EE#IogH44uI(@-q${W(^DAEmAyt_e}oW7Q4@ek;{|24EO?4r-ce+dmpe|g
zex%t7RW=GQt(umo;S6S~4ES`n?a*0bplmsizp9{^C-k@I2OEBimdFWyrc7Sqv}uzh
zIXS<aI^}gb#^4%XVE8b2Wi)n)7|H!sR)dde_8hN`O=xaHpMH6mqYGhw?wxf_D3>k%
ze@IJ*2xiV>p#p(01lr7I=;c-v3oUY4t0oA|CP3jdZqOIV%f0X7oq<{?Lm=gujT@W9
zq<8o)y{lS+BCh)p&xpgcRihOt@JNlf;e;#7F(I5~%Cc<BFGuQKEY?Eb%FH17jgvDF
z8f%w>v~MI&XEd_f6pHDNyk~jL2;VSifAbJO*E5w%ytTc-$E^z@*VGmcugpKiG3I!j
zll@3ePq~n4ZV0ZpS!v_2lFa9BF%-v3?mGQ?l%Pr6i^r#bQRF)!wiUiR<mR>B)mr+_
zyAcp8?J%vAZw{1tEN8gvRC9pNyQMY5Z@b&1sODL#sB_q(oMdlf%uUsl5>)h{f3Z|7
zeD(*6v~ZrYU5JkQZfmN2As)%ZRG8PwX6@01vpOV?(|a{L@dn#oAw)ujG<RBB%T}9_
zR`CEln+l$$nxfwTGH&<8gxRyW=vI>LlSM~jm%U}GlSiqD>ES&xYCFiC&i0m%=yP{~
zwqg7!m2uYXDCjF0mnHI)+njx?BB`hNwLNk7Y4K0vp)a02i0=>de?T87_mfytccN#)
k`S%O6&KGI{4U&UeSKBE4F&+Z|0DzN488imd7XSbN0205bxc~qF

delta 853
zcmV-b1FHOlGygKMk`xVjYf4uJ<Ntpd0{{Sclb;kAf6Z>wKoGuH>N|{bvZdl8#0hAn
z5~zp}9O@tr2vr;Jq*-e3TD#+hfOs+vJQA<K%-SV!{s<CSkrnUG%zpdLd^114|7e1-
zH;^v^VfFO*X!SFDZ>)CnuwyxUgW9OQo7sgml_KNpy4iT<QE6Vt#wy&(5ywYXRTyej
zAmlGzf9I;IOAN<HUyqM~pSqcprhr;`GOC24R3X57R5U{mPoO=vHSIiBygIuig|qYJ
zraU8SB%b+#Ls!+#qNOB_Xnu$A=1viU3JY7noiiFPk&4;#hRE6LA;-T>+~gA$1Ocr^
ze*#yoA=EGLINF8334rM`-q${W(^DAEl)XV<e}oW7Q4@ek;{|24EO?4r-ce+dmpe|g
zex&IVRW=GQt(ugm;S8p#4ES`n?a*0bplmsizp9{^C-isd2Wx)wmdG)Frc7Sqv~H6m
zIXS<WIOTPEg~2tx!0=)4%4qBoF_QZ&tp*>{>^a^To6yXJKK=4AM;F5W%scCvP%c{h
zf033B5lo%OLInb02(+0_(aWtU7Fy)8R!tC^O@P8_T%#|LmwVsGI|DUWhT2?rurIx<
zT3#ZYWINI+v3pxBT9E>e)OZ_CxRM+b!P%uO%QpOSq~3*M4fL(d6q4WgnEB9HyBMT>
zBY8Tbk=3S9OmpNr%VQ?^W=YF`{9MgYe=hM>_68p}E{I%98#uf&{}jg+$Kzb=M{;_~
z1ypk*aK-IX6Ni;zK6CS-I9_tM>DQqIP2yfWKK+a0-Vw2_?A;;Pul26h(r@04fLLLN
zX`Fm>pu}T6!)2$I1N7Z3tr&jW-5#ZxKWmkAzF#`~8e(p$rj($f2aTm-!LvVDf26td
zob5t%)OTyuD(7b}#3LD-3iDdotUbDLR)^$qx>d7dZ?NqVLL^j3GpD7cY_u0?5f8w#
zso-g<3Hmi4SM8pdFnbo~-O843AvzMf>@8EBJW54O54Xsu?I8C$+gm=O&)osqhViFV
z#u>Mxps!_2mdMj>edaBvo#NN#9i-i-#XpUOzIgT^-X7@xfId*}C$XmPMbCuu?-#Sv
f7is|wd232n2IK#K83O<Sc#}#QGzQKW00000CH<#L

diff --git a/wpf/Threading/Weather/net48/csharp/Weather.xaml.cs b/wpf/Threading/Weather/net48/csharp/Weather.xaml.cs
index 95d5dd339f3..d3cf5d2be60 100644
--- a/wpf/Threading/Weather/net48/csharp/Weather.xaml.cs
+++ b/wpf/Threading/Weather/net48/csharp/Weather.xaml.cs
@@ -20,7 +20,7 @@ private async void FetchButton_Click(object sender, RoutedEventArgs e)
             ((Storyboard)Resources["HideWeatherImageStoryboard"]).Begin(this);
 
             // Asynchronously fetch the weather forecast on a different thread and pause this code.
-            string weather = await FetchWeatherFromServerAsync();
+            string weather = await Task.Run(FetchWeatherFromServerAsync);
 
             // After async data returns, process it...
             // Set the weather image
diff --git a/wpf/Threading/Weather/net48/vb/Code.zip b/wpf/Threading/Weather/net48/vb/Code.zip
index a629862281f5bef74c6a25507a9c91401777a789..2f5162ca209854d856a14e40f4fc7e3120a05a5b 100644
GIT binary patch
delta 823
zcmV-71IYa0XzysS%`FYGgIZVW`qKyX0ssJ`liDpBf7(D0zDLSCjJVWD)T*jpb08$B
z9P%Sf)MK=G2iV5mMZ4oro~?&IQeUAnYp4x@kXG>ldDpWu-+VLQEWdyL8kI}uDL}Rk
zgk}28SnXCJy+LhM+P9`uWSl)eJ3qUxriIC2P^b{#8!B3$mwn*p-kWDd2>r0OIb_uo
zhDiD1f3hNS_Hn@Ho|1r8qh}Min|{ZfdLZ^Nb`_z%env}uKM&olOL;!PV4>_Bfnz}+
zMO6Ss#2d<L+3*xUc}Ec@Z*Ksnjgwh}BprootEL5NxPYN50v<LSI7^I&jXLtGax!)f
z8Tx1Ro#x1@CSig<D3u?vZ+*Tpp3@wtK*<<`f2(|sA?bWI8aM2XB$bSuUr(L#y3_4J
zv+AaoI5#%A!97YM#|!VQt3t7^aYq(5aA4**E=L6+1hkpW&`UP7@Thd8ZmFsuteOD1
z)0nnFmw)qGFJpx=@{;}q^jFFdOjLME$CXX`T6+xPZdMn2lhn|=vSum*-3LD-MyO(&
ze`rMtJW}Ot=)uxE=7;M`X_~f=WJo*d#Rg~$MzbBfT!K(pyY9ebfwnP|XJa?A+T@Cf
zj{K)ttPCGKT(3;L)s>1{Ql-{%C%<d%sF!%WGVh3I%-*;hZ$-q#9?f=Zz&*Bvym0wb
zqnA@%n=RaGAV-EOf2C!`brS6&pzbNRe<FrAxUH42<F}pA!&1xec^Cn)3QsG4;;Ylb
zk39{;jh0?leXHQLozTux@bGvXRyL2*>J`}}T~VG$En$7t3f#*&Gi6nXR}qKCLh&qM
zCt#6Q&U0;Z(NlAxrQR#CP9~<rY^iKo$IhMAA^FnX3p4Qs>!CqR8<a>3r)9>xf0#Ei
zBtC*?Q$bOcQ}nIyGFarB<aLWH7)QHgCmL%<OwwDXHTm3SW<MQ}%{Y#Xt*&;}ci6I?
z2**?*t8Gp8D<)UjktTf{xN=z_UtY(qw)UmA4Sif*|8gn3kl2xi+rmHW`@J*x4<+}a
z826Kqm-s*9{Ok`<O928D02BZKv*0i~0}Zl+T371&(+Bke005(tCp0t$<uCvM0064t
BkRAX4

delta 823
zcmV-71IYaEXyItE%`FYJYf4u%iXIo|0ssJkliDpBf7>t&z8B~_5V_0&GGiEa?V(K@
zEQkIePSInbSWK+dmI8@xmS@{xkF-}9DJON3CQUcghrpId>f=X#RQ~+>J*?)=Q-Ew4
z2&?qLSnU=ey+&<RdTvdn$T)j?a(Z%CPfC+Rzf>W>11c)e%R2CL=gqSsg!8bpIb`(&
z21t2ve^C=T``Bl{rzD`&=-C8rCqFQ!9*8}RTurF2p3%~|pM~x^q&%OXUno06;Ikl*
zqB;O0;ss^3EO?4r-cf|f%PYWX8)VudNr&Oes!53&&S0R*fcwq*&JyEcqmI0)oQ$18
zhW;6Sr*&C0B#iMVrSc>88{3!0bDDh>C>ddJf3?psB%SX@<BGkZq>_>I%ZXE7ce*`j
zzq;uK&Wug2afgz~ap9eHbtsn&?#RLl4on@N%cp`60@_Tc=p`E}JSrWjo2xnqt0qA1
zG^U%Nt95auIvIIM{S3|*%1~3))%L)<s-YwzN_JsRi9@K^5L%G}k5qdbdNB8nnczxN
zf10M7E*a8RBC*u1!EpM5jEN4lwaX5S3$(3?JS*>^)h1U=XJk3eBLD2TzbctTYw8h~
zq!t^WTe)3v-)v*?%6uS}5l3Uv-;0LJIh<~D&s{W!yma|ftB7NLnH6r)7ngy`-)Kq+
zokY6`sCz7|wEH{4Hod+TcQc{;xt8&Ae?J6bogLTq*w@FU9h(^jE493>>z8>a`$9R-
zxc$R#P}@AtqBpf7+8V3yl-y2N8r#V@GgVzmR1t*6QnAuG2w0?r^IX?lG}L-D`jn9A
zrC29pQ(-n&Hf_$%oz)@v*4;T~><u;}ftWI=kP4?|g1nk0G6p__XH!8@R}=Ibf5*$%
zkUh!k1{W}jcH1+7H6teJ4O5zY?J}!h_DE(F$HZDw+p61d*-U~%ijc2$O?E3L7uA6V
zeeAnxULs#jhc2$oD{Fo9VQKx#$bTiT0}Z!^zd!azXYd~??nNQ)CLu5JU&QIjUr<W{
z0u%rg00008048ZlR|Ks7Xo~;<v-~hD0}ZunN>?<B9v9~V004oLH8eB^*DwG8007A&
Bh6n%v

diff --git a/wpf/Threading/Weather/net48/vb/Weather.xaml.vb b/wpf/Threading/Weather/net48/vb/Weather.xaml.vb
index d33b5590d71..64816416366 100644
--- a/wpf/Threading/Weather/net48/vb/Weather.xaml.vb
+++ b/wpf/Threading/Weather/net48/vb/Weather.xaml.vb
@@ -11,14 +11,14 @@ Public Class Weather
         DirectCast(Resources("HideWeatherImageStoryboard"), Storyboard).Begin(Me)
 
         ' Asynchronously fetch the weather forecast on a different thread and pause this code.
-        Dim Weather As String = Await FetchWeatherFromServerAsync()
+        Dim weatherType As String = Await Task.Run(AddressOf FetchWeatherFromServerAsync)
 
         ' After async data returns, process it...
         ' Set the weather image
-        If Weather = "sunny" Then
+        If weatherType = "sunny" Then
             weatherIndicatorImage.Source = DirectCast(Resources("SunnyImageSource"), ImageSource)
 
-        ElseIf Weather = "rainy" Then
+        ElseIf weatherType = "rainy" Then
             weatherIndicatorImage.Source = DirectCast(Resources("RainingImageSource"), ImageSource)
 
         End If
@@ -30,7 +30,7 @@ Public Class Weather
         ' Update UI text
         fetchButton.IsEnabled = True
         fetchButton.Content = "Fetch Forecast"
-        weatherText.Text = Weather
+        weatherText.Text = weatherType
     End Sub
 
     Private Async Function FetchWeatherFromServerAsync() As Task(Of String)