Rename conflicting definitions VER_MAJOR/MINORVERSION macros (#17364)

* Rename conflicting definitions of VER_MAJOR/MINORVERSION

These macros are defined by Windows SDK. They were overload to mean CLR version
that was causing interesting redefinition issues.

* Delete workaround for redefined Windows SDK macros

* Delete ProjectN version

* Delete dead code

6 files changed, 20 insertions, 51 deletions

diff --git a/src/vm/domainfile.cpp b/src/vm/domainfile.cpp
index 410884531e..c8bbcf7241 100644
--- a/src/vm/domainfile.cpp
+++ b/src/vm/domainfile.cpp
@@ -2292,10 +2292,10 @@ void DomainAssembly::GetCurrentVersionInfo(CORCOMPILE_VERSION_INFO *pNativeVersi
 
     pNativeVersionInfo->wMachine = IMAGE_FILE_MACHINE_NATIVE_NI;
 
-    pNativeVersionInfo->wVersionMajor = VER_MAJORVERSION;
-    pNativeVersionInfo->wVersionMinor = VER_MINORVERSION;
-    pNativeVersionInfo->wVersionBuildNumber = VER_PRODUCTBUILD;
-    pNativeVersionInfo->wVersionPrivateBuildNumber = VER_PRODUCTBUILD_QFE;
+    pNativeVersionInfo->wVersionMajor = CLR_MAJOR_VERSION;
+    pNativeVersionInfo->wVersionMinor = CLR_MINOR_VERSION;
+    pNativeVersionInfo->wVersionBuildNumber = CLR_BUILD_VERSION;
+    pNativeVersionInfo->wVersionPrivateBuildNumber = CLR_BUILD_VERSION_QFE;
 
     GetNGenCpuInfo(&pNativeVersionInfo->cpuInfo);
 
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp
index 7da80608d7..3de630f12a 100644
--- a/src/vm/eventtrace.cpp
+++ b/src/vm/eventtrace.cpp
@@ -4949,10 +4949,10 @@ VOID ETW::InfoLog::RuntimeInformation(INT32 type)
             Sku = ETW::InfoLog::InfoStructs::CoreCLR;
         
             //version info for clr.dll
-            USHORT vmMajorVersion = VER_MAJORVERSION;
-            USHORT vmMinorVersion = VER_MINORVERSION;
-            USHORT vmBuildVersion = VER_PRODUCTBUILD;
-            USHORT vmQfeVersion = VER_PRODUCTBUILD_QFE;
+            USHORT vmMajorVersion = CLR_MAJOR_VERSION;
+            USHORT vmMinorVersion = CLR_MINOR_VERSION;
+            USHORT vmBuildVersion = CLR_BUILD_VERSION;
+            USHORT vmQfeVersion = CLR_BUILD_VERSION_QFE;
 
             //version info for mscorlib.dll
             USHORT bclMajorVersion = VER_ASSEMBLYMAJORVERSION;
diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp
index 9cb1296204..e5c024e89c 100644
--- a/src/vm/excep.cpp
+++ b/src/vm/excep.cpp
@@ -107,37 +107,6 @@ BOOL IsExceptionFromManagedCode(const EXCEPTION_RECORD * pExceptionRecord)
 
 #ifndef DACCESS_COMPILE
 
-//----------------------------------------------------------------------------
-//
-// IsExceptionFromManagedCodeCallback - a wrapper for IsExceptionFromManagedCode
-//
-// Arguments:
-//    pExceptionRecord - pointer to exception record
-//
-// Return Value:
-//    TRUE or FALSE
-//
-//----------------------------------------------------------------------------
-BOOL __stdcall IsExceptionFromManagedCodeCallback(EXCEPTION_RECORD * pExceptionRecord)
-{
-    CONTRACTL {
-        NOTHROW;
-        GC_NOTRIGGER;
-        SO_TOLERANT;
-        SUPPORTS_DAC;
-        PRECONDITION(CheckPointer(pExceptionRecord));
-    } CONTRACTL_END;
-
-    // If we can't enter the EE, done.
-    if (g_fForbidEnterEE)
-    {
-        return FALSE;
-    }
-
-    return IsExceptionFromManagedCode(pExceptionRecord);
-}
-
-
 #define SZ_UNHANDLED_EXCEPTION W("Unhandled Exception:")
 #define SZ_UNHANDLED_EXCEPTION_CHARLEN ((sizeof(SZ_UNHANDLED_EXCEPTION) / sizeof(WCHAR)))
 
diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp
index 58540fe605..77c99f6191 100644
--- a/src/vm/pefile.cpp
+++ b/src/vm/pefile.cpp
@@ -1261,10 +1261,10 @@ BOOL RuntimeVerifyNativeImageVersion(const CORCOMPILE_VERSION_INFO *info, Loggab
     // Check that the EE version numbers are the same.
     //
  
-    if (info->wVersionMajor != VER_MAJORVERSION
-        || info->wVersionMinor != VER_MINORVERSION
-        || info->wVersionBuildNumber != VER_PRODUCTBUILD
-        || info->wVersionPrivateBuildNumber != VER_PRODUCTBUILD_QFE)
+    if (info->wVersionMajor != CLR_MAJOR_VERSION
+        || info->wVersionMinor != CLR_MINOR_VERSION
+        || info->wVersionBuildNumber != CLR_BUILD_VERSION
+        || info->wVersionPrivateBuildNumber != CLR_BUILD_VERSION_QFE)
     {
         RuntimeVerifyLog(LL_ERROR, pLogAsm, W("CLR version recorded in native image doesn't match the current CLR."));
         return FALSE;
diff --git a/src/vm/profattach.cpp b/src/vm/profattach.cpp
index ed83201bf9..ff56f38405 100644
--- a/src/vm/profattach.cpp
+++ b/src/vm/profattach.cpp
@@ -41,10 +41,10 @@ BOOL ProfilingAPIAttachDetach::s_fInitializeCalled = FALSE;
 // Both the trigger (via code:ProfilingAPIAttachClient) and the target profilee (via
 // code:ProfilingAPIAttachServer) use this constant to identify their own version.
 const VersionBlock ProfilingAPIAttachDetach::kCurrentProcessVersion(
-    VER_MAJORVERSION,
-    VER_MINORVERSION,
-    VER_PRODUCTBUILD,
-    VER_PRODUCTBUILD_QFE);
+    CLR_MAJOR_VERSION,
+    CLR_MINOR_VERSION,
+    CLR_BUILD_VERSION,
+    CLR_BUILD_VERSION_QFE);
 
 // Note that the following two VersionBlocks are initialized with static numerals rather
 // than using the VER_* preproc defines, as we don't want these VersionBlocks to change
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp
index 04330a26e0..2830089fee 100644
--- a/src/vm/proftoeeinterfaceimpl.cpp
+++ b/src/vm/proftoeeinterfaceimpl.cpp
@@ -8849,16 +8849,16 @@ HRESULT ProfToEEInterfaceImpl::GetRuntimeInformation(USHORT * pClrInstanceId,
     }
 
     if (pMajorVersion != NULL)
-        *pMajorVersion = VER_MAJORVERSION;
+        *pMajorVersion = CLR_MAJOR_VERSION;
 
     if (pMinorVersion != NULL)
-        *pMinorVersion = VER_MINORVERSION;
+        *pMinorVersion = CLR_MINOR_VERSION;
 
     if (pBuildNumber != NULL)
-        *pBuildNumber = VER_PRODUCTBUILD;
+        *pBuildNumber = CLR_BUILD_VERSION;
 
     if (pQFEVersion != NULL)
-        *pQFEVersion = VER_PRODUCTBUILD_QFE;
+        *pQFEVersion = CLR_BUILD_VERSION_QFE;
 
     return S_OK;
 }