[Android][build] Fix android package name containing - (dotnet#93077)

* [Android][build] Fix Android package naming * Remove unnecessary code
vcsjones · Oct 6, 2023 · f37e653 · f37e653
1 parent c441891
commit f37e653
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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)
@@ -393,6 +392,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,