GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Remove wrong .NET SDK preprocessor definitions and support NET8_0

Browse Source 
Only `X_OR_GREATER` symbols should be defined for all versions, and only
the latest detected SDK symbol should be generated.
This commit is contained in:
Ari Vuollet
2023-11-26 20:04:30 +02:00
parent e5b1a10d34
commit 0bcd0154e1
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Engine/Scripting/Scripting.Build.cs
View File

@@ -20,10 +20,7 @@ public class Scripting : EngineModule
void AddFrameworkDefines(string template, int major, int latestMinor) void AddFrameworkDefines(string template, int major, int latestMinor)
{ {
for (int minor = latestMinor; minor >= 0; minor--) for (int minor = latestMinor; minor >= 0; minor--)
{
options.ScriptingAPI.Defines.Add(string.Format(template, major, minor)); options.ScriptingAPI.Defines.Add(string.Format(template, major, minor));
options.ScriptingAPI.Defines.Add(string.Format($"{template}_OR_GREATER", major, minor));
}
} }
// .NET // .NET
@@ -31,14 +28,15 @@ public class Scripting : EngineModule
options.ScriptingAPI.Defines.Add("USE_NETCORE"); options.ScriptingAPI.Defines.Add("USE_NETCORE");
// .NET SDK // .NET SDK
AddFrameworkDefines("NET{0}_{1}", 7, 0); // "NET7_0" and "NET7_0_OR_GREATER" var dotnetSdk = DotNetSdk.Instance;
AddFrameworkDefines("NET{0}_{1}", 6, 0);
AddFrameworkDefines("NET{0}_{1}", 5, 0);
options.ScriptingAPI.Defines.Add("NET"); options.ScriptingAPI.Defines.Add("NET");
AddFrameworkDefines("NETCOREAPP{0}_{1}", 3, 1); // "NETCOREAPP3_1" and "NETCOREAPP3_1_OR_GREATER" AddFrameworkDefines("NET{0}_{1}", dotnetSdk.Version.Major, 0); // "NET7_0"
AddFrameworkDefines("NETCOREAPP{0}_{1}", 2, 2); for (int i = 5; i <= dotnetSdk.Version.Major; i++)
AddFrameworkDefines("NETCOREAPP{0}_{1}", 1, 1); AddFrameworkDefines("NET{0}_{1}_OR_GREATER", dotnetSdk.Version.Major, 0); // "NET7_0_OR_GREATER"
options.ScriptingAPI.Defines.Add("NETCOREAPP"); options.ScriptingAPI.Defines.Add("NETCOREAPP");
AddFrameworkDefines("NETCOREAPP{0}_{1}_OR_GREATER", 3, 1); // "NETCOREAPP3_1_OR_GREATER"
AddFrameworkDefines("NETCOREAPP{0}_{1}_OR_GREATER", 2, 2);
AddFrameworkDefines("NETCOREAPP{0}_{1}_OR_GREATER", 1, 1);
if (options.Target is EngineTarget engineTarget && engineTarget.UseSeparateMainExecutable(options)) if (options.Target is EngineTarget engineTarget && engineTarget.UseSeparateMainExecutable(options))
{ {