Commit Graph

28 Commits

Author SHA1 Message Date
Wojtek Figat
d9333018c2 Merge branch 'unix-dotnet-location' of https://github.com/Crawcik/FlaxEngine into Crawcik-unix-dotnet-location
# Conflicts:
#	Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
2023-09-19 22:00:36 +02:00
Wojtek Figat
b8a626c95d Merge branch 'dotnet8_compat_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet8_compat_fix 2023-09-18 17:27:02 +02:00
Wojtek Figat
79bf226fe1 Codestyle fix 2023-09-18 12:11:28 +02:00
Andrew Spiering
824ee9ec7f Fixing a typo :/ 2023-09-17 18:48:54 -07:00
Andrew Spiering
69e54d7f88 Fixing an issue if running an x64 machine already 2023-09-17 15:53:48 -07:00
Andrew Spiering
183ab7738f Fixing Flex Build issues on M1/2 macs
* This resolves some issues where if you are building the actual C# dlls you also need them to be x64 based if you are targeting an x64 based target. This is a little complicated here because we set all this up ahead of time assuming that all the targets are compatible but in this case they are not so, just following what other places in the code are doing around this specifically dotnet AOT.
2023-09-17 15:42:26 -07:00
785943bef8 Add missing marshaller methods for compatibility 2023-09-16 16:00:12 +03:00
Crawcik
1dd7a27568 Checking for executable 2023-09-14 23:19:36 +02:00
Crawcik
64a5d895bd Better version checking 2023-09-14 23:18:12 +02:00
Crawcik
73bf28dc47 Change of priorities on RID 2023-09-14 22:37:56 +02:00
Crawcik
6dd0957c4a Adding better finding dotnet root location for mac&unix 2023-09-14 22:34:03 +02:00
Wojtek Figat
c2da48c49f Fix dotnet installation selection on Linux to favor lib over share 2023-07-08 21:05:20 +02:00
Wojtek Figat
c5491eea97 Add Mono AOT for iOS to run C# 2023-04-13 08:34:49 +02:00
Wojtek Figat
99566a0f0f Fix typo 2023-04-12 11:21:55 +02:00
Wojtek Figat
0df9f5c797 Merge branch 'linux_rid_fix' of https://github.com/GoaLitiuM/FlaxEngine into 1.6 2023-04-04 15:09:37 +02:00
Wojtek Figat
0c4a608b65 Add .NET 7 support to Xbox 2023-04-04 14:46:08 +02:00
Wojtek Figat
20ce4642ea Add nethost usage for iOS build 2023-03-30 18:39:19 +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
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
91247cc080 Improve Linux dotnet runtime identifier detection 2023-02-17 17:01:13 +02: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
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
3f172442be Add DotNetSdk to simplify using it 2022-12-21 14:13:00 +01:00