Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake

Code/Framework/AzCore/AzCore/Math/Guid.h

@@ -8,18 +8,21 @@
 #ifndef AZ_CORE_GUID_H
 #define AZ_CORE_GUID_H 1
 
-#ifndef GUID_DEFINED
+#if defined(GUID_DEFINED)
+#define GUID_FORMAT_DATA1 "lX"
+#else
 #define GUID_DEFINED
 
 #include <AzCore/std/containers/array.h>
 
 struct _GUID {
-    uint32_t       Data1;
+    uint32_t  Data1;
     unsigned short Data2;
     unsigned short Data3;
     AZStd::array<unsigned char,8> Data4;
 };
 using GUID = _GUID;
+#define GUID_FORMAT_DATA1 "X"
 #endif // GUID_DEFINED
 
 #if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_

Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp

@@ -145,7 +145,7 @@ namespace AZ
 
         char message[g_maxMessageLength];
         Debug::Trace::Instance().Output(nullptr, "==================================================================\n");
-        azsnprintf(message, g_maxMessageLength, "Exception : 0x%X - '%s' [%p]\n", ExceptionInfo->ExceptionRecord->ExceptionCode, GetExeptionName(ExceptionInfo->ExceptionRecord->ExceptionCode), ExceptionInfo->ExceptionRecord->ExceptionAddress);
+        azsnprintf(message, g_maxMessageLength, "Exception : 0x%lX - '%s' [%p]\n", ExceptionInfo->ExceptionRecord->ExceptionCode, GetExeptionName(ExceptionInfo->ExceptionRecord->ExceptionCode), ExceptionInfo->ExceptionRecord->ExceptionAddress);
         Debug::Trace::Instance().Output(nullptr, message);
 
         EBUS_EVENT(Debug::TraceMessageDrillerBus, OnException, message);

Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp

@@ -478,7 +478,7 @@ namespace AZ {
                 DWORD displacement;
                 if (g_SymGetLineFromAddr64(g_currentProcess, pc, &displacement, &line) && line.FileName[0] != 0)
                 {
-                    azsnprintf(textLine, textLineSize, "%s (%d) : ", line.FileName, line.LineNumber);
+                    azsnprintf(textLine, textLineSize, "%s (%ld) : ", line.FileName, line.LineNumber);
                 }
                 else
                 {

Code/Framework/AzCore/Platform/Windows/AzCore/IO/Streamer/StreamerConfiguration_Windows.cpp

@@ -14,6 +14,9 @@
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/StringFunc/StringFunc.h>
+
+// https://developercommunity.visualstudio.com/t/windows-sdk-100177630-pragma-push-pop-mismatch-in/386142
+#define _NTDDSCM_H_
 #include <winioctl.h>
 
 namespace AZ::IO

Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h

@@ -34,7 +34,6 @@
 ////#define NOMB              //- MB_* and MessageBox()
 //#define NOMEMMGR          //- GMEM_*, LMEM_*, GHND, LHND, associated routines
 //#define NOMETAFILE        //- typedef METAFILEPICT
-////#define NOMINMAX          //- Macros min(a,b) and max(a,b)
 //#define NOMSG             //- typedef MSG and associated routines
 //#define NOOPENFILE        //- OpenFile(), OemToAnsi, AnsiToOem, and OF_*
 //#define NOSCROLL          //- SB_* and scrolling routines
@@ -50,27 +49,24 @@
 //#define NODEFERWINDOWPOS  //- DeferWindowPos routines
 //#define NOMCX             //- Modem Configuration Extensions
 
-//  //declare intrinsics to make sure we get the inline intrinsic versions and not a function call
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0602)
-#   undef _WIN32_WINNT
-#   define _WIN32_WINNT 0x0602   // Windows Server 2012 and later
+    #undef _WIN32_WINNT
+    #define _WIN32_WINNT 0x0602   // Windows Server 2012 and later
 #endif
-#ifdef NOMINMAX
-#   include <WinSock2.h>
-#   include <windows.h>
-#else
-#   define NOMINMAX
-#       include <WinSock2.h>
-#       include <windows.h>
-#   undef NOMINMAX
+#if !defined(NOMINMAX)
+    #define NOMINMAX    // - Dont define Macros min(a,b) and max(a,b)
 #endif
+
+#include <WinSock2.h>
+#include <windows.h>
+
 // Undef common function names that Windows.h defines
 #if defined(SetJob)
-#undef SetJob
+    #undef SetJob
 #endif
 #if defined(GetObject)
-#undef GetObject
+    #undef GetObject
 #endif
 #if defined(GetCommandLine)
-#undef GetCommandLine
+    #undef GetCommandLine
 #endif

Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp

@@ -70,7 +70,7 @@
 #include <QtWidgets/QMessageBox>
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QFileInfo::d_ptr': class 'QSharedDataPointer<QFileInfoPrivate>' needs to have dll-interface to be used by clients of class 'QFileInfo'
 #include <QDir>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>

Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp

@@ -48,7 +48,7 @@
 
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QFileInfo::d_ptr': class 'QSharedDataPointer<QFileInfoPrivate>' needs to have dll-interface to be used by clients of class 'QFileInfo'
 #include <QFileInfo>
-AZ_POP_DISABLE_OVERRIDE_WARNING
+AZ_POP_DISABLE_WARNING
 #include <QSharedMemory>
 #include <QStandardPaths>
 #include <QtWidgets/QApplication>

Code/Framework/GridMate/Tests/Carrier.cpp

@@ -1707,7 +1707,7 @@ TEST_F(GridMateCarrierTestFixture, Test_GetSocketErrorString)
     static constexpr char posixErrorWouldBlockPosixErrStr[] = "Resource temporarily unavailable";
     azsnprintf(expectedBuffer.data(), expectedBuffer.size()-1 , "%s", posixErrorWouldBlockPosixErrStr);
 #else
-    azsnprintf(expectedBuffer.data(), expectedBuffer.size()-1 , "%d", AZ_EWOULDBLOCK);
+    azsnprintf(expectedBuffer.data(), expectedBuffer.size()-1 , "%ld", AZ_EWOULDBLOCK);
 #endif // !AZ_TRAIT_USE_POSIX_STRERROR_R
     EXPECT_STREQ(expectedBuffer.data(), socketErrorString);
     EXPECT_STREQ(expectedBuffer.data(), buffer.data());