Merge branch 'main' into dev/grendel/perfetto-integration

grendello · grendello · commit 9d5bf6494204 · 2024-04-26T18:27:53.000+02:00
* main: Bump to xamarin/monodroid@9ca6d9f6 (#8895)
diff --git a/.external b/.external
@@ -1 +1 @@
-xamarin/monodroid:main@a5742221b314864636f4356173a2535a539c7b2c
+xamarin/monodroid:main@9ca6d9f64fce11f04d668ece50ada36de1d7efce
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs
@@ -468,7 +468,7 @@ public void LocalizedAssemblies_ShouldBeFastDeployed ()
 			var app = new XamarinAndroidApplicationProject {
 				EmbedAssembliesIntoApk = false,
 			};
-			InlineData.AddCultureResourcesToProject (lib, "Foo", "CancelButton");
+			InlineData.AddCultureResourcesToProject (app, "Foo", "CancelButton");
 			app.References.Add (new BuildItem.ProjectReference ($"..\\{lib.ProjectName}\\{lib.ProjectName}.csproj", lib.ProjectName, lib.ProjectGuid));
 
 			using (var libBuilder = CreateDllBuilder (Path.Combine (path, lib.ProjectName)))

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xamarin/monodroid:main@a5742221b314864636f4356173a2535a539c7b2c`
	`1`	`+xamarin/monodroid:main@9ca6d9f64fce11f04d668ece50ada36de1d7efce`