Delete FEATURE_WINDOWSPHONE (#24718)

3 files changed, 3 insertions, 46 deletions

diff --git a/src/md/compiler/assemblymd.cpp b/src/md/compiler/assemblymd.cpp
index 8c0a22af4d..124180b44b 100644
--- a/src/md/compiler/assemblymd.cpp
+++ b/src/md/compiler/assemblymd.cpp
@@ -74,32 +74,12 @@ STDMETHODIMP RegMeta::GetAssemblyProps(       // S_OK or error.
     {
         *pdwAssemblyFlags = pMiniMd->getFlagsOfAssembly(pRecord);
 
-#ifdef FEATURE_WINDOWSPHONE
         // Turn on the afPublicKey if PublicKey blob is not empty
         DWORD cbPublicKey;
         const BYTE *pbPublicKey;
         IfFailGo(pMiniMd->getPublicKeyOfAssembly(pRecord, &pbPublicKey, &cbPublicKey));
         if (cbPublicKey != 0)
             *pdwAssemblyFlags |= afPublicKey;
-#else
-        if (ppbPublicKey)
-        {
-            if (pcbPublicKey && *pcbPublicKey)
-                *pdwAssemblyFlags |= afPublicKey;
-        }
-        else
-        {
-#ifdef _DEBUG
-            // Assert that afPublicKey is set if PublicKey blob is not empty
-            DWORD cbPublicKey;
-            const BYTE *pbPublicKey;
-            IfFailGo(pMiniMd->getPublicKeyOfAssembly(pRecord, &pbPublicKey, &cbPublicKey));
-            bool hasPublicKey = cbPublicKey != 0;
-            bool hasPublicKeyFlag = ( *pdwAssemblyFlags & afPublicKey ) != 0;
-            _ASSERTE( hasPublicKey == hasPublicKeyFlag );
-#endif
-        }
-#endif // FEATURE_WINDOWSPHONE
     }
     // This call has to be last to set 'hr', so CLDB_S_TRUNCATION is not rewritten with S_OK
     if (szName || pchName)
diff --git a/src/md/runtime/mdinternalro.cpp b/src/md/runtime/mdinternalro.cpp
index 99a1a0d9c8..64a4054d28 100644
--- a/src/md/runtime/mdinternalro.cpp
+++ b/src/md/runtime/mdinternalro.cpp
@@ -3019,33 +3019,12 @@ HRESULT MDInternalRO::GetAssemblyProps(
     {
         *pdwAssemblyFlags = m_LiteWeightStgdb.m_MiniMd.getFlagsOfAssembly(pRecord);
 
-#ifdef FEATURE_WINDOWSPHONE
         // Turn on the afPublicKey if PublicKey blob is not empty
         DWORD cbPublicKey;
         const BYTE *pbPublicKey;
         IfFailRet(m_LiteWeightStgdb.m_MiniMd.getPublicKeyOfAssembly(pRecord, &pbPublicKey, &cbPublicKey));
         if (cbPublicKey != 0)
             *pdwAssemblyFlags |= afPublicKey;
-#else
-        if (ppbPublicKey)
-        {
-            if (pcbPublicKey && *pcbPublicKey)
-                *pdwAssemblyFlags |= afPublicKey;
-        }
-        else
-        {
-#ifdef _DEBUG
-            // Assert that afPublicKey is set if PublicKey blob is not empty
-            DWORD cbPublicKey;
-            const BYTE *pPublicKey;
-            IfFailRet(m_LiteWeightStgdb.m_MiniMd.getPublicKeyOfAssembly(pRecord, &pPublicKey, &cbPublicKey));
-            bool hasPublicKey = cbPublicKey != 0;
-            bool hasPublicKeyFlag = ( *pdwAssemblyFlags & afPublicKey ) != 0;
-            if(REGUTIL::GetConfigDWORD_DontUse_(CLRConfig::INTERNAL_AssertOnBadImageFormat, 0))
-                _ASSERTE( hasPublicKey == hasPublicKeyFlag );
-#endif
-        }
-#endif // FEATURE_WINDOWSPHONE
     }
 
     return S_OK;
diff --git a/src/md/winmd/inc/adapter.h b/src/md/winmd/inc/adapter.h
index cc422017b6..a9f9a57141 100644
--- a/src/md/winmd/inc/adapter.h
+++ b/src/md/winmd/inc/adapter.h
@@ -263,18 +263,16 @@ public:
                     else if (*pcbPublicKeyOrToken == sizeof(s_pbContractPublicKey))
                         *ppbPublicKeyOrToken = s_pbContractPublicKey;
                 }
-#ifdef FEATURE_WINDOWSPHONE
-                // System.Runtime.WindowsRuntime uses the ECMA key on Windows Phone.
-                // The WinRT adapter's policy of using mscorlib's assembly references for all the additional
-                // assembly references doesn't work here since mscorlib uses the Silverlight Platform key.
                 else 
                 {
+                    // System.Runtime.WindowsRuntime uses the ECMA key.
+                    // The WinRT adapter's policy of using mscorlib's assembly references for all the additional
+                    // assembly references doesn't work here since mscorlib uses the Silverlight Platform key.
                     if (*pcbPublicKeyOrToken == sizeof(g_rbNeutralPublicKeyToken))
                         *ppbPublicKeyOrToken = g_rbNeutralPublicKeyToken;
                     else if (*pcbPublicKeyOrToken == sizeof(g_rbNeutralPublicKey))
                         *ppbPublicKeyOrToken = g_rbNeutralPublicKey;
                 }
-#endif
             }
 
             if (pszName != nullptr)