add native aot

3 files changed, 36 insertions, 3 deletions

diff --git a/xmake/rules/csharp/config.lua b/xmake/rules/csharp/config.lua
index e9dbc71e0..e3a728922 100644
--- a/xmake/rules/csharp/config.lua
+++ b/xmake/rules/csharp/config.lua
@@ -45,6 +45,14 @@ function main(target)
 
     target:data_set("csharp.csproj", csprojfile)
 
+    -- for NativeAOT shared library, export targetfile directly for C/C++ consumers
+    -- dotnet outputs without lib prefix, so we use syslinks with full path
+    local publish_aot = target:values("csharp.publish_aot")
+    if publish_aot and target:is_shared() then
+        target:data_set("inherit.links.deplink", false)
+        target:add("ldflags", target:targetfile(), {interface = true, force = true})
+    end
+
     -- add native shared library search paths for P/Invoke
     for _, dep in ipairs(target:orderdeps()) do
         if dep:is_shared() and not dep:rule("csharp.build") then
diff --git a/xmake/rules/csharp/generator/properties.lua b/xmake/rules/csharp/generator/properties.lua
index 15702eae4..0fbab66e3 100644
--- a/xmake/rules/csharp/generator/properties.lua
+++ b/xmake/rules/csharp/generator/properties.lua
@@ -67,6 +67,27 @@ function _resolve_assembly_name(context)
 end
 
 
+-- resolve runtime identifier from user config or auto-detect from target plat/arch
+-- e.g. "osx-x64", "osx-arm64", "linux-x64", "win-x64"
+function _resolve_runtime_identifier(context)
+    local rid = _get_target_value(context.target, "csharp.runtime_identifier")
+    if rid then
+        return rid
+    end
+    -- auto-detect RID when publish_aot is enabled
+    local publish_aot = _get_target_value(context.target, "csharp.publish_aot")
+    if not publish_aot then
+        return nil
+    end
+    local target = context.target
+    local plat = target:plat()
+    local arch = target:arch()
+    local rid_arch = ({x86_64 = "x64", i386 = "x86", x64 = "x64", x86 = "x86",
+                       arm64 = "arm64", ["arm64-v8a"] = "arm64", armv7 = "arm"})[arch] or arch
+    local rid_os = ({macosx = "osx", linux = "linux", windows = "win", mingw = "win"})[plat] or plat
+    return rid_os .. "-" .. rid_arch
+end
+
 -- register a single-value csharp.* property entry
 function _register_property(register, suffix, xml, default, extra)
     local entry = table.join({
@@ -128,7 +149,7 @@ function main()
     _register_property(register, "generate_documentation_file", "GenerateDocumentationFile")
     _register_property(register, "documentation_file", "DocumentationFile")
 
-    _register_property(register, "runtime_identifier", "RuntimeIdentifier")
+    register({kind = "property", xml = "RuntimeIdentifier", resolve = _resolve_runtime_identifier})
     _register_list_property(register, "runtime_identifiers", "RuntimeIdentifiers")
     _register_property(register, "self_contained", "SelfContained")
     _register_property(register, "use_app_host", "UseAppHost")
diff --git a/xmake/rules/csharp/xmake.lua b/xmake/rules/csharp/xmake.lua
index 9a0a6e43b..603af08c3 100644
--- a/xmake/rules/csharp/xmake.lua
+++ b/xmake/rules/csharp/xmake.lua
@@ -115,10 +115,14 @@
 rule("csharp.build")
     set_sourcekinds("cs")
     on_load(function (target)
-        -- dotnet always outputs .dll for libraries, and no prefix
         if target:is_shared() or target:is_static() then
+            -- dotnet always outputs without lib prefix
             target:set("prefixname", "")
-            target:set("extension", ".dll")
+            -- managed libraries use .dll, NativeAOT uses native format (.dylib/.so/.dll)
+            local publish_aot = target:values("csharp.publish_aot")
+            if not publish_aot then
+                target:set("extension", ".dll")
+            end
         end
     end)
     on_config("config")