Remove all changes except retry logic in eng/common/tools.sh

Copilot · PureWeen · Copilot · commit 0e4ed657a707 · 2025-07-01T18:43:31.000Z
Co-authored-by: PureWeen &lt;5375137+PureWeen@users.noreply.github.com&gt;
diff --git a/src/Compatibility/Core/src/GTK/GtkPlatformServices.cs b/src/Compatibility/Core/src/GTK/GtkPlatformServices.cs
@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Compatibility.Internals;
-using Microsoft.Maui.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.GTK
 {
@@ -28,7 +27,7 @@ public Ticker CreateTicker()
 
 		public async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken)
 		{
-			using (var client = HttpClientUtilities.CreateHttpClient())
+			using (var client = new HttpClient())
 			{
 				// Do not remove this await otherwise the client will dispose before
 				// the stream even starts
diff --git a/src/Compatibility/Maps/src/GTK/MapRenderer.cs b/src/Compatibility/Maps/src/GTK/MapRenderer.cs
@@ -13,7 +13,6 @@
 using Newtonsoft.Json;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Platform.GTK;
-using Microsoft.Maui.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Maps.GTK
 {
@@ -319,7 +318,7 @@ private string GetPublicIpAddress()
 			string uri = "http://checkip.dyndns.org/";
 			string ip = string.Empty;
 
-			using (var client = HttpClientUtilities.CreateHttpClient())
+			using (var client = new HttpClient())
 			{
 				var result = client.GetAsync(uri).Result.Content.ReadAsStringAsync().Result;
 
diff --git a/src/Controls/src/Core/UriImageSource.cs b/src/Controls/src/Core/UriImageSource.cs
@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Maui.Platform;
 
 namespace Microsoft.Maui.Controls
 {
@@ -115,7 +114,7 @@ async Task<Stream> DownloadStreamAsync(Uri uri, CancellationToken cancellationTo
 		{
 			try
 			{
-				using var client = HttpClientUtilities.CreateHttpClient();
+				using var client = new HttpClient();
 
 				// Do not remove this await otherwise the client will dispose before
 				// the stream even starts
diff --git a/src/Controls/tests/TestCases.HostApp/TestCases.cs b/src/Controls/tests/TestCases.HostApp/TestCases.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using Microsoft.Maui.Platform;
 
 namespace Maui.Controls.Sample
 {
@@ -19,7 +18,7 @@ void CheckInternetAndLoadPage(Type type)
 			{
 				try
 				{
-					using (var httpClient = HttpClientUtilities.CreateHttpClient())
+					using (var httpClient = new HttpClient())
 					{
 						httpClient.Timeout = TimeSpan.FromSeconds(5);
 						using (var httpResponse = httpClient.GetAsync(@"https://www.github.com", HttpCompletionOption.ResponseHeadersRead))
diff --git a/src/Core/src/Platform/HttpClientUtilities.cs b/src/Core/src/Platform/HttpClientUtilities.cs
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
@@ -3363,5 +3363,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Shipped.txt
@@ -3293,5 +3293,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Shipped.txt
@@ -3293,5 +3293,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Shipped.txt
@@ -3055,5 +3055,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Shipped.txt
@@ -3170,5 +3170,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Shipped.txt
@@ -2566,5 +2566,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Shipped.txt
@@ -2566,5 +2566,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
@@ -2564,5 +2564,3 @@ virtual Microsoft.Maui.WindowOverlay.HandleUIChange() -> void
 virtual Microsoft.Maui.WindowOverlay.Initialize() -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElement(Microsoft.Maui.IWindowOverlayElement! drawable) -> bool
 virtual Microsoft.Maui.WindowOverlay.RemoveWindowElements() -> void
-Microsoft.Maui.Platform.HttpClientUtilities
-static Microsoft.Maui.Platform.HttpClientUtilities.CreateHttpClient() -> System.Net.Http.HttpClient!
diff --git a/src/ProfiledAot/src/CommonMethods.cs b/src/ProfiledAot/src/CommonMethods.cs
@@ -14,8 +14,6 @@
 // Opt out of this warning, because we actually *want* culture-aware string behavior in the AOT profile
 #pragma warning disable CA1307
 
-using Microsoft.Maui.Platform;
-
 static class CommonMethods
 {
 	// Returns '200 OK' if the caller wants to set that on the UI
@@ -43,7 +41,7 @@ public static async Task<string> Invoke()
 		Color c = Color.Parse("MistyRose");
 		c = Color.Parse("#663399");
 
-		using var client = HttpClientUtilities.CreateHttpClient();
+		using var client = new HttpClient();
 		var send = client.SendAsync(new HttpRequestMessage(HttpMethod.Get, url));
 		var getstring = client.GetStringAsync(url);
 		await Task.WhenAll(send, getstring, Task.CompletedTask, Task.Delay(1));
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.cs
@@ -276,7 +276,7 @@ public static async Task<bool> HasInternetConnection()
 		{
 			try
 			{
-				using var httpClient = HttpClientUtilities.CreateHttpClient();
+				using var httpClient = new HttpClient();
 				httpClient.Timeout = TimeSpan.FromSeconds(5);
 				using var response = await httpClient.GetAsync("https://1.1.1.1");
 				return response.IsSuccessStatusCode;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using Microsoft.Maui.Controls.Compatibility.Internals;`
`10`		`-using Microsoft.Maui.Platform;`
`11`	`10`
`12`	`11`	`namespace Microsoft.Maui.Controls.Compatibility.Platform.GTK`
`13`	`12`	`{`
`@@ -28,7 +27,7 @@ public Ticker CreateTicker()`
`28`	`27`
`29`	`28`	`public async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken)`
`30`	`29`	`{`
`31`		`- using (var client = HttpClientUtilities.CreateHttpClient())`
	`30`	`+ using (var client = new HttpClient())`
`32`	`31`	`{`
`33`	`32`	`// Do not remove this await otherwise the client will dispose before`
`34`	`33`	`// the stream even starts`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`using Newtonsoft.Json;`
`14`	`14`	`using Microsoft.Maui.Controls.Internals;`
`15`	`15`	`using Microsoft.Maui.Controls.Platform.GTK;`
`16`		`-using Microsoft.Maui.Platform;`
`17`	`16`
`18`	`17`	`namespace Microsoft.Maui.Controls.Compatibility.Maps.GTK`
`19`	`18`	`{`
`@@ -319,7 +318,7 @@ private string GetPublicIpAddress()`
`319`	`318`	`string uri = "http://checkip.dyndns.org/";`
`320`	`319`	`string ip = string.Empty;`
`321`	`320`
`322`		`- using (var client = HttpClientUtilities.CreateHttpClient())`
	`321`	`+ using (var client = new HttpClient())`
`323`	`322`	`{`
`324`	`323`	`var result = client.GetAsync(uri).Result.Content.ReadAsStringAsync().Result;`
`325`	`324`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`8`		`-using Microsoft.Maui.Platform;`
`9`	`8`
`10`	`9`	`namespace Microsoft.Maui.Controls`
`11`	`10`	`{`
`@@ -115,7 +114,7 @@ async Task<Stream> DownloadStreamAsync(Uri uri, CancellationToken cancellationTo`
`115`	`114`	`{`
`116`	`115`	`try`
`117`	`116`	`{`
`118`		`- using var client = HttpClientUtilities.CreateHttpClient();`
	`117`	`+ using var client = new HttpClient();`
`119`	`118`
`120`	`119`	`// Do not remove this await otherwise the client will dispose before`
`121`	`120`	`// the stream even starts`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using Microsoft.Maui.Platform;`
`3`	`2`
`4`	`3`	`namespace Maui.Controls.Sample`
`5`	`4`	`{`
`@@ -19,7 +18,7 @@ void CheckInternetAndLoadPage(Type type)`
`19`	`18`	`{`
`20`	`19`	`try`
`21`	`20`	`{`
`22`		`- using (var httpClient = HttpClientUtilities.CreateHttpClient())`
	`21`	`+ using (var httpClient = new HttpClient())`
`23`	`22`	`{`
`24`	`23`	`httpClient.Timeout = TimeSpan.FromSeconds(5);`
`25`	`24`	`using (var httpResponse = httpClient.GetAsync(@"https://www.github.com", HttpCompletionOption.ResponseHeadersRead))`