Build detection fixes.

(cherry picked from commit 52ac6dfae9979de11183124eb6ec45cffe7127e6)

Author: EliotVU

CHANGELOG.md

@@ -1,5 +1,12 @@
 #
 
+##
+
+* Fixed #138, unit test and document things regarding build overriding.
+* Fixed https://github.com/UE-Explorer/UE-Explorer/issues/100; Detection for "Dungeon Defenders Eternity"
+
+* Improved support for Sudden Attack 2 (#127, #129); "Supper newer version" and "Fixes trailing data for old package OnlineSubsystemPC.u"
+
 ## [1.12.1](https://github.com/EliotVU/Unreal-Library/releases/tag/1.12.1)
 
 * Fixed support for Alien: Colonial Marines

Directory.Build.props

@@ -20,7 +20,7 @@
 
   <PropertyGroup>
     <Authors>EliotVU</Authors>
-    <Copyright>2009-2025 Eliot van Uytfanghe. All rights reserved.</Copyright>
+    <Copyright>2009-2026 Eliot van Uytfanghe. All rights reserved.</Copyright>
     <PackageProjectUrl>https://github.com/EliotVU/Unreal-Library</PackageProjectUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>

src/Eliot.UELib.csproj

@@ -10,11 +10,12 @@
     <PackageTags>UnrealEngine;UnrealScript;Decompiler;UPK;Exporter;Bytecode</PackageTags>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Eliot.UELib.snk</AssemblyOriginatorKeyFile>
+    <DebugType>portable</DebugType>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
     <TargetFrameworks>net48;$(TargetFrameworks)</TargetFrameworks>

src/UnrealPackage.cs

@@ -972,7 +972,7 @@ public GameBuild(BuildName name)
                 Contract.Assert(buildFieldInfo != null);
 
                 // Pick the last attribute.
-                var buildAttributes = buildFieldInfo.GetCustomAttributes<BuildAttribute>(false).Last();
+                var buildAttributes = buildFieldInfo.GetCustomAttributes<BuildAttribute>(false).LastOrDefault();
                 if (buildAttributes != null)
                 {
                     Generation = buildAttributes.Generation;
@@ -1048,6 +1048,9 @@ public GameBuild(UnrealPackage package)
                     Name = package.Summary.LicenseeVersion == 0
                         ? BuildName.Default
                         : BuildName.Unknown;
+
+                    DetermineGeneration(package.Summary.Version);
+
                     return;
                 }
 
@@ -1060,28 +1063,14 @@ public GameBuild(UnrealPackage package)
                     OverrideLicenseeVersion = overrideAttribute.FixedLicenseeVersion;
                 }
 
-                if (buildAttribute != null)
+                if (buildAttribute is { Generation: BuildGeneration.Undefined } or null)
                 {
-                    if (buildAttribute.Generation == BuildGeneration.Undefined)
-                    {
-                        uint version = OverrideVersion.GetValueOrDefault(package.Summary.Version);
-                        if (package.Summary.UE4Version > 0)
-                        {
-                            Generation = BuildGeneration.UE4;
-                        }
-                        else
-                            Generation = version switch
-                            {
-                                >= (uint)PackageObjectLegacyVersion.UE3 => BuildGeneration.UE3,
-                                >= (uint)PackageObjectLegacyVersion.PrimitiveCastTokenAdded => BuildGeneration.UE2,
-                                _ => BuildGeneration.UE1
-                            };
-                    }
-                    else
-                    {
-                        Generation = buildAttribute.Generation;
-                    }
-
+                    uint version = OverrideVersion.GetValueOrDefault(package.Summary.Version);
+                    DetermineGeneration(version);
+                }
+                else
+                {
+                    Generation = buildAttribute.Generation;
                     Flags = buildAttribute.Flags;
                 }
 
@@ -1091,6 +1080,25 @@ public GameBuild(UnrealPackage package)
                     // We cannot create the instance here, because the instance itself may be dependent on GameBuild.
                     EngineBranchType = engineBranchAttribute.EngineBranchType;
                 }
+
+                return;
+
+                void DetermineGeneration(uint version)
+                {
+                    if (package.Summary.UE4Version > 0)
+                    {
+                        Generation = BuildGeneration.UE4;
+                    }
+                    else
+                    {
+                        Generation = version switch
+                        {
+                            >= (uint)PackageObjectLegacyVersion.UE3 => BuildGeneration.UE3,
+                            >= (uint)PackageObjectLegacyVersion.PrimitiveCastTokenAdded => BuildGeneration.UE2,
+                            _ => BuildGeneration.UE1
+                        };
+                    }
+                }
             }
 
             private FieldInfo? FindBuildInfo(UnrealPackage linker, out BuildAttribute? buildAttribute)
@@ -1408,7 +1416,10 @@ private void SetupBranch(UnrealPackage package)
                         package.Build.Generation);
 
                     // The branch may override the generation. (Especially in unit-tests this is useful)
-                    package.Build.Generation = package.Branch.Generation;
+                    if (package.Branch.Generation != BuildGeneration.Undefined)
+                    {
+                        package.Build.Generation = package.Branch.Generation;
+                    }
                 }
                 else if (package.Summary.UE4Version > 0)
                 {