Commit Graph

47 Commits

Author SHA1 Message Date
Wojtek Figat
809a1041b3 Merge remote-tracking branch 'origin/1.6' into 1.6 2023-03-31 19:38:05 +02:00
Wojtek Figat
a7c9c6142c Remove test logs 2023-03-31 18:23:24 +02:00
Wojtek Figat
7cbafcd86b Implement C# AOT process for .NET 7 for Windows platform 2023-03-31 14:41:42 +02:00
Wojtek Figat
20ce4642ea Add nethost usage for iOS build 2023-03-30 18:39:19 +02:00
Wojtek Figat
d925c8dab8 Fixes for Android 2023-03-28 17:21:27 +02:00
Wojtek Figat
eed2cdfe04 Progress on dotnet7 runtime hosting with mono 2023-03-22 17:59:46 +01:00
Wojtek Figat
4c4a559125 Improve dotnet host runtime detection if pack has multiple different versions 2023-03-22 14:20:38 +01:00
Wojtek Figat
30e825db75 Add dotnet7 for Android (wip) 2023-03-21 22:49:09 +01:00
Wojtek Figat
e83b8afdd3 Add nethost for ps4 2023-03-11 21:30:56 +01:00
Wojtek Figat
1096daaeb7 Dont assume path ends with directory slash in dotnet root 2023-02-19 14:30:42 +01:00
Wojtek Figat
0d78a6ba67 Fix path combine error 2023-02-19 14:01:37 +01:00
Wojtek Figat
e07a07f13e Support 'DOTNET_ROOT' env var in build tool for custom .NET SDK location 2023-02-19 13:51:54 +01:00
Wojtek Figat
2c1409c2a4 Add macOS build for dotnet7 2023-02-19 13:31:57 +01:00
Wojtek Figat
c18cefbb0b Add support for dotnet7 on macOS 2023-02-19 13:03:12 +01:00
641e746ee1 Fix dotnet SDK detection on Linux
The dotnet-sdk package on Arch Linux seems to different RID prefix in SDK location.
2023-01-28 20:40:34 +02:00
Wojciech Figat
38fcfee9a4 Merge branch '1.5' into dotnet7 2023-01-23 14:47:12 +01:00
Wojciech Figat
e2e7facad0 Fix using dependency module from nested referenced build in C# 2023-01-18 11:53:30 +01:00
Wojciech Figat
eebc4951de Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
Wojciech Figat
a7e428a21c Merge branch 'master' into 1.5
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
2023-01-10 15:37:55 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojtek Figat
4e4f4e700b Updates for dev with dotnet on linux 2023-01-08 20:27:28 +01:00
Wojciech Figat
0b8d4850f0 Use manual pdb file loading for debug symbols in C# 2023-01-04 09:56:58 +01:00
Wojciech Figat
26f8e5aa9e Use embedded debug information for C# dll to have proper stack trace information on game scripts exceptions 2023-01-03 18:38:44 +01:00
Wojciech Figat
3f172442be Add DotNetSdk to simplify using it 2022-12-21 14:13:00 +01:00
Wojciech Figat
b2beeb653b Remove unused using statement 2022-12-21 11:04:13 +01:00
Wojciech Figat
84a68c5977 Update Newtonsoft.Json to 13.0.2 and .Net 7 2022-12-17 13:38:30 +01:00
4e4fb91a6f Prevent optimizing C#-projects in Development builds for better debugging 2022-11-29 21:18:42 +02:00
89ac54520a Add Linux support for nethost module, build tool and build scripts 2022-11-26 23:19:46 +02:00
c4be764f61 Add nethost module and EngineConfiguration for .NET runtime 2022-11-26 13:50:32 +02:00
5e6fcc9669 Prepare Flax.Build project for .NET 7
Add .NET SDK project generator and upgrade Flax.Build project files
2022-11-26 13:50:31 +02:00
Wojciech Figat
76b14af7ec Add various improvements 2022-10-18 15:03:56 +02:00
Wojtek Figat
66d1015399 Simplify build options merging 2022-07-18 18:09:11 +02:00
Wojtek Figat
b67649dfbd Add ExternalModules to game modules for custom scripting binaries linking 2022-07-18 18:09:10 +02:00
Wojtek Figat
a9d66d6535 Various fixes for scripting runtime 2022-04-07 22:03:42 +02:00
Wojciech Figat
c9a779fea9 Disable caching for dotnet target build with msbuild 2022-01-14 15:04:15 +01:00
Wojciech Figat
d032f18b71 Add DotNet targets building 2022-01-14 14:19:46 +01:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojtek Figat
ca62cd2661 Mac impl progress 2022-01-03 13:59:52 +01:00
Wojtek Figat
a1ef7ddcf7 Mac support progress 2021-12-28 17:07:18 +01:00
Wojtek Figat
8938f13a0b Add support for compiling and running engine without C# scripting
(configurable via `EngineConfiguration.UseCSharp` in Flax.Build)
2021-10-23 16:43:15 +02:00
Wojtek Figat
c1f0fb750d Code style 2021-05-22 22:26:36 +02:00
GoaLitiuM
d401f57080 Use Roslyn C# compiler server to improve script compilation times 2021-05-22 16:43:40 +03:00
Wojtek Figat
b193a7abc4 Add support for binary modules with native-code only 2021-02-25 13:01:15 +01:00
Wojtek Figat
6ec58664e4 Make DotNet build task verbose about compiled C# lib output path 2021-02-23 23:38:39 +01:00
mafiesto4
c68e3af566 Use bundled mono on Linux for C# compilation 2021-02-14 23:04:42 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00