Merge pull request #8712 from unoplatform/dev/jela/net6-android-assets2

fix(net6): [Android] Adjust for proper assets base path
unoplatform · May 9, 2022 · cd24160 · cd24160
2 parents 0e07956 + f653bf5
commit cd24160
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/build/uno.winui.single-project.targets b/build/uno.winui.single-project.targets
@@ -51,7 +51,7 @@
 		<AndroidProjectFolder Condition=" '$(AndroidProjectFolder)' == '' ">Android\</AndroidProjectFolder>
 		<AndroidManifest>$(AndroidProjectFolder)AndroidManifest.xml</AndroidManifest>
 		<MonoAndroidResourcePrefix>$(AndroidProjectFolder)Resources</MonoAndroidResourcePrefix>
-		<MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets;Assets</MonoAndroidAssetsPrefix>
+		<MonoAndroidAssetsPrefix>$(AndroidProjectFolder)Assets</MonoAndroidAssetsPrefix>
 
 		<!-- iOS -->
 		<EnableDefaultiOSItems>false</EnableDefaultiOSItems>

diff --git a/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs b/src/SourceGenerators/Uno.UI.Tasks/Assets/RetargetAssets.cs
@@ -26,6 +26,8 @@ public class RetargetAssets_v0 : Task
 		[Required]
 		public string TargetPlatform { get; set; }
 
+		public string AndroidAssetsPrefix { get; set; }
+
 		[Required]
 		public string DefaultLanguage { get; set; }
 
@@ -53,7 +55,7 @@ public override bool Execute()
 					break;
 				case "android":
 					resourceToTargetPath = resource => AndroidResourceConverter.Convert(resource, DefaultLanguage);
-					pathEncoder = AndroidResourceNameEncoder.EncodeFileSystemPath;
+					pathEncoder = s => AndroidResourceNameEncoder.EncodeFileSystemPath(s, AndroidAssetsPrefix ?? "Assets");
 					break;
 				default:
 					Log.LogMessage($"Skipping unknown platform {TargetPlatform}");
@@ -62,7 +64,7 @@ public override bool Execute()
 
 			Assets = ContentItems.ToArray();
 			RetargetedAssets = Assets
-				.Select((Func<ITaskItem, TaskItem>)(asset => ProcessContentItem(asset, resourceToTargetPath, pathEncoder)))
+				.Select(asset => ProcessContentItem(asset, resourceToTargetPath, pathEncoder))
 				.Where(a => a != null)
 				.ToArray();
 

diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
@@ -62,6 +62,7 @@
 						TargetPlatform="$(XamarinProjectType)"
 						DefaultLanguage="$(DefaultLanguage)"
 						ContentItems="@(Content)"
+						AndroidAssetsPrefix="$(MonoAndroidAssetsPrefix)"
 						Condition="'$(XamarinProjectType)'!=''">
 	  <Output TaskParameter="Assets"
 					  ItemName="Assets" />

diff --git a/src/Uno.UWP/Helpers/AndroidResourceNameEncoder.cs b/src/Uno.UWP/Helpers/AndroidResourceNameEncoder.cs
@@ -46,9 +46,9 @@ public static string Encode(string key)
 			return key;
 		}
 
-		public static string EncodeFileSystemPath(string path)
+		public static string EncodeFileSystemPath(string path, string prefix = "Assets")
 			// Android assets need to placed in the Assets folder
-			=> global::System.IO.Path.Combine("Assets", EncodePath(path, global::System.IO.Path.DirectorySeparatorChar));
+			=> global::System.IO.Path.Combine(prefix, EncodePath(path, global::System.IO.Path.DirectorySeparatorChar));
 
 		public static string EncodeResourcePath(string path)
 			=> EncodePath(path, '/');