Update USharp To UE 4.24

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Core/Math/EAxis.cs

@@ -8,7 +8,7 @@ namespace UnrealEngine.Runtime
     // Engine\Source\Runtime\Core\Public\Math\Axis.h
 
     /// <summary>Generic axis enum (mirrored for property use in Object.h)</summary>
-    [UEnum, UMetaPath("/Script/CoreUObject.EAxis")]
+    [UEnum, UMetaPath("/Script/CoreUObject.Axis")]
     public enum EAxis
     {
         None = 0,

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/CoreUObject/FObjectInitializer.cs

@@ -182,12 +182,12 @@ public FObjectInitializer DoNotCreateDefaultSubobject(string subobjectName)
         /// <summary>
         /// Internal use only, checks if the override is legal and if not deal with error messages
         /// </summary>
-        public bool IslegalOverride(FName componentName, UClass derivedComponentClass, UClass baseComponentClass)
-        {
-            return Native_FObjectInitializer.IslegalOverride(NativeObjectInitializer, ref componentName,
-                derivedComponentClass == null ? IntPtr.Zero : derivedComponentClass.Address,
-                baseComponentClass == null ? IntPtr.Zero : baseComponentClass.Address);
-        }
+        //public bool IslegalOverride(FName componentName, UClass derivedComponentClass, UClass baseComponentClass)
+        //{
+        //    return Native_FObjectInitializer.IslegalOverride(NativeObjectInitializer, ref componentName,
+        //        derivedComponentClass == null ? IntPtr.Zero : derivedComponentClass.Address,
+        //        baseComponentClass == null ? IntPtr.Zero : baseComponentClass.Address);
+        //}
 
         public void FinalizeSubobjectClassInitialization()
         {

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Engine/Subsystems/FSubsystemCollection.cs

@@ -22,9 +22,9 @@ internal FSubsystemCollection(IntPtr collectionAddress)
         /// <summary>
         /// Initialize the collection of systems, systems will be created and initialized.
         /// </summary>
-        public void Initialize()
+        public void Initialize(UObject NewOuter)
         {
-            Native_FSubsystemCollection.Initialize(collectionAddress);
+            Native_FSubsystemCollection.Initialize(collectionAddress, NewOuter == null ? IntPtr.Zero : NewOuter.Address);
         }
 
         /// <summary>

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/Native/Native_FObjectInitializer.cs

@@ -16,7 +16,7 @@ static class Native_FObjectInitializer
         public delegate IntPtr Del_CreateDefaultSubobject(IntPtr instance, IntPtr outer, ref FName subobjectFName, IntPtr returnType,  IntPtr classToCreateByDefault, csbool isRequired, csbool isTransient);
         public delegate IntPtr Del_DoNotCreateDefaultSubobject(IntPtr instance, ref FName subobjectName);
         public delegate IntPtr Del_DoNotCreateDefaultSubobjectStr(IntPtr instance, ref FScriptArray subobjectName);
-        public delegate csbool Del_IslegalOverride(IntPtr instance, ref FName componentName, IntPtr derivedComponentClass, IntPtr baseComponentClass);
+        //public delegate csbool Del_IslegalOverride(IntPtr instance, ref FName componentName, IntPtr derivedComponentClass, IntPtr baseComponentClass);
         public delegate void Del_FinalizeSubobjectClassInitialization(IntPtr instance);
         public delegate void Del_AssertIfInConstructor(IntPtr outer, ref FScriptArray errorMessage);
         public delegate IntPtr Del_Get();
@@ -28,7 +28,7 @@ static class Native_FObjectInitializer
         public static Del_CreateDefaultSubobject CreateDefaultSubobject;
         public static Del_DoNotCreateDefaultSubobject DoNotCreateDefaultSubobject;
         public static Del_DoNotCreateDefaultSubobjectStr DoNotCreateDefaultSubobjectStr;
-        public static Del_IslegalOverride IslegalOverride;
+        //public static Del_IslegalOverride IslegalOverride;
         public static Del_FinalizeSubobjectClassInitialization FinalizeSubobjectClassInitialization;        
         public static Del_AssertIfInConstructor AssertIfInConstructor;
         public static Del_Get Get;        

Managed/UnrealEngine.Runtime/UnrealEngine.Runtime/Internal/Native/Native_FSubsystemCollection.cs

@@ -9,7 +9,7 @@ namespace UnrealEngine.Runtime.Native
 {
     public static class Native_FSubsystemCollection
     {
-        public delegate void Del_Initialize(IntPtr instance);
+        public delegate void Del_Initialize(IntPtr instance, IntPtr NewOuter);
         public delegate void Del_Deinitialize(IntPtr instance);
         public delegate csbool Del_InitializeDependency(IntPtr instance, IntPtr subsystemClass);
         public delegate IntPtr Del_GetSubsystem(IntPtr instance, IntPtr subsystemClass);

Settings/ModulesWhitelist.txt

@@ -47,6 +47,7 @@ Sequencer
 Slate
 SlateCore
 SourceControl
+StaticMeshDescription
 TimeManagement
 UMG
 UMGEditor

Source/USharp/Private/ExportedFunctions/Export_FApp.h

@@ -5,7 +5,7 @@ CSEXPORT void CSCONV Export_FApp_GetBranchName(FString& result)
 
 CSEXPORT int32/*EBuildConfigurations::Type*/ CSCONV Export_FApp_GetBuildConfiguration()
 {
-	return FApp::GetBuildConfiguration();
+	return (int32)FApp::GetBuildConfiguration();
 }
 
 CSEXPORT void CSCONV Export_FApp_GetBuildVersion(FString& result)

Source/USharp/Private/ExportedFunctions/Export_FObjectInitializer.h

@@ -33,10 +33,10 @@ CSEXPORT FObjectInitializer const& CSCONV Export_FObjectInitializer_DoNotCreateD
 	return instance->DoNotCreateDefaultSubobject(*SubobjectName);
 }
 
-CSEXPORT csbool CSCONV Export_FObjectInitializer_IslegalOverride(FObjectInitializer* instance, const FName& InComponentName, class UClass *DerivedComponentClass, class UClass *BaseComponentClass)
-{
-	return instance->IslegalOverride(InComponentName, DerivedComponentClass, BaseComponentClass);
-}
+//CSEXPORT csbool CSCONV Export_FObjectInitializer_IslegalOverride(FObjectInitializer* instance, const FName& InComponentName, class UClass *DerivedComponentClass, class UClass *BaseComponentClass)
+//{
+//	return instance->IslegalOverride(InComponentName, DerivedComponentClass, BaseComponentClass);
+//}
 
 CSEXPORT void CSCONV Export_FObjectInitializer_FinalizeSubobjectClassInitialization(FObjectInitializer* instance)
 {
@@ -62,7 +62,7 @@ CSEXPORT void CSCONV Export_FObjectInitializer(RegisterFunc registerFunc)
 	REGISTER_FUNC(Export_FObjectInitializer_CreateDefaultSubobject);
 	REGISTER_FUNC(Export_FObjectInitializer_DoNotCreateDefaultSubobject);
 	REGISTER_FUNC(Export_FObjectInitializer_DoNotCreateDefaultSubobjectStr);
-	REGISTER_FUNC(Export_FObjectInitializer_IslegalOverride);
+	//REGISTER_FUNC(Export_FObjectInitializer_IslegalOverride);
 	REGISTER_FUNC(Export_FObjectInitializer_FinalizeSubobjectClassInitialization);
 	REGISTER_FUNC(Export_FObjectInitializer_AssertIfInConstructor);
 	REGISTER_FUNC(Export_FObjectInitializer_Get);

Source/USharp/Private/ExportedFunctions/Export_FSubsystemCollection.h

@@ -1,6 +1,6 @@
-CSEXPORT void CSCONV Export_FSubsystemCollection_Initialize(FSubsystemCollectionBase& instance)
+CSEXPORT void CSCONV Export_FSubsystemCollection_Initialize(FSubsystemCollectionBase& instance, UObject* NewOuter)
 {
-	instance.Initialize();
+	instance.Initialize(NewOuter);
 }
 
 CSEXPORT void CSCONV Export_FSubsystemCollection_Deinitialize(FSubsystemCollectionBase& instance)

Source/USharp/Private/ExportedFunctions/Export_ICppStructOps.h

@@ -68,7 +68,7 @@ CSEXPORT csbool CSCONV Export_ICppStructOps_HasGetTypeHash(UScriptStruct::ICppSt
 
 CSEXPORT uint32 CSCONV Export_ICppStructOps_GetTypeHash(UScriptStruct::ICppStructOps* instance, const void* Src)
 {
-	return instance->GetTypeHash(Src);
+	return instance->GetStructTypeHash(Src);
 }
 
 CSEXPORT uint64 CSCONV Export_ICppStructOps_GetComputedPropertyFlags(UScriptStruct::ICppStructOps* instance)

Source/USharp/Private/ExportedFunctions/Export_UField.h

@@ -81,22 +81,22 @@ CSEXPORT csbool CSCONV Export_UField_GetBoolMetaDataF(UField* instance, const FN
 
 CSEXPORT int32 CSCONV Export_UField_GetINTMetaData(UField* instance, const FString& Key)
 {
-	return instance->GetINTMetaData(*Key);
+	return instance->GetIntMetaData(*Key);
 }
 
 CSEXPORT int32 CSCONV Export_UField_GetINTMetaDataF(UField* instance, const FName& Key)
 {
-	return instance->GetINTMetaData(Key);
+	return instance->GetIntMetaData(Key);
 }
 
 CSEXPORT float CSCONV Export_UField_GetFLOATMetaData(UField* instance, const FString& Key)
 {
-	return instance->GetFLOATMetaData(*Key);
+	return instance->GetFloatMetaData(*Key);
 }
 
 CSEXPORT float CSCONV Export_UField_GetFLOATMetaDataF(UField* instance, const FName& Key)
 {
-	return instance->GetFLOATMetaData(Key);
+	return instance->GetFloatMetaData(Key);
 }
 
 CSEXPORT UClass* CSCONV Export_UField_GetClassMetaData(UField* instance, const FString& Key)

Source/USharp/Private/ExportedFunctions/Internal/HotReload/SharpHotReloadClassReinstancer.cpp

@@ -464,6 +464,7 @@ void FSharpHotReloadClassReinstancer::CollectChangedProperties(FCDOPropertyConta
 				// Delegates
 				case (BaseCastFlags | CASTCLASS_UDelegateProperty):
 				case (BaseCastFlags | CASTCLASS_UMulticastDelegateProperty):
+				case (BaseCastFlags | CASTCLASS_UMulticastDelegateProperty | CASTCLASS_UMulticastSparseDelegateProperty):
 					{
 						void* OldValuePtr = OldProperty->ContainerPtrToValuePtr<void>(Container.OldPtr);
 						void* NewValuePtr = NewProperty->ContainerPtrToValuePtr<void>(Container.NewPtr);

Source/USharpEditor/Private/SharpTemplateProjectDefs.cpp

@@ -11,12 +11,14 @@
 
 void USharpTemplateProjectDefs::RegisterTemplate()
 {
-	FGameProjectGenerationModule::Get().RegisterTemplateCategory(
-		TEXT("USharp"),
-		LOCTEXT("USharpCategory_Name", "C#"),
-		LOCTEXT("USharpCategory_Description", "C# (USharp)"),
-		FEditorStyle::GetBrush("GameProjectDialog.BlueprintIcon"),
-		FEditorStyle::GetBrush("GameProjectDialog.BlueprintImage"));
+	//Remove This Line For UE_4.24.
+	//Initialize Inside USharp/Templates/TemplateCategories.ini file instead.
+	//FGameProjectGenerationModule::Get().RegisterTemplateCategory(
+	//	TEXT("USharp"),
+	//	LOCTEXT("USharpCategory_Name", "C#"),
+	//	LOCTEXT("USharpCategory_Description", "C# (USharp)"),
+	//	FEditorStyle::GetBrush("GameProjectDialog.BlueprintIcon"),
+	//	FEditorStyle::GetBrush("GameProjectDialog.BlueprintImage"));
 
 	// A seperate tab for "C#/C++" may be useful at a later date when there enough templates to demand it
 	/*FGameProjectGenerationModule::Get().RegisterTemplateCategory(

Templates/TemplateCategories.ini

@@ -0,0 +1,2 @@
+[/Script/GameProjectGeneration.TemplateCategories]
+  Categories=(Key="USharp", LocalizedDisplayNames=((Language="en", Text="C#")), LocalizedDescriptions=((Language="en", Text="C# (USharp)")), Icon="GameProjectDialog.BlueprintIcon", Image="GameProjectDialog.BlueprintImage", IsMajorCategory=false)