diff options
| -rw-r--r-- | xmake/languages/csharp/xmake.lua | 8 | ||||
| -rw-r--r-- | xmake/modules/core/tools/dotnet.lua | 1 | ||||
| -rw-r--r-- | xmake/rules/csharp/build/target.lua | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/xmake/languages/csharp/xmake.lua b/xmake/languages/csharp/xmake.lua index c4bc5aa30..e47e65585 100644 --- a/xmake/languages/csharp/xmake.lua +++ b/xmake/languages/csharp/xmake.lua @@ -36,9 +36,7 @@ language("csharp") , "target.optimize:check" } , binary = { - "target.strip" - , "target.symbols" - , "config.linkdirs" + "config.linkdirs" , "target.linkdirs" , "config.links" , "target.links" @@ -46,9 +44,7 @@ language("csharp") , "target.syslinks" } , shared = { - "target.strip" - , "target.symbols" - , "config.linkdirs" + "config.linkdirs" , "target.linkdirs" , "config.links" , "target.links" diff --git a/xmake/modules/core/tools/dotnet.lua b/xmake/modules/core/tools/dotnet.lua index 2647be1be..867112dc7 100644 --- a/xmake/modules/core/tools/dotnet.lua +++ b/xmake/modules/core/tools/dotnet.lua @@ -50,7 +50,6 @@ end function nf_symbol(self, level) local maps = { debug = {"-p:DebugType=full", "-p:DebugSymbols=true"} - , hidden = {"-p:DebugType=pdbonly", "-p:DebugSymbols=true"} } return maps[level] end diff --git a/xmake/rules/csharp/build/target.lua b/xmake/rules/csharp/build/target.lua index d97757dee..60b26602f 100644 --- a/xmake/rules/csharp/build/target.lua +++ b/xmake/rules/csharp/build/target.lua @@ -31,9 +31,15 @@ function build_sourcefiles(target, sourcebatch, opt) local targetfile = target:targetfile() -- get source files and kind - local sourcefiles = sourcebatch.sourcefiles + local sourcefiles = table.copy(sourcebatch.sourcefiles) local sourcekind = sourcebatch.sourcekind + -- prepend .csproj file so dotnet tool can find it + local csprojfile = target:data("csharp.csproj") + if csprojfile then + table.insert(sourcefiles, 1, csprojfile) + end + -- get depend file local dependfile = target:dependfile(targetfile) |