Merge branch 'master' into sid-dahiya/PGImprovements

lib/include/public/Version.hpp

@@ -6,34 +6,19 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.5.57.1"
-#define BUILD_VERSION 3,5,57,1
+#define BUILD_VERSION_STR "3.5.60.1"
+#define BUILD_VERSION 3,5,60,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
+#include <ctmacros.hpp>
 #include <stdint.h>
 
-#ifdef HAVE_MAT_SHORT_NS
-#define MAT_NS_BEGIN  MAT
-#define MAT_NS_END
-#define PAL_NS_BEGIN  PAL
-#define PAL_NS_END
-#else
-#define MAT_NS_BEGIN  Microsoft { namespace Applications { namespace Events
-#define MAT_NS_END    }}
-#define MAT           ::Microsoft::Applications::Events
-#define PAL_NS_BEGIN  Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction
-#define PAL_NS_END    }}}
-#define PAL           ::Microsoft::Applications::Events::PlatformAbstraction
-#endif
-
-#define MAT_v1        ::Microsoft::Applications::Telemetry
-
 namespace MAT_NS_BEGIN {
 
 uint64_t const Version =
     ((uint64_t)3 << 48) |
     ((uint64_t)5 << 32) |
-    ((uint64_t)57 << 16) |
+    ((uint64_t)60 << 16) |
     ((uint64_t)1);
 
 } MAT_NS_END
@@ -43,3 +28,4 @@ namespace PAL_NS_BEGIN { } PAL_NS_END
 #endif // RESOURCE_COMPILER_INVOKED
 #endif
 
+

lib/include/public/Version.hpp.template

@@ -10,24 +10,9 @@
 #define BUILD_VERSION @BUILD_VERSION_MAJOR@,@BUILD_VERSION_MINOR@,@BUILD_VERSION_PATCH@,@BUILD_NUMBER@
 
 #ifndef RESOURCE_COMPILER_INVOKED
+#include <ctmacros.hpp>
 #include <stdint.h>
 
-#ifdef HAVE_MAT_SHORT_NS
-#define MAT_NS_BEGIN  MAT
-#define MAT_NS_END
-#define PAL_NS_BEGIN  PAL
-#define PAL_NS_END
-#else
-#define MAT_NS_BEGIN  Microsoft { namespace Applications { namespace Events
-#define MAT_NS_END    }}
-#define MAT           ::Microsoft::Applications::Events
-#define PAL_NS_BEGIN  Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction
-#define PAL_NS_END    }}}
-#define PAL           ::Microsoft::Applications::Events::PlatformAbstraction
-#endif
-
-#define MAT_v1        ::Microsoft::Applications::Telemetry
-
 namespace MAT_NS_BEGIN {
 
 uint64_t const Version =
@@ -41,5 +26,4 @@ uint64_t const Version =
 namespace PAL_NS_BEGIN { } PAL_NS_END
 
 #endif // RESOURCE_COMPILER_INVOKED
-#endif
-
+#endif