Delete FEATURE_APPX (dotnet#38112)

sean4492 · Jun 19, 2020 · 8bd04e0 · 8bd04e0
1 parent f555e6a
commit 8bd04e0
Show file tree

Hide file tree

Showing 41 changed files with 29 additions and 777 deletions.
diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props
@@ -31,7 +31,6 @@
         <FeatureCominterop>true</FeatureCominterop>
         <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation>
         <FeatureCominteropApartmentSupport>true</FeatureCominteropApartmentSupport>
-        <FeatureAppX>true</FeatureAppX>
         <FeatureWin32Registry>true</FeatureWin32Registry>
         <FeatureProfAttach>true</FeatureProfAttach>
         <FeaturePortableShuffleThunks Condition="'$(Platform)' != 'x86'">true</FeaturePortableShuffleThunks>
@@ -45,7 +44,6 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <DefineConstants Condition="'$(FeatureAppX)' == 'true'">$(DefineConstants);FEATURE_APPX</DefineConstants>
         <DefineConstants Condition="'$(FeatureArrayStubAsIL)' == 'true'">$(DefineConstants);FEATURE_ARRAYSTUB_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureMulticastStubAsIL)' == 'true'">$(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL</DefineConstants>
         <DefineConstants Condition="'$(FeatureInstantiatingStubAsIL)' == 'true'">$(DefineConstants);FEATURE_INSTANTIATINGSTUB_AS_IL</DefineConstants>

diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
@@ -72,7 +72,6 @@ endif(CLR_CMAKE_TARGET_WIN32)
 
 # Features - please keep them alphabetically sorted
 if(CLR_CMAKE_TARGET_WIN32)
-  add_definitions(-DFEATURE_APPX)
   if(NOT CLR_CMAKE_TARGET_ARCH_I386)
     add_definitions(-DFEATURE_ARRAYSTUB_AS_IL)
     add_definitions(-DFEATURE_MULTICASTSTUB_AS_IL)

diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -324,7 +324,6 @@
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
       <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
     </Compile>
-    <Compile Include="$(BclSourcesRoot)\System\ApplicationModel.Windows.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Threading\ClrThreadPoolBoundHandle.Windows.cs" />
   </ItemGroup>
   <!-- Include additional sources shared files in the compilation -->

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/ApplicationModel.Windows.cs b/src/coreclr/src/System.Private.CoreLib/src/System/ApplicationModel.Windows.cs
diff --git a/src/coreclr/src/debug/daccess/enummem.cpp b/src/coreclr/src/debug/daccess/enummem.cpp
@@ -21,10 +21,6 @@
 #include "binder.h"
 #include "win32threadpool.h"
 
-#ifdef FEATURE_APPX
-#include "appxutil.h"
-#endif // FEATURE_APPX
-
 extern HRESULT GetDacTableAddress(ICorDebugDataTarget* dataTarget, ULONG64 baseAddress, PULONG64 dacTableAddress);
 
 #if defined(DAC_MEASURE_PERF)
@@ -487,13 +483,9 @@ HRESULT ClrDataAccess::DumpManagedExcepObject(CLRDataEnumMemoryFlags flags, OBJE
     // dump the exception's stack trace field
     DumpManagedStackTraceStringObject(flags, exceptRef->GetStackTraceString());
 
-    // dump the exception's remote stack trace field only if we are not generating a triage dump, or
-    // if we are generating a triage dump of an AppX process, or the exception type does not override
+    // dump the exception's remote stack trace field only if we are not generating a triage dump, or the exception type does not override
     // the StackTrace getter (see Exception.InternalPreserveStackTrace to understand why)
     if (flags != CLRDATA_ENUM_MEM_TRIAGE ||
-#ifdef FEATURE_APPX
-        AppX::DacIsAppXProcess() ||
-#endif // FEATURE_APPX
         !ExceptionTypeOverridesStackTraceGetter(exceptRef->GetGCSafeMethodTable()))
     {
         DumpManagedStackTraceStringObject(flags, exceptRef->GetRemoteStackTraceString());

diff --git a/src/coreclr/src/debug/ee/dactable.cpp b/src/coreclr/src/debug/ee/dactable.cpp
@@ -35,10 +35,6 @@ extern PCODE g_FCDynamicallyAssignedImplementations;
 extern DWORD gThreadTLSIndex;
 extern DWORD gAppDomainTLSIndex;
 
-#ifdef FEATURE_APPX
-extern BOOL g_fAppX;
-#endif // FEATURE_APPX
-
 DLLEXPORT
 DacGlobals g_dacTable;
 

diff --git a/src/coreclr/src/dlls/mscorrc/mscorrc.rc b/src/coreclr/src/dlls/mscorrc/mscorrc.rc
@@ -752,13 +752,6 @@ BEGIN
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_EE_BADMARSHAL_TYPE_ANSIBSTR                   "Marshalling as AnsiBStr is not supported"
-    IDS_EE_BADMARSHAL_TYPE_VBBYVALSTR                 "Marshalling as VBByRefString is not supported"
-    IDS_EE_BADMARSHAL_TYPE_REFERENCECUSTOMMARSHALER   "Custom marshalers are not supported"
-    IDS_EE_BADMARSHAL_TYPE_VARIANTASOBJECT            "Marshalling between VARIANT and System.Object is not supported"
-    IDS_EE_BADMARSHAL_TYPE_ASANYA                     "Marshalling arbitrary types is not supported"
-    IDS_EE_BADMARSHAL_TYPE_IDISPATCH                  "Marshalling as IDispatch is not supported"
-    IDS_EE_ERROR_IDISPATCH                            "IDispatch and IDispatchEx are not supported"
     IDS_EE_ERROR_COM                                  "COM is not supported"
 END
 

diff --git a/src/coreclr/src/dlls/mscorrc/resource.h b/src/coreclr/src/dlls/mscorrc/resource.h
@@ -570,14 +570,6 @@
 #define IDS_EE_NATIVE_COM_WEAKREF_BAD_TYPE           0x262e
 #endif // FEATURE_COMINTEROP
 
-#define IDS_EE_BADMARSHAL_TYPE_ANSIBSTR         0x262f
-#define IDS_EE_BADMARSHAL_TYPE_VBBYVALSTR       0x2630
-#define IDS_EE_BADMARSHAL_TYPE_REFERENCECUSTOMMARSHALER  0x2631
-#define IDS_EE_BADMARSHAL_TYPE_VARIANTASOBJECT  0x2632
-#define IDS_EE_BADMARSHAL_TYPE_ASANYA           0x2633
-#define IDS_EE_BADMARSHAL_TYPE_IDISPATCH        0x2634
-#define IDS_EE_ERROR_IDISPATCH                  0x2635
-
 #define IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT                  0x2636
 #define IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED          0x2637
 #define IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_BINDING_CONTEXT                        0x2638

diff --git a/src/coreclr/src/inc/appxutil.h b/src/coreclr/src/inc/appxutil.h
diff --git a/src/coreclr/src/inc/dacvars.h b/src/coreclr/src/inc/dacvars.h
@@ -135,10 +135,6 @@ DEFINE_DACVAR(ULONG, DWORD, dac__g_TlsIndex, g_TlsIndex)
 
 DEFINE_DACVAR(ULONG, PTR_SString, SString__s_Empty, SString::s_Empty)
 
-#ifdef FEATURE_APPX
-DEFINE_DACVAR(ULONG, BOOL, dac__g_fAppX, ::g_fAppX)
-#endif // FEATURE_APPX
-
 DEFINE_DACVAR(ULONG, INT32, ArrayBase__s_arrayBoundsZero, ArrayBase::s_arrayBoundsZero)
 
 DEFINE_DACVAR(ULONG, BOOL, StackwalkCache__s_Enabled, StackwalkCache::s_Enabled)

diff --git a/src/coreclr/src/inc/holder.h b/src/coreclr/src/inc/holder.h
@@ -85,12 +85,6 @@ struct AutoExpVisibleValue
   private:
     union
     {
-        // Only include a class name here if it is customarily referred to through an abstract interface.
-
-#if defined(FEATURE_APPX)
-        const class AppXBindResultImpl                      *_asAppXBindResultImpl;
-#endif
-
         const void                                          *_pPreventEmptyUnion;
     };
 };

diff --git a/src/coreclr/src/inc/mscorsvc.idl b/src/coreclr/src/inc/mscorsvc.idl
@@ -220,24 +220,6 @@ library mscorsvc
 
     }
 
-#ifdef FEATURE_APPX
-    //*****************************************************************************
-    // ICorSvcAppX contains AppX-related method
-    //*****************************************************************************[
-
-    [
-        object,
-        uuid(5c814791-559e-4f7f-83ce-184a4ccbae24),
-        pointer_default(unique),
-    ]
-    interface ICorSvcAppX : IUnknown
-    {
-        HRESULT SetPackage([in] BSTR pPackageFullName);
-
-        HRESULT SetLocalAppDataDirectory([in] BSTR pLocalAppDataDirectory);
-    }
-#endif
-
     //*****************************************************************************
     // ICorSvcLogger is used to log various messages to the service process
     //*****************************************************************************[

diff --git a/src/coreclr/src/inc/utilcode.h b/src/coreclr/src/inc/utilcode.h
@@ -4924,28 +4924,15 @@ namespace Com
 
 }}
 
-#if defined(FEATURE_APPX) && !defined(DACCESS_COMPILE)
-    // Forward declaration of AppX::IsAppXProcess
-    namespace AppX { bool IsAppXProcess(); }
-
-    // LOAD_WITH_ALTERED_SEARCH_PATH is unsupported in AppX processes.
-    inline DWORD GetLoadWithAlteredSearchPathFlag()
-    {
-        WRAPPER_NO_CONTRACT;
-        return AppX::IsAppXProcess() ? 0 : LOAD_WITH_ALTERED_SEARCH_PATH;
-    }
-#else // FEATURE_APPX && !DACCESS_COMPILE
-    // LOAD_WITH_ALTERED_SEARCH_PATH can be used unconditionally.
-    inline DWORD GetLoadWithAlteredSearchPathFlag()
-    {
-        LIMITED_METHOD_CONTRACT;
-        #ifdef LOAD_WITH_ALTERED_SEARCH_PATH
-            return LOAD_WITH_ALTERED_SEARCH_PATH;
-        #else
-            return 0;
-        #endif
-    }
-#endif // FEATURE_APPX && !DACCESS_COMPILE
+inline DWORD GetLoadWithAlteredSearchPathFlag()
+{
+    LIMITED_METHOD_CONTRACT;
+    #ifdef LOAD_WITH_ALTERED_SEARCH_PATH
+        return LOAD_WITH_ALTERED_SEARCH_PATH;
+    #else
+        return 0;
+    #endif
+}
 
 // clr::SafeAddRef and clr::SafeRelease helpers.
 namespace clr

diff --git a/src/coreclr/src/utilcode/CMakeLists.txt b/src/coreclr/src/utilcode/CMakeLists.txt
@@ -62,7 +62,6 @@ set(UTILCODE_COMMON_SOURCES
 # of UTILCODE_SOURCES above after fixing compiler errors.
 if(CLR_CMAKE_TARGET_WIN32)
   list(APPEND UTILCODE_COMMON_SOURCES
-    appxutil.cpp
     dacutil.cpp
     dlwrap.cpp
     securitywrapper.cpp

diff --git a/src/coreclr/src/utilcode/appxutil.cpp b/src/coreclr/src/utilcode/appxutil.cpp
diff --git a/src/coreclr/src/utilcode/registrywrapper.cpp b/src/coreclr/src/utilcode/registrywrapper.cpp