Commit Graph

79 Commits

Author SHA1 Message Date
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
Wojtek Figat
4c082ef17f Codestyle fixes 2024-02-19 14:59:02 +01:00
9fd7a231ca Fix invalid Visual Studio solution folder nesting
Fixes fatal error when loading generated solution files with Rider, also
fixes folders with identical names getting mapped to same folder
(Plugins folders within plugin projects).
2024-01-08 20:45:39 +02:00
a8913d89ac Fix C++ Intellisense not working with latest version of Rider
Project `IncludePath` doesn't seem to include NMake include paths
anymore in Rider, populate the property with same paths to work around
the issue.
2024-01-01 17:47:04 +02:00
84249b3b57 Skip building main C#-project in VS solution when C++-project is present
Flax.Build is invoked twice, once for C++-project and one more time for
C#-project. Skip the C#-project by using the custom .targets file to not
break Rider's solution analysis feature.
2023-12-16 14:48:21 +02:00
d614232f8d Fix VS build issues with C# projects when engine path has spaces 2023-12-16 14:45:28 +02:00
aab88a746d Use detected .NET and C# language version in generated project files 2023-11-26 20:27:54 +02:00
e5b1a10d34 Fix VSCode intellisense not finding generated C# bindings definitions 2023-11-26 20:27:53 +02:00
Wojtek Figat
40d6e18e7e Add -dotnet=ver command arg to Flax.Build to specify .NET SDK version to use for build 2023-11-25 12:16:13 +01:00
Wojtek Figat
3a59cfcf20 Change Globals.BuildErrors into BuildException #1673 2023-11-15 11:57:53 +01:00
bcdd6c0551 Fix FlaxEngine C#-project getting built twice in engine solution 2023-10-15 16:16:53 +03:00
5b3e09baec Build C# projects in VS/Rider solution configurations
Rider's solution wide analysis does not work properly when projects
are not included in the active configuration for build.
2023-10-15 16:16:53 +03:00
0d7e7c30ca Run Flax.Build when building main C# project 2023-10-15 16:16:53 +03:00
88d9e60bee Generate Rider-specific user solution configuration files
Disables "Use Resharper Build" option by default in generated solutions,
Resharper can't detect file changes in project using custom build
commands.
2023-10-05 19:31:28 +03:00
Wojtek Figat
1dcad007c7 Merge branch 'launchsettings_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-launchsettings_fix 2023-10-04 18:57:50 +02:00
Wojtek Figat
0ea3cb0d69 Improve workflow with Android project generated after #1570 2023-10-02 11:05:19 +02:00
Wojtek Figat
ec7dcc4cfb Merge branch 'vs_android_intellisense_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vs_android_intellisense_fix 2023-10-01 12:29:36 +02:00
6483f95450 Fix Visual Studio project folder GUIDs randomization during regeneration 2023-09-30 03:26:56 +03:00
cc318dddd7 Remap non-native Editor VS build configurations to native configurations 2023-09-30 02:37:05 +03:00
22e5afdb6f Fix Visual Studio project GUIDs getting randomized during regeneration 2023-09-27 20:17:19 +03:00
10bcb26005 Fix invalid characters in generated C# launch settings paths 2023-09-23 18:29:53 +03:00
Wojtek Figat
da00d3b971 Merge branch 'csproj_file_structure' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-csproj_file_structure 2023-09-22 13:02:20 +02:00
Wojtek Figat
787479357e Codestyle fix #1495 2023-09-22 12:57:07 +02:00
Andrew Spiering
ab7ca683bb Addressing Feedback
* use a better method of getting Editor binary folder
2023-09-22 02:59:38 -07:00
Andrew Spiering
1537f49e73 Fixing Editor Path
* Again the path was hardcoded to win64
2023-09-22 02:41:09 -07:00
bf68d17afe Create VS folder structure for BuildScripts and FlaxEngine source files 2023-09-21 19:44:21 +03:00
Wojtek Figat
38671e0e01 Merge branch 'default_configurations_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-default_configurations_fix 2023-09-21 11:28:59 +02:00
Wojtek Figat
a420ca72d6 Fix Visual Studio solution project to ensure that main project is the first one 2023-09-21 11:23:57 +02:00
ed51791b58 Prevent generating VS configurations for Win32 and engine projects 2023-09-21 01:00:04 +03:00
Wojtek Figat
5ae27a0e92 Code style fix 2023-08-14 15:25:12 +02:00
e6878942f9 Fix missing C++ standard version in VC++ projects intellisense options 2023-08-13 21:33:17 +03:00
13e11091fc Support user defined .NET analyzers/source generators in Flax.Build 2023-07-30 21:58:11 +03:00
Wojtek Figat
fb6bc75e3a Fix launchSettings.json generation bug 2023-06-28 13:42:18 +02:00
b82f19a0df Support changing C# nullable references context build option 2023-06-19 19:33:13 +03:00
Wojtek Figat
5f019dc79f Improve Visual Studio solution generation with nested C# project cross-references to properly place projects in group folders 2023-06-16 13:45:54 +02:00
Wojtek Figat
ee9627bc15 Add launchSettings.json generation for Visual Studio 2022 with .NET 7 2023-06-14 13:14:16 +02:00
Wojtek Figat
7c39e5726d Improve csproj project files generation 2023-04-12 14:00:24 +02:00
Wojtek Figat
60f21d1a92 Update old copyright headers 2023-03-03 17:14:35 +01:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
847a28d133 Fix running VC++-project build commands with Rider on Linux 2023-02-03 22:37:31 +02:00
Wojciech Figat
7b20bc38a4 Merge branch '1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
Wojciech Figat
99ce5cd4d4 Fix for Visual Studio projects when using vs2022 2023-01-16 13:33:36 +01:00
Wojciech Figat
3df10d1d0a Add configuration-specific C# libs references to generates csproj file 2023-01-11 16:25:47 +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
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
da08b18ec5 Fix VisualStudioInstance.GetInstances() to be sorted from newest to oldest
(cherry picked from commit 6eaecc8793)
2022-12-29 22:23:37 +01:00
Wojciech Figat
b2beeb653b Remove unused using statement 2022-12-21 11:04:13 +01:00