Merge branch 'main' into dev/grendel/native-tracing

grendello · grendello · commit 506d17518e63 · 2024-04-23T16:46:58.000+02:00
* main: Bump to xamarin/monodroid@a5742221b3 (#8893) Remove MonoArchive_BaseUri from Configurables.cs (#8890)
diff --git a/.external b/.external
@@ -1 +1 @@
-xamarin/monodroid:main@fefc158ef36d056249e8775df4e5d409a70119e2
+xamarin/monodroid:main@a5742221b314864636f4356173a2535a539c7b2c
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -45,8 +45,6 @@ public static partial class Urls
 			/// </summary>
 			public static readonly Uri AndroidToolchain_AndroidUri = new Uri ("https://dl.google.com/android/repository/");
 
-			public static Uri MonoArchive_BaseUri = new Uri ("https://xamjenkinsartifact.blob.core.windows.net/mono-sdks/");
-
 			public static Uri BinutilsArchive = new Uri ($"https://github.com/xamarin/xamarin-android-binutils/releases/download/{BinutilsVersion}/xamarin-android-toolchain-{BinutilsVersion}.7z");
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xamarin/monodroid:main@fefc158ef36d056249e8775df4e5d409a70119e2`
	`1`	`+xamarin/monodroid:main@a5742221b314864636f4356173a2535a539c7b2c`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ public static partial class Urls`
`45`	`45`	`/// </summary>`
`46`	`46`	`public static readonly Uri AndroidToolchain_AndroidUri = new Uri ("https://dl.google.com/android/repository/");`
`47`	`47`
`48`		`- public static Uri MonoArchive_BaseUri = new Uri ("https://xamjenkinsartifact.blob.core.windows.net/mono-sdks/");`
`49`		`-`
`50`	`48`	`public static Uri BinutilsArchive = new Uri ($"https://github.com/xamarin/xamarin-android-binutils/releases/download/{BinutilsVersion}/xamarin-android-toolchain-{BinutilsVersion}.7z");`
`51`	`49`	`}`
`52`	`50`