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

Include configuration specific source files in solution configurations

Browse Source 
Include only relevant generated source files for selected solution
configuration. Fixes Intellisense issues when both ARM64 and Win64
configurations are present in project.
This commit is contained in:
Ari Vuollet
2024-05-15 20:56:16 +03:00
parent 83f40be4f5
commit 2de756f761
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build.Tests/Flax.Build.Tests.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>annotations</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

2
Source/Tools/Flax.Build/Flax.Build.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>annotations</Nullable>
<IsPackable>false</IsPackable>

38
Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
View File

@@ -162,7 +162,6 @@ namespace Flax.Build.Projects.VisualStudio
csProjectFileContent.AppendLine("");
// Files and folders
csProjectFileContent.AppendLine(" <ItemGroup>");
var files = new List<string>();
@@ -214,24 +213,41 @@ namespace Flax.Build.Projects.VisualStudio
else
csProjectFileContent.AppendLine(string.Format(" <{0} Include=\"{1}\" />", fileType, projectPath));
}
csProjectFileContent.AppendLine(" </ItemGroup>");
if (project.GeneratedSourceFiles != null)
{
foreach (var file in project.GeneratedSourceFiles)
foreach (var group in project.GeneratedSourceFiles.GroupBy(x => GetGroupingFromPath(x), y => y))
{
string fileType;
if (file.EndsWith(".cs", StringComparison.OrdinalIgnoreCase))
fileType = "Compile";
else
fileType = "None";
(string targetName, string platform, string arch, string configuration) = group.Key;
var filePath = file.Replace('/', '\\');
csProjectFileContent.AppendLine(string.Format(" <{0} Visible=\"false\" Include=\"{1}\" />", fileType, filePath));
var targetConfiguration = project.Targets.First(x => x.Name == targetName).ConfigurationName;
csProjectFileContent.AppendLine($" <ItemGroup Condition=\" '$(Configuration)|$(Platform)' == '{targetConfiguration}.{platform}.{configuration}|{arch}' \" >");
foreach (var file in group)
{
string fileType;
if (file.EndsWith(".cs", StringComparison.OrdinalIgnoreCase))
fileType = "Compile";
else
fileType = "None";
var filePath = file.Replace('/', '\\');
csProjectFileContent.AppendLine(string.Format(" <{0} Visible=\"false\" Include=\"{1}\" />", fileType, filePath));
}
csProjectFileContent.AppendLine(" </ItemGroup>");
}
(string target, string platform, string arch, string configuration) GetGroupingFromPath(string path)
{
ReadOnlySpan<char> span = path.AsSpan();
Span<Range> split = stackalloc Range[path.Count((c) => c == '/' || c == '\\')];
var _ = MemoryExtensions.SplitAny(path, split, [ '/', '\\' ]);
return (span[split[^5]].ToString(), span[split[^4]].ToString(), span[split[^3]].ToString(), span[split[^2]].ToString());
}
}
csProjectFileContent.AppendLine(" </ItemGroup>");
// End
csProjectFileContent.AppendLine("</Project>");