From 9218d95e3495f1485c7ee4e7dc1354a3be268a49 Mon Sep 17 00:00:00 2001 From: mdh1418 Date: Thu, 5 Oct 2023 12:51:59 -0400 Subject: [PATCH 1/2] [Android][build] Fix Android package naming --- src/tasks/AndroidAppBuilder/ApkBuilder.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs index 98188fdbe919c..0e71e74a51885 100644 --- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs +++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs @@ -393,6 +393,9 @@ public ApkBuilder(TaskLoggingHelper logger) if (!string.IsNullOrEmpty(ProjectName) && checkNumerics.IsMatch(ProjectName)) ProjectName = checkNumerics.Replace(ProjectName, @"_$1"); + if (!string.IsNullOrEmpty(ProjectName) && ProjectName.Contains('-')) + ProjectName = ProjectName.Replace("-", "_"); + string packageId = $"net.dot.{ProjectName}"; File.WriteAllText(javaActivityPath, From 9fbb03050ec953677d71d1f55b9f850094ee2205 Mon Sep 17 00:00:00 2001 From: mdh1418 Date: Thu, 5 Oct 2023 12:52:33 -0400 Subject: [PATCH 2/2] Remove unnecessary code --- src/tasks/AndroidAppBuilder/ApkBuilder.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs index 0e71e74a51885..d215ffcb271ec 100644 --- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs +++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs @@ -338,7 +338,6 @@ public ApkBuilder(TaskLoggingHelper logger) string monodroidSource = (IsLibraryMode) ? "monodroid-librarymode.c" : "monodroid.c"; string cmakeLists = Utils.GetEmbeddedResource("CMakeLists-android.txt") - .Replace("%ProjectName%", ProjectName) .Replace("%MonoInclude%", monoRuntimeHeaders) .Replace("%NativeLibrariesToLink%", nativeLibraries) .Replace("%MONODROID_SOURCE%", monodroidSource)