From 8896ebadda5b89588e3e75461f749fbb64727cbc Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Fri, 6 Jan 2023 11:31:08 +0100 Subject: [PATCH] Minor fixes for dotnet7 --- Source/Tools/Flax.Build/Build/EngineTarget.cs | 2 ++ Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Tools/Flax.Build/Build/EngineTarget.cs b/Source/Tools/Flax.Build/Build/EngineTarget.cs index 98c87358f..10737bea1 100644 --- a/Source/Tools/Flax.Build/Build/EngineTarget.cs +++ b/Source/Tools/Flax.Build/Build/EngineTarget.cs @@ -105,6 +105,7 @@ namespace Flax.Build Modules.Add("Main"); } +#if !USE_NETCORE // Mono on Linux is using dynamic linking and needs additional link files if (buildOptions.Platform.Target == TargetPlatform.Linux && Platform.BuildTargetPlatform == TargetPlatform.Linux && !IsPreBuilt) { @@ -121,6 +122,7 @@ namespace Flax.Build task.CommandPath = "ln"; task.CommandArguments = "-s -f libmonosgen-2.0.so libmonosgen-2.0.so.1.0.0"; } +#endif } private bool UseSeparateMainExecutable(BuildOptions buildOptions) diff --git a/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs b/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs index c759719c3..db5c410d9 100644 --- a/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs +++ b/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs @@ -232,8 +232,8 @@ namespace Flax.Build.NativeCpp }, SystemAnalyzers = new HashSet { - @"Microsoft.Interop.LibraryImportGenerator", - @"Microsoft.Interop.SourceGeneration", + "Microsoft.Interop.LibraryImportGenerator", + "Microsoft.Interop.SourceGeneration", }, FileReferences = new HashSet(), };