Merge pull request #1155 from EOS-Contrib/1.17.0-HF-Test-Branch

Update EOS 1.17.0-HF

Author: JessTello

Assets/Plugins/Linux/libEOSSDK-Linux-Shipping.so

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f93accfc264dfcf533de33ec7561acaaeb64f489e4143a60d07b4b3a390a272d
-size 28487160
+oid sha256:5d06b940d1d67736db2df3ce81520424b55b1fc0924bfc2f88ef7c06dc3c8a5c
+size 28493432

Assets/Plugins/Windows/x64/EOSSDK-Win64-Shipping.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0591a96e7daa4a1031fff1fc1ff4332285e1d38d9676c33ab32d9da2ff8f765
-size 18266584
+oid sha256:47261706ef55eca3df8ff2fef22937c77c7e1cc8e98f3171a8562c47005d781b
+size 18235920

Assets/Plugins/Windows/x86/EOSSDK-Win32-Shipping.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc3750de00a87cdbea01285ba3c4ab46cdc92dbea134638f5de6982bad61a092
-size 14011864
+oid sha256:bfb79a75e72454b68f5d546e833936cb4c74804d67f58e1af232a49a425aa697
+size 14016528

Assets/Plugins/macOS/libEOSSDK-Mac-Shipping.dylib

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:833afa39d22dd170bcb4c0fe9774f315d62b4bf9c7682fa5a68a3f9bf6e7b75e
-size 45918384
+oid sha256:efd868245d2a7c10b3d31433e52669d976bd4d7f83cf67c527681d6a836a0d45
+size 44212608

com.playeveryware.eos/CHANGELOG.md

@@ -2,6 +2,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.1] - 2025-02-14
+
+### Changed
+- update to EOS SDK 1.17.0- HF
+
+## [3.3.6] - 2025-02-03
 ## [4.0.0] - 2025-02-14
 
 ### Changed

com.playeveryware.eos/Runtime/Core/EOSPackageInfo.cs

@@ -33,7 +33,7 @@ public static class EOSPackageInfo
          * not involve editing source code files.
          */
 
-        public const string Version = "4.0.0";
+        public const string Version = "4.0.1";
 
         public const string PackageName = "com.playeveryware.eos";
     }

com.playeveryware.eos/Runtime/EOS_SDK/Core/Config.cs

@@ -46,65 +46,45 @@
 
 namespace Epic.OnlineServices
 {
-	// PEW: Start Modify
-	// The partial attribute (added by PlayEveryWare) is the least intrusive
-	// means by which the following class can be expanded to support additional
-	// platforms. By making the class partial, supplementary partial
-	// class definition files can be added to the codebase that will expand
-	// platform support.
-	public static partial class Config
+	public static class Config
 	{
-        // This conditional (added by PlayEveryWare) is here (in conjunction with 
-        // the class it is contained within being marked as "partial") so that 
-        // other platforms can be supported by adding to this code-base another 
-        // part of the partial class that sets the LibraryName differently 
-        // depending on the presence of other scripting defines that indicate 
-        // available functionality on other platforms.
-#if EOS_PLATFORM_WINDOWS_32 || EOS_PLATFORM_WINDOWS_64 || EOS_PLATFORM_OSX || EOS_PLATFORM_LINUX || EOS_PLATFORM_IOS || EOS_PLATFORM_ANDROID
 		public const string LibraryName =
-#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
+		#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
 			"EOSSDK-Win32-Shipping"
-#elif EOS_PLATFORM_WINDOWS_32
+		#elif EOS_PLATFORM_WINDOWS_32
 			"EOSSDK-Win32-Shipping.dll"
 
-#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
+		#elif EOS_PLATFORM_WINDOWS_64 && EOS_UNITY
 			"EOSSDK-Win64-Shipping"
-#elif EOS_PLATFORM_WINDOWS_64
+		#elif EOS_PLATFORM_WINDOWS_64
 			"EOSSDK-Win64-Shipping.dll"
 
-#elif EOS_PLATFORM_OSX && EOS_UNITY
+		#elif EOS_PLATFORM_OSX && EOS_UNITY
 			"libEOSSDK-Mac-Shipping"
-#elif EOS_PLATFORM_OSX
+		#elif EOS_PLATFORM_OSX
 			"libEOSSDK-Mac-Shipping.dylib"
 
-#elif EOS_PLATFORM_LINUX && EOS_UNITY
+		#elif EOS_PLATFORM_LINUX && EOS_UNITY
 			"libEOSSDK-Linux-Shipping"
-#elif EOS_PLATFORM_LINUX
+		#elif EOS_PLATFORM_LINUX
 			"libEOSSDK-Linux-Shipping.so"
 
-#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
+		#elif EOS_PLATFORM_IOS && EOS_UNITY && EOS_EDITOR
 			"EOSSDK"
-#elif EOS_PLATFORM_IOS
+		#elif EOS_PLATFORM_IOS
 			"EOSSDK.framework/EOSSDK"
 
-#elif EOS_PLATFORM_ANDROID
+		#elif EOS_PLATFORM_ANDROID
 			"EOSSDK"
 
-#else
-#error Unable to determine the name of the EOSSDK library. Ensure you have set the correct EOS compilation symbol for the current platform, such as EOS_PLATFORM_WINDOWS_32 or EOS_PLATFORM_WINDOWS_64, so that the correct EOSSDK library can be targeted.
+		#else
+			#error Unable to determine the name of the EOSSDK library. Ensure you have set the correct EOS compilation symbol for the current platform, such as EOS_PLATFORM_WINDOWS_32 or EOS_PLATFORM_WINDOWS_64, so that the correct EOSSDK library can be targeted.
 			"EOSSDK-UnknownPlatform-Shipping"
 
-#endif
+		#endif
 		;
-#elif EXTERNAL_TO_UNITY
-#if PLATFORM_64
-        public const string LibraryName = "EOSSDK-Win64-Shipping.dll";
-#else
-        public const string LibraryName = "EOSSDK-Win32-Shipping.dll";
-#endif
-#endif
-        // PEW: End modify
-        public const CallingConvention LibraryCallingConvention =
+		
+		public const CallingConvention LibraryCallingConvention =
 		#if EOS_PLATFORM_WINDOWS_32
 			CallingConvention.StdCall
 		#else

com.playeveryware.eos/Runtime/EOS_SDK/Core/Helper.cs

@@ -630,16 +630,6 @@ private static IntPtr AddPinnedBuffer(Utf8String str)
 			return AddPinnedBuffer(str.Bytes, 0);
 		}
 
-        // PEW: Start Modify
-        // This function is added because this file is included in a class
-        // library with a lower supported version of C# that does not allow a
-        // byte array to be automatically converted into an ArraySegment
-        internal static IntPtr AddPinnedBuffer(byte[] array)
-        {
-            return array == null ? IntPtr.Zero : AddPinnedBuffer(new ArraySegment<byte>(array));
-        }
-        // PEW: End Modify
-
 		internal static IntPtr AddPinnedBuffer(ArraySegment<byte> array)
 		{
 			if (array == null)

com.playeveryware.eos/Runtime/EOS_SDK/Generated/Bindings.cs

@@ -2,59 +2,62 @@
 // This file is automatically generated. Changes to this file may be overwritten.
 
 #if DEBUG
-	#define EOS_DEBUG
+#define EOS_DEBUG
 #endif
 
 #if UNITY_EDITOR
-	#define EOS_EDITOR
+#define EOS_EDITOR
 #endif
 
 #if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID
-	#define EOS_UNITY
+#define EOS_UNITY
 #endif
 
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS
-	#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
-		#define EOS_PLATFORM_WINDOWS_64
-	#else
-		#define EOS_PLATFORM_WINDOWS_32
-	#endif
+#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
+#define EOS_PLATFORM_WINDOWS_64
+#else
+#define EOS_PLATFORM_WINDOWS_32
+#endif
 
 #elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
-	#define EOS_PLATFORM_OSX
+#define EOS_PLATFORM_OSX
+
+#elif UNITY_EDITOR_OSX
+#define EOS_PLATFORM_OSX_INEDITOR
 
 #elif UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX
-	#define EOS_PLATFORM_LINUX
+#define EOS_PLATFORM_LINUX
 
 #elif UNITY_PS4
-	#define EOS_PLATFORM_PS4
+#define EOS_PLATFORM_PS4
 
 #elif UNITY_XBOXONE
-	#define EOS_PLATFORM_XBOXONE
+#define EOS_PLATFORM_XBOXONE
 
 #elif UNITY_SWITCH
-	#define EOS_PLATFORM_SWITCH
+#define EOS_PLATFORM_SWITCH
 
 #elif UNITY_IOS || __IOS__
-	#define EOS_PLATFORM_IOS
+#define EOS_PLATFORM_IOS
 
 #elif UNITY_ANDROID || __ANDROID__
-	#define EOS_PLATFORM_ANDROID
+#define EOS_PLATFORM_ANDROID
 
 #endif
 
 #if EOS_EDITOR
-	#define EOS_DYNAMIC_BINDINGS
+#define EOS_DYNAMIC_BINDINGS
 #endif
 
 #if EOS_DYNAMIC_BINDINGS
-	#if EOS_PLATFORM_WINDOWS_32
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE3
-	#elif EOS_PLATFORM_OSX
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE2
-	#else
-		#define EOS_DYNAMIC_BINDINGS_NAME_TYPE1
-	#endif
+#if EOS_PLATFORM_WINDOWS_32
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE3
+#elif EOS_PLATFORM_OSX
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE2
+#else
+#define EOS_DYNAMIC_BINDINGS_NAME_TYPE1
+#endif
 #endif
 
 using System;
@@ -2141,9 +2144,11 @@ public static void Hook<TLibraryHandle>(TLibraryHandle libraryHandle, Func<TLibr
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedName);
 			EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChanged = (EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedDelegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_AntiCheatClient_RemoveNotifyPeerAuthStatusChangedDelegate));
 
+#if EOS_PLATFORM_OSX_INEDITOR
 			functionPointer = getFunctionPointer(libraryHandle, EOS_AntiCheatClient_Reserved01Name);
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_Reserved01Name);
 			EOS_AntiCheatClient_Reserved01 = (EOS_AntiCheatClient_Reserved01Delegate)Marshal.GetDelegateForFunctionPointer(functionPointer, typeof(EOS_AntiCheatClient_Reserved01Delegate));
+#endif
 
 			functionPointer = getFunctionPointer(libraryHandle, EOS_AntiCheatClient_UnprotectMessageName);
 			if (functionPointer == System.IntPtr.Zero) throw new DynamicBindingException(EOS_AntiCheatClient_UnprotectMessageName);
@@ -4468,10 +4473,10 @@ public static void Hook<TLibraryHandle>(TLibraryHandle libraryHandle, Func<TLibr
 #endif
 
 #if EOS_DYNAMIC_BINDINGS
-		/// <summary>
-		/// Unhooks the dynamic SDK API bindings. EOS_DYNAMIC_BINDINGS or EOS_EDITOR must be set.
-		/// </summary>
-		public static void Unhook()
+			/// <summary>
+			/// Unhooks the dynamic SDK API bindings. EOS_DYNAMIC_BINDINGS or EOS_EDITOR must be set.
+			/// </summary>
+			public static void Unhook()
 		{
 			EOS_Achievements_AddNotifyAchievementsUnlocked = null;
 			EOS_Achievements_AddNotifyAchievementsUnlockedV2 = null;

com.playeveryware.eos/Runtime/EOS_SDK/Generated/ContinuanceToken.cs

@@ -36,21 +36,7 @@ public ContinuanceToken(System.IntPtr innerHandle) : base(innerHandle)
 		public Result ToString(out Utf8String outBuffer)
 		{
 			int inOutBufferLength = 1024;
-
-			// PEW: Start modify
-			// NOTES:
-			// 
-			// The changes below are implemented temporarily by PEW to correct
-			// an issue where the inOutBufferLength is not properly determined.
-			// 
-			// Until this is resolved from Epic - these changes will need to
-			// be maintained after the import of a new version of the EOS SDK.
-
-			// Call the EOS_ContinuanceToken_ToString function will a null buffer address to determine the correct buffer length.
-			// Discard the result of this call because it is not relevant. 
-			_ = Bindings.EOS_ContinuanceToken_ToString(InnerHandle, System.IntPtr.Zero, ref inOutBufferLength);
 			System.IntPtr outBufferAddress = Helper.AddAllocation(inOutBufferLength);
-  			// PEW: End modify
 
 			var funcResult = Bindings.EOS_ContinuanceToken_ToString(InnerHandle, outBufferAddress, ref inOutBufferLength);