Merge pull request #6432 from dotnet/main

dotnet · Nov 29, 2023 · d0e1262 · d0e1262
2 parents d921987 + be1699b
commit d0e1262
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/wpf/Threading/Weather/net48/csharp/Code.zip b/wpf/Threading/Weather/net48/csharp/Code.zip
diff --git 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
diff --git 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)