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

2 files changed, 6 insertions, 6 deletions

diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index 4356a8f7f4..b869a0184f 100644
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -8889,10 +8889,10 @@ CordbProcess::GetVersion(COR_VERSION* pVersion)
     //
     // Because we require a matching version of mscordbi.dll to debug a certain version of the runtime,
     // we can just use constants found in this particular mscordbi.dll to determine the version of the left side.
-    pVersion->dwMajor = VER_MAJORVERSION;
-    pVersion->dwMinor = VER_MINORVERSION;
-    pVersion->dwBuild = VER_PRODUCTBUILD;
-    pVersion->dwSubBuild = VER_PRODUCTBUILD_QFE;
+    pVersion->dwMajor = CLR_MAJOR_VERSION;
+    pVersion->dwMinor = CLR_MINOR_VERSION;
+    pVersion->dwBuild = CLR_BUILD_VERSION;
+    pVersion->dwSubBuild = CLR_BUILD_VERSION_QFE;
 
     return S_OK;
 }
diff --git a/src/debug/ee/rcthread.cpp b/src/debug/ee/rcthread.cpp
index f40fe16544..f74093b17f 100644
--- a/src/debug/ee/rcthread.cpp
+++ b/src/debug/ee/rcthread.cpp
@@ -286,8 +286,8 @@ HRESULT DebuggerIPCControlBlock::Init(
     memset( this, 0, sizeof( DebuggerIPCControlBlock) );
 
     // Setup version checking info.
-    m_verMajor = VER_PRODUCTBUILD;
-    m_verMinor = VER_PRODUCTBUILD_QFE;
+    m_verMajor = CLR_BUILD_VERSION;
+    m_verMinor = CLR_BUILD_VERSION_QFE;
 
 #ifdef _DEBUG
     m_checkedBuild = true;