Feedback

eng/testing/tests.android.targets

@@ -9,8 +9,9 @@
 
   <PropertyGroup>
     <AndroidBuildAppDependsOn>PrepareForAndroidBuildApp;$(AndroidBuildAppDependsOn);_CopyTestArchive</AndroidBuildAppDependsOn>
-
     <BundleTestAndroidAppDependsOn>AndroidBuildApp</BundleTestAndroidAppDependsOn>
+
+    <GenerateAppBundle Condition="'$(GenerateAppBundle)' == ''">true</GenerateAppBundle>
   </PropertyGroup>
 
   <!-- Target that kicks off the whole test build and run flow -->

src/mono/msbuild/android/build/AndroidApp.targets

@@ -62,8 +62,8 @@
         Exclude="$(AndroidAppDir)\*-stub-static.a" />
       <_RuntimeLibraries 
         Condition="'$(_TargetsDevice)' == ''"
-        Include="$(AndroidAppDir)\*.dylib;$(AndroidAppDir)\libmonosgen*.a;$(AndroidAppDir)\*-static.a"
-        Exclude="$(AndroidAppDir)\libmonosgen*.dylib;$(AndroidAppDir)\*-stub-static.a" />
+        Include="$(AndroidAppDir)\*.so;$(AndroidAppDir)\libmonosgen*.a;$(AndroidAppDir)\*-static.a"
+        Exclude="$(AndroidAppDir)\libmonosgen*.so;$(AndroidAppDir)\*-stub-static.a" />
 
       <!-- and not contains %(_UsedComponents)-static*.a -->
       <!-- if count > 0, remove all *-static components except in _UsedComponents -->

src/mono/msbuild/apple/build/AppleApp.targets

@@ -41,7 +41,7 @@
     <!-- common linker arguments for app and library builds -->
     <ItemGroup>
       <_CommonLinkerArgs Include="-framework Foundation" />
-      <_CommonLinkerArgs Include="-framework GSS" />
+      <_CommonLinkerArgs Condition="'$(TargetOS)' != 'tvos'" Include="-framework GSS" />
       <_CommonLinkerArgs Include="-framework Security" />
       <_CommonLinkerArgs Include="-framework UIKit" />
       <_CommonLinkerArgs Include="-lz" />

src/tasks/AndroidAppBuilder/ApkBuilder.cs

@@ -397,7 +397,6 @@ public ApkBuilder(TaskLoggingHelper logger)
             Utils.GetEmbeddedResource("MainActivity.java")
                 .Replace("%EntryPointLibName%", Path.GetFileName(mainLibraryFileName)));
 
-
         if (!string.IsNullOrEmpty(NativeMainSource))
             File.Copy(NativeMainSource, javaActivityPath, true);
 

src/tasks/AndroidAppBuilder/Templates/CMakeLists-android.txt

@@ -23,6 +23,7 @@ include_directories("%MonoInclude%")
 
 target_link_libraries(
     monodroid
+    PUBLIC
     %NativeLibrariesToLink%
     %APP_LINKER_ARGS%
 )

src/tasks/AppleAppBuilder/AppleAppBuilder.cs

@@ -62,11 +62,6 @@ public string TargetOS
     [Required]
     public ITaskItem[] Assemblies { get; set; } = Array.Empty<ITaskItem>();
 
-    /// <summary>
-    /// List of paths to native libraries that will make up the framework project for the app
-    /// </summary>
-    public ITaskItem[] FrameworkLibraries { get; set; } = Array.Empty<ITaskItem>();
-
     /// <summary>
     /// Additional linker arguments that apply to the app being built
     /// </summary>
@@ -277,12 +272,6 @@ public override bool Execute()
             }
         }
 
-        List<string> frameworkLibraries = new List<string>();
-        foreach (ITaskItem libItem in FrameworkLibraries)
-        {
-            frameworkLibraries.Add(libItem.ItemSpec);
-        }
-
         if (!ForceInterpreter && (isDevice || ForceAOT) && (assemblerFiles.Count == 0 && !UseNativeAOTRuntime))
         {
             throw new InvalidOperationException("Need list of AOT files for device builds.");
@@ -318,7 +307,7 @@ public override bool Execute()
 
         if (GenerateXcodeProject)
         {
-            XcodeProjectPath = generator.GenerateXCode(ProjectName, MainLibraryFileName, assemblerFiles, assemblerDataFiles, assemblerFilesToLink, frameworkLibraries, extraLinkerArgs,
+            XcodeProjectPath = generator.GenerateXCode(ProjectName, MainLibraryFileName, assemblerFiles, assemblerDataFiles, assemblerFilesToLink, extraLinkerArgs,
                 AppDir, binDir, MonoRuntimeHeaders, !isDevice, UseConsoleUITemplate, ForceAOT, ForceInterpreter, InvariantGlobalization, Optimized, EnableRuntimeLogging, EnableAppSandbox, DiagnosticPorts, RuntimeComponents, NativeMainSource, UseNativeAOTRuntime);
 
             if (BuildAppBundle)
@@ -344,7 +333,7 @@ public override bool Execute()
         }
         else if (GenerateCMakeProject)
         {
-             generator.GenerateCMake(ProjectName, MainLibraryFileName, assemblerFiles, assemblerDataFiles, assemblerFilesToLink, frameworkLibraries, extraLinkerArgs,
+             generator.GenerateCMake(ProjectName, MainLibraryFileName, assemblerFiles, assemblerDataFiles, assemblerFilesToLink, extraLinkerArgs,
                 AppDir, binDir, MonoRuntimeHeaders, !isDevice, UseConsoleUITemplate, ForceAOT, ForceInterpreter, InvariantGlobalization, Optimized, EnableRuntimeLogging, EnableAppSandbox, DiagnosticPorts, RuntimeComponents, NativeMainSource, UseNativeAOTRuntime);
         }
 

src/tasks/AppleAppBuilder/Templates/CMakeLists.txt.template

@@ -30,7 +30,7 @@ if(NOT %UseNativeAOTRuntime%)
     include_directories("%MonoInclude%")
 endif()
 
-set_target_properties(%ProjectName% PROPERTIES
+set_target_properties(%ProjectName% %AotTargetsList% PROPERTIES
     XCODE_ATTRIBUTE_SUPPORTS_MACCATALYST "YES"
 )
 
@@ -66,5 +66,7 @@ endif()
 
 target_link_libraries(
     %ProjectName%
-    %APP_LINKER_ARGS%
+    PUBLIC
+    %NativeLibrariesToLink%
+%APP_LINKER_ARGS%
 )

src/tasks/AppleAppBuilder/Xcode.cs

@@ -173,7 +173,6 @@ public string GenerateXCode(
         IEnumerable<string> asmFiles,
         IEnumerable<string> asmDataFiles,
         IEnumerable<string> asmLinkFiles,
-        IEnumerable<string> frameworkLibraries,
         IEnumerable<string> extraLinkerArgs,
         string workspace,
         string binDir,
@@ -191,7 +190,7 @@ public string GenerateXCode(
         string? nativeMainSource = null,
         bool useNativeAOTRuntime = false)
     {
-        var cmakeDirectoryPath = GenerateCMake(projectName, entryPointLib, asmFiles, asmDataFiles, asmLinkFiles, frameworkLibraries, extraLinkerArgs, workspace, binDir, monoInclude, preferDylibs, useConsoleUiTemplate, forceAOT, forceInterpreter, invariantGlobalization, optimized, enableRuntimeLogging, enableAppSandbox, diagnosticPorts, runtimeComponents, nativeMainSource, useNativeAOTRuntime);
+        var cmakeDirectoryPath = GenerateCMake(projectName, entryPointLib, asmFiles, asmDataFiles, asmLinkFiles, extraLinkerArgs, workspace, binDir, monoInclude, preferDylibs, useConsoleUiTemplate, forceAOT, forceInterpreter, invariantGlobalization, optimized, enableRuntimeLogging, enableAppSandbox, diagnosticPorts, runtimeComponents, nativeMainSource, useNativeAOTRuntime);
         CreateXcodeProject(projectName, cmakeDirectoryPath);
         return Path.Combine(binDir, projectName, projectName + ".xcodeproj");
     }
@@ -234,7 +233,6 @@ public string GenerateCMake(
         IEnumerable<string> asmFiles,
         IEnumerable<string> asmDataFiles,
         IEnumerable<string> asmLinkFiles,
-        IEnumerable<string> frameworkLibraries,
         IEnumerable<string> extraLinkerArgs,
         string workspace,
         string binDir,
@@ -401,27 +399,13 @@ public string GenerateCMake(
             toLink += $"    {asmLinkFile}{Environment.NewLine}";
         }
 
-        string frameworks = "";
-        if ((Target == TargetNames.iOS) || (Target == TargetNames.iOSsim) || (Target == TargetNames.MacCatalyst))
-        {
-            frameworks = "\"-framework GSS\"";
-        }
-
-        string frameworkLibrariesPaths = "";
-        foreach(string frameworkPath in frameworkLibraries)
-        {
-            frameworkLibrariesPaths += $"{frameworkPath} ";
-        }
-
         string appLinkerArgs = "";
         foreach(string linkerArg in extraLinkerArgs)
         {
-            appLinkerArgs += $"    {linkerArg}{Environment.NewLine}";
+            appLinkerArgs += $"    \"{linkerArg}\"{Environment.NewLine}";
         }
 
-        cmakeLists = cmakeLists.Replace("%FrameworksToLink%", frameworks);
         cmakeLists = cmakeLists.Replace("%NativeLibrariesToLink%", toLink);
-        cmakeLists = cmakeLists.Replace("%FRAMEWORK_LIBRARIES%", frameworkLibrariesPaths);
         cmakeLists = cmakeLists.Replace("%APP_LINKER_ARGS%", appLinkerArgs);
         cmakeLists = cmakeLists.Replace("%AotSources%", aotSources);
         cmakeLists = cmakeLists.Replace("%AotTargetsList%", aotList);

src/tasks/Common/Builders/AppBuilderTask.cs

@@ -89,7 +89,7 @@ private void GatherCompiledAssemblies()
             compiledAssembly.LibraryFile = file.GetMetadata("LibraryFile");
             compiledAssembly.DataFile = file.GetMetadata("AotDataFile");
             compiledAssembly.LlvmObjectFile = file.GetMetadata("LlvmObjectFile");
-            compiledAssembly.LlvmBitCodeFile = file.GetMetadata("LllvmBitcodeFile");
+            compiledAssembly.LlvmBitCodeFile = file.GetMetadata("LlvmBitcodeFile");
             compiledAssembly.ExportsFile = file.GetMetadata("ExportSymbolsFile");
 
             CompiledAssemblies.Add(compiledAssembly);

src/tasks/LibraryBuilder/LibraryBuilder.cs

@@ -105,6 +105,11 @@ public override bool Execute()
         StringBuilder extraSources = new StringBuilder();
         StringBuilder linkerArgs = new StringBuilder();
 
+        if (!ValidateValidTargetOS())
+        {
+            throw new ArgumentException($"{TargetOS} is not yet supported by the librarybuilder task.");
+        }
+
         if (!base.Execute())
         {
             // log something here
@@ -278,4 +283,11 @@ private string GetLibraryName()
 
         return $"{libPrefix}{Name}{libExtension}";
     }
+
+    private bool ValidateValidTargetOS() =>
+        TargetOS switch
+        {
+            "android" or "ios" or "tvos" or "maccatalyst" => true,
+            _ => false
+        };
 }

src/tasks/LibraryBuilder/Templates/CMakeLists.txt.template

@@ -23,6 +23,7 @@ add_library(
 )
 target_link_libraries(
     aot_library
+    PUBLIC
     ${DOTNET_AOT_OBJECTS}
 )
 
@@ -33,6 +34,7 @@ add_library(
 
 target_link_libraries(
     %LIBRARY_NAME%
+    PUBLIC
     aot_library
     %LIBRARY_LINKER_ARGS%
 )

src/tasks/LibraryBuilder/Templates/autoinit.c

@@ -20,7 +20,7 @@ void keep_init()
     appctx_values[1] = "APP_CONTEXT_BASE_DIRECTORY";
     appctx_values[2] = "System.TimeZoneInfo.LocalDateTimeOffset";
 
-	int ret = monovm_initialize (3, appctx_keys, appctx_values);
+    int ret = monovm_initialize (3, appctx_keys, appctx_values);
 }
 
 void