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

Merge branch '1.5' into dotnet7

Browse Source 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
This commit is contained in:
Wojciech Figat
2023-01-17 11:52:52 +01:00
parent abdc257332 fc65e5a7a6
commit 7b20bc38a4
134 changed files with 1895 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Projects/VisualStudio/CSProjectGenerator.cs
View File

@@ -81,6 +81,8 @@ namespace Flax.Build.Projects.VisualStudio
csProjectFileContent.AppendLine(" <LangVersion>7.3</LangVersion>");
csProjectFileContent.AppendLine(" <FileAlignment>512</FileAlignment>");
csProjectFileContent.AppendLine(" <TargetFrameworkProfile />");
if (Version >= VisualStudioVersion.VisualStudio2022)
csProjectFileContent.AppendLine(" <ResolveNuGetPackages>false</ResolveNuGetPackages>");
csProjectFileContent.AppendLine(" </PropertyGroup>");

3
Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
View File

@@ -103,7 +103,8 @@ namespace Flax.Build.Projects.VisualStudio
vcProjectFileContent.AppendLine(" <TargetRuntime>Native</TargetRuntime>");
vcProjectFileContent.AppendLine(" <CharacterSet>Unicode</CharacterSet>");
vcProjectFileContent.AppendLine(" <Keyword>MakeFileProj</Keyword>");
vcProjectFileContent.AppendLine(" <ResolveNuGetPackages>false</ResolveNuGetPackages>");
if (Version >= VisualStudioVersion.VisualStudio2022)
vcProjectFileContent.AppendLine(" <ResolveNuGetPackages>false</ResolveNuGetPackages>");
vcProjectFileContent.AppendLine(" </PropertyGroup>");
// Default properties