Merge branch 'GoaLitiuM-launchsettings_configuration'

This commit is contained in:
Wojtek Figat
2025-12-29 22:18:40 +01:00
2 changed files with 4 additions and 1 deletions

View File

@@ -132,6 +132,8 @@ namespace Flax.Build.Projects.VisualStudio
// Configurations
foreach (var configuration in project.Configurations)
{
if (configuration.Equals(defaultConfiguration))
continue;
WriteConfiguration(project, csProjectFileContent, projectDirectory, configuration);
}
@@ -309,6 +311,7 @@ namespace Flax.Build.Projects.VisualStudio
}
csProjectFileContent.AppendLine(string.Format(" <DocumentationFile>{0}\\{1}.CSharp.xml</DocumentationFile>", outputPath, project.BaseName));
csProjectFileContent.AppendLine(" <UseVSHostingProcess>true</UseVSHostingProcess>");
csProjectFileContent.AppendLine(string.Format(" <FlaxConfiguration>{0}</FlaxConfiguration>", configuration.ConfigurationName));
csProjectFileContent.AppendLine(" </PropertyGroup>");

View File

@@ -630,7 +630,7 @@ namespace Flax.Build.Projects.VisualStudio
{
var profiles = new Dictionary<string, string>();
var profile = new StringBuilder();
var configuration = "Development";
var configuration = "$(FlaxConfiguration)";
var editorPath = Utilities.NormalizePath(Path.Combine(Globals.EngineRoot, Platform.GetEditorBinaryDirectory(), configuration, $"FlaxEditor{Utilities.GetPlatformExecutableExt()}")).Replace('\\', '/');
var workspacePath = Utilities.NormalizePath(solutionDirectory).Replace('\\', '/');
foreach (var project in projects)