fix some compile error of ue5.7, fix #2237

Author: chexiongsheng

unreal/Puerts/Source/CSharpParamDefaultValueMetas/CSharpParamDefaultValueMetas.ubtplugin.csproj

@@ -8,8 +8,9 @@
     <EngineVersionFileContent >$([System.IO.File]::ReadAllText($(EngineVersionPath)))</EngineVersionFileContent >
     <TargetFramework Condition="$(EngineVersionFileContent.Contains('++UE5+Release-5.5'))">net8.0</TargetFramework>
     <TargetFramework Condition="!$(EngineVersionFileContent.Contains('++UE5+Release-5.5'))">net6.0</TargetFramework-->
-    <TargetFramework Condition="Exists('$(EngineDir)\Binaries\ThirdParty\DotNet\8.0.300')">net8.0</TargetFramework>
-    <TargetFramework Condition="!Exists('$(EngineDir)\Binaries\ThirdParty\DotNet\8.0.300')">net6.0</TargetFramework>
+    <DotNet8Path>$([System.IO.Directory]::GetDirectories('$(EngineDir)\Binaries\ThirdParty\DotNet', '8.0.*'))</DotNet8Path>
+    <TargetFramework Condition="'$(DotNet8Path)' != ''">net8.0</TargetFramework>
+    <TargetFramework Condition="'$(DotNet8Path)' == ''">net6.0</TargetFramework>
 
     <Configuration Condition=" '$(Configuration)' == '' ">Development</Configuration>
     <OutputType>Library</OutputType>
@@ -27,6 +28,9 @@
   <PropertyGroup Condition=" $(EngineDir.Contains('UE_5.5')) ">
     <DefineConstants>$(DefineConstants);UE_5_5_OR_LATER</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" $(EngineDir.Contains('UE_5.7')) ">
+    <DefineConstants>$(DefineConstants);UE_5_5_OR_LATER</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Development|AnyCPU' ">
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
     <Optimize>true</Optimize>

unreal/Puerts/Source/JsEnv/JsEnv.Build.cs

@@ -73,10 +73,15 @@ public JsEnv(ReadOnlyTargetRules Target) : base(Target)
             PublicDefinitions.Add("WITH_WEBSOCKET");
             PublicDefinitions.Add("WITH_WEBSOCKET_SSL");
             PublicDependencyModuleNames.Add("OpenSSL");
-        }
-
+        }
+
+
+#if UE_5_6_OR_LATER
+        CppCompileWarningSettings.ShadowVariableWarningLevel = WarningLevel.Warning;
+#else
         ShadowVariableWarningLevel = WarningLevel.Warning;
-
+#endif
+
         if (!FTextAsString)
         {
             PublicDefinitions.Add("PUERTS_FTEXT_AS_OBJECT");
@@ -520,20 +525,20 @@ void ThirdPartyNodejs(ReadOnlyTargetRules Target)
         else if (Target.Platform == UnrealTargetPlatform.Android)
         {
             /*
-            #if UE_4_19_OR_LATER
+#if UE_4_19_OR_LATER
                         AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(ModuleDirectory, "..", "..", "ThirdParty", "Libnode_APL.xml"));
-            #else
+#else
                         AdditionalPropertiesForReceipt.Add(new ReceiptProperty("AndroidPlugin", Path.Combine(ModuleDirectory, "..", "..", "ThirdParty", "Libnode_APL.xml")));
-            #endif
-            #if UE_4_24_OR_LATER
+#endif
+#if UE_4_24_OR_LATER
                         PublicSystemLibraryPaths.Add(Path.Combine(LibraryPath, "Android", "armeabi-v7a"));
                         PublicSystemLibraryPaths.Add(Path.Combine(LibraryPath, "Android", "arm64-v8a"));
                         PublicSystemLibraries.Add("node");
-            #else
+#else
                         PublicLibraryPaths.Add(Path.Combine(LibraryPath, "Android", "armeabi-v7a"));
                         PublicLibraryPaths.Add(Path.Combine(LibraryPath, "Android", "arm64-v8a"));
                         PublicAdditionalLibraries.Add("node");
-            #endif  //UE_4_24_OR_LATER
+#endif  //UE_4_24_OR_LATER
             */
 
             string[] Archs = new string[] { "armeabi-v7a", "arm64-v8a" };

unreal/Puerts/Source/JsEnv/Private/Gen/FLinearColor_Wrap.cpp

@@ -52,7 +52,11 @@ struct AutoRegisterForFLinearColor
             .Method("LinearRGBToHSV", MakeFunction(&FLinearColor::LinearRGBToHSV))
             .Method("HSVToLinearRGB", MakeFunction(&FLinearColor::HSVToLinearRGB))
             .Function("LerpUsingHSV", MakeFunction(&FLinearColor::LerpUsingHSV))
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 6
+            .Method("Quantize", MakeFunction(&FLinearColor::QuantizeFloor))
+#else
             .Method("Quantize", MakeFunction(&FLinearColor::Quantize))
+#endif
             .Method("QuantizeRound", MakeFunction(&FLinearColor::QuantizeRound))
             .Method("ToFColor", MakeFunction(&FLinearColor::ToFColor))
             .Method("Desaturate", MakeFunction(&FLinearColor::Desaturate))

unreal/Puerts/Source/JsEnv/Private/JSGeneratedClass.cpp

@@ -275,7 +275,9 @@ void UJSGeneratedClass::Restore(UClass* Class)
     OrphanedClass->ClassGeneratedBy = Class->ClassGeneratedBy;
 #endif
 
-#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 7
+    TObjectPtr<UField>* PP = &Class->Children;
+#elif ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2
     UField** PP = nullptr;
     UField* ChildrenPtr = Class->Children.Get();
     PP = &ChildrenPtr;
@@ -303,7 +305,7 @@ void UJSGeneratedClass::Restore(UClass* Class)
             JGF->JsFunction.Reset();
 
             *PP = JGF->Next;
-#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2 && ENGINE_MINOR_VERSION < 7
             if (PP == &ChildrenPtr)
             {
                 Class->Children = ChildrenPtr;
@@ -323,7 +325,7 @@ void UJSGeneratedClass::Restore(UClass* Class)
             PP = &(*PP)->Next;
         }
     }
-#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION > 2 && ENGINE_MINOR_VERSION < 7
     PP = &ChildrenPtr;
 #else
     PP = &Class->Children;

unreal/Puerts/Source/ParamDefaultValueMetas/ParamDefaultValueMetas.Build.cs

@@ -13,8 +13,10 @@ namespace UnrealBuildTool.Rules
     public class ParamDefaultValueMetas : ModuleRules
     {
         public ParamDefaultValueMetas(ReadOnlyTargetRules Target) : base(Target)
-        {
+        {
+#if !UE_5_7_OR_LATER
             bEnforceIWYU = false;
+#endif
 
             PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;