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

Format code in Flax.Build

Browse Source
This commit is contained in:
Wojtek Figat
2022-05-23 19:56:13 +02:00
parent b30d22fa45
commit e9c8584656
6 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Bindings/ModuleInfo.cs
View File

@@ -49,7 +49,7 @@ namespace Flax.Build.Bindings
reader.ReadBoolean() != Module.BuildCSharp ||
reader.ReadString() != Globals.Project.Name ||
reader.ReadString() != Globals.Project.Version.ToString()
)
)
throw new Exception();
base.Read(reader);

3
Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
View File

@@ -70,8 +70,7 @@ namespace Flax.Deploy
case TargetPlatform.Mac:
DeployFolder(RootPath, OutputPath, "Source/Platforms/Editor/Mac/Mono");
break;
default:
throw new InvalidPlatformException(Platform.BuildTargetPlatform);
default: throw new InvalidPlatformException(Platform.BuildTargetPlatform);
}
// Deploy DotNet deps

2
Source/Tools/Flax.Build/Deploy/Deployment.Utils.cs
View File

@@ -31,7 +31,7 @@ namespace Flax.Deploy
var dst = Path.GetDirectoryName(dstPath);
if (!Directory.Exists(dst))
Directory.CreateDirectory(dst);
if (!File.Exists(srcPath))
{
if (optional)

2
Source/Tools/Flax.Build/Platforms/Mac/MacToolchain.cs
View File

@@ -271,7 +271,7 @@ namespace Flax.Build.Platforms
// Input libraries
var libraryPaths = new HashSet<string>();
var dylibs = new HashSet<string>();
var dylibs = new HashSet<string>();
foreach (var library in linkEnvironment.InputLibraries)
{
var dir = Path.GetDirectoryName(library);

12
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
View File

@@ -376,10 +376,8 @@ namespace Flax.Build.Platforms
{
case WindowsPlatformToolset.v143:
case WindowsPlatformToolset.v142:
case WindowsPlatformToolset.v141:
return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references");
case WindowsPlatformToolset.v140:
return Path.Combine(vcToolChainDir, "lib", "store", "references");
case WindowsPlatformToolset.v141: return Path.Combine(vcToolChainDir, "lib", "x86", "store", "references");
case WindowsPlatformToolset.v140: return Path.Combine(vcToolChainDir, "lib", "store", "references");
default: return null;
}
}
@@ -906,11 +904,7 @@ namespace Flax.Build.Platforms
// Create AppxManifest file
{
using (var stringWriter = new StringWriterWithEncoding(Encoding.UTF8))
using (var xmlTextWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings
{
Encoding = Encoding.UTF8,
Indent = true,
}))
using (var xmlTextWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings { Encoding = Encoding.UTF8, Indent = true, }))
{
xmlTextWriter.WriteStartDocument();

4
Source/Tools/Flax.Build/Projects/XCodeProjectGenerator.cs
View File

@@ -120,7 +120,7 @@ namespace Flax.Build.Projects
contents.AppendLine("\t\t\tattributes = {");
contents.AppendLine("\t\t\t\tBuildIndependentTargetsInParallel = 1;");
contents.AppendLine("\t\t\t\tLastUpgradeCheck = 1320;");
contents.AppendLine("\t\t\t\tTargetAttributes = {");
contents.AppendLine("\t\t\t\tTargetAttributes = {");
contents.AppendLine("\t\t\t\t\t" + targetId + " = {");
contents.AppendLine("\t\t\t\t\t\tCreatedOnToolsVersion = 13.2.1;");
contents.AppendLine("\t\t\t\t\t};");
@@ -134,7 +134,7 @@ namespace Flax.Build.Projects
contents.AppendLine("\t\t\t\ten,");
contents.AppendLine("\t\t\t\tBase,");
contents.AppendLine("\t\t\t);");
contents.AppendLine("\t\t\tmainGroup = " + groupId+ ";");
contents.AppendLine("\t\t\tmainGroup = " + groupId + ";");
contents.AppendLine("\t\t\tprojectDirPath = \"\";");
contents.AppendLine("\t\t\tprojectRoot = \"\";");
contents.AppendLine("\t\t\ttargets = (");