From 21421901d05e85daf79f3a74ff20a8dd30a4a910 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 23 Apr 2024 16:26:47 +0100 Subject: [PATCH 1/3] Test fixlocalizationtests branch --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 8ae1178ac22..32fd1fdaae0 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:main@a5742221b314864636f4356173a2535a539c7b2c +xamarin/monodroid:fixlocalizationtests@548e099f4fe1ab0d3a9375f734ac69fce94fa36a From 22140d5f4ff159cc4d60dcc210bcfa93851004f4 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Apr 2024 14:22:27 +0100 Subject: [PATCH 2/3] Fix the test so it deploys app resource.dll --- tests/MSBuildDeviceIntegration/Tests/InstallTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs index c7e625c0707..5f310d91f65 100644 --- 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))) From 718bea29261c6753719b33031bd1ade707e25da9 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 25 Apr 2024 21:35:01 +0100 Subject: [PATCH 3/3] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 32fd1fdaae0..f0a5b855d3f 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:fixlocalizationtests@548e099f4fe1ab0d3a9375f734ac69fce94fa36a +xamarin/monodroid:main@9ca6d9f64fce11f04d668ece50ada36de1d7efce