Merging //UE4/Dev-Main@4567547 to Dev-Rendering (//UE4/Dev-Rendering)

#rb none

[CL 4568017 by Marcus Wassmer in Dev-Rendering branch]
This commit is contained in:
Marcus Wassmer
2018-11-14 21:37:16 -05:00
parent 1be8409708
commit c56a69a8c0
1664 changed files with 67265 additions and 22369 deletions

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -11,6 +11,7 @@
<AssemblyName>BuildGraph.Automation</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -66,7 +67,6 @@
<Compile Include="Badge.cs" />
<Compile Include="BuildGraph.cs" />
<Compile Include="Graph.cs" />
<Compile Include="LockFile.cs" />
<Compile Include="Node.cs" />
<Compile Include="Report.cs" />
<Compile Include="Task.cs" />