diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
index 387a0dcff..1ff3ea4db 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
@@ -90,6 +90,11 @@ namespace Flax.Build.Projects.VisualStudio
var baseConfiguration = project.Configurations.First();
var baseOutputDir = Utilities.MakePathRelativeTo(project.CSharp.OutputPath ?? baseConfiguration.TargetBuildOptions.OutputFolder, projectDirectory);
var baseIntermediateOutputPath = Utilities.MakePathRelativeTo(project.CSharp.IntermediateOutputPath ?? Path.Combine(baseConfiguration.TargetBuildOptions.IntermediateFolder, "CSharp"), projectDirectory);
+
+ bool isMainProject = Globals.Project.ProjectFolderPath == project.WorkspaceRootPath && project.Name != "BuildScripts";
+ var flaxBuildTargetsFilename = isMainProject ? "Flax.Build.CSharp.targets" : "Flax.Build.CSharp.SkipBuild.targets";
+ var cacheProjectsPath = Utilities.MakePathRelativeTo(Path.Combine(Globals.Root, "Cache", "Projects"), projectDirectory);
+ var flaxBuildTargetsPath = !string.IsNullOrEmpty(cacheProjectsPath) ? Path.Combine(cacheProjectsPath, flaxBuildTargetsFilename) : flaxBuildTargetsFilename;
csProjectFileContent.AppendLine(" net7.0");
csProjectFileContent.AppendLine(" disable");
@@ -106,14 +111,14 @@ namespace Flax.Build.Projects.VisualStudio
csProjectFileContent.AppendLine(" 11.0");
csProjectFileContent.AppendLine(" 512");
- // Needed for Hostfxr
- csProjectFileContent.AppendLine(" true");
- csProjectFileContent.AppendLine(" true");
//csProjectFileContent.AppendLine(" false"); // TODO: use it to reduce burden of framework libs
- // This needs to be set here to fix errors in VS
- csProjectFileContent.AppendLine(string.Format(" {0}", baseOutputDir));
- csProjectFileContent.AppendLine(string.Format(" {0}", baseIntermediateOutputPath));
+ // Custom .targets file for overriding MSBuild build tasks
+ csProjectFileContent.AppendLine(string.Format(" $(MSBuildThisFileDirectory){0}", flaxBuildTargetsPath));
+
+ // Hide annoying warnings during build
+ csProjectFileContent.AppendLine(" false");
+ csProjectFileContent.AppendLine(" True");
csProjectFileContent.AppendLine(" ");
csProjectFileContent.AppendLine("");
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
index 1ba8e6709..dd4bf2f42 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
@@ -679,6 +679,57 @@ namespace Flax.Build.Projects.VisualStudio
Utilities.WriteFileIfChanged(dotSettingsUserFilePath, dotSettingsFileContent.ToString());
}
+
+ // Custom MSBuild .targets file to prevent building Flax C#-projects directly with MSBuild
+ {
+ var targetsFileContent = new StringBuilder();
+ targetsFileContent.AppendLine("");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine("");
+
+ Utilities.WriteFileIfChanged(Path.Combine(Globals.Root, "Cache", "Projects", "Flax.Build.CSharp.SkipBuild.targets"), targetsFileContent.ToString());
+ }
+
+ // Override MSBuild build tasks to run Flax.Build in C#-only projects
+ {
+ // Build command for the build tool
+ var buildToolPath = Path.ChangeExtension(Utilities.MakePathRelativeTo(typeof(Builder).Assembly.Location, Path.GetDirectoryName(solution.MainProject.Path)), null);
+
+ var targetsFileContent = new StringBuilder();
+ targetsFileContent.AppendLine("");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine(" ");
+ AppendBuildToolCommands(targetsFileContent, "-build");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine(" ");
+ AppendBuildToolCommands(targetsFileContent, "-rebuild");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine(" ");
+ AppendBuildToolCommands(targetsFileContent, "-clean");
+ targetsFileContent.AppendLine(" ");
+ targetsFileContent.AppendLine("");
+
+ Utilities.WriteFileIfChanged(Path.Combine(Globals.Root, "Cache", "Projects", "Flax.Build.CSharp.targets"), targetsFileContent.ToString());
+
+ void AppendBuildToolCommands(StringBuilder str, string extraArgs)
+ {
+ foreach (var configuration in solution.MainProject.Configurations)
+ {
+ var cmdLine = string.Format("{0} -log -mutex -workspace={1} -arch={2} -configuration={3} -platform={4} -buildTargets={5}",
+ FixPath(buildToolPath),
+ FixPath(solution.MainProject.WorkspaceRootPath),
+ configuration.Architecture,
+ configuration.Configuration,
+ configuration.Platform,
+ configuration.Target);
+ if (!string.IsNullOrEmpty(Configuration.Compiler))
+ cmdLine += " -compiler=" + Configuration.Compiler;
+
+ str.AppendLine(string.Format(" ", cmdLine, extraArgs, configuration.Name));
+ }
+ }
+ }
}
///
@@ -716,5 +767,14 @@ namespace Flax.Build.Projects.VisualStudio
projects.Add(project);
}
}
+
+ private static string FixPath(string path)
+ {
+ if (path.Contains(' '))
+ {
+ path = "\"" + path + "\"";
+ }
+ return path;
+ }
}
}