diff options
| -rw-r--r-- | clr.coreclr.props | 1 | ||||
| -rw-r--r-- | clr.defines.targets | 2 | ||||
| -rw-r--r-- | src/mscorlib/model.xml | 2 | ||||
| -rw-r--r-- | src/mscorlib/mscorlib.shared.sources.props | 2 | ||||
| -rw-r--r-- | src/mscorlib/src/System.Private.CoreLib.txt | 4 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs | 2 |
6 files changed, 3 insertions, 10 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 90e9a6f592..47ba910b5e 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -51,7 +51,6 @@ <FeatureICastable>true</FeatureICastable> <FeatureCominteropUnmanagedActivation>true</FeatureCominteropUnmanagedActivation> <FeatureCominteropWinRTManagedActivation>true</FeatureCominteropWinRTManagedActivation> - <FeatureHostAssemblyResolver>true</FeatureHostAssemblyResolver> <FeatureLazyCOWPages Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'arm')">true</FeatureLazyCOWPages> <FeatureLegacyNetCFDbgHostControl>true</FeatureLegacyNetCFDbgHostControl> <FeatureRandomizedStringHashing>true</FeatureRandomizedStringHashing> diff --git a/clr.defines.targets b/clr.defines.targets index 579d412253..2d39da9d66 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -36,7 +36,6 @@ <CDefines Condition="'$(FeatureFullNGen)' == 'true'">$(CDefines);FEATURE_FULL_NGEN</CDefines> <CDefines Condition="'$(FeatureFusion)' == 'true'">$(CDefines);FEATURE_FUSION</CDefines> <CDefines Condition="'$(FeatureHijack)' == 'true'">$(CDefines);FEATURE_HIJACK</CDefines> - <CDefines Condition="'$(FeatureHostAssemblyResolver)' == 'true'">$(CDefines);FEATURE_HOST_ASSEMBLY_RESOLVER</CDefines> <CDefines Condition="'$(FeatureImpersonation)' == 'true'">$(CDefines);FEATURE_IMPERSONATION</CDefines> <CDefines Condition="'$(FeatureIncludeAllInterfaces)' == 'true'">$(CDefines);FEATURE_INCLUDE_ALL_INTERFACES</CDefines> <CDefines Condition="'$(FeatureInteropDebugging)' == 'true'">$(CDefines);FEATURE_INTEROP_DEBUGGING</CDefines> @@ -142,7 +141,6 @@ <DefineConstants Condition="'$(FeatureDisplayCultureInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_CULTURE_INFO</DefineConstants> <DefineConstants Condition="'$(FeatureDisplayRegionInfo)' == 'true'">$(DefineConstants);FEATURE_DISPLAY_REGION_INFO</DefineConstants> <DefineConstants Condition="'$(FeatureFusion)' == 'true'">$(DefineConstants);FEATURE_FUSION</DefineConstants> - <DefineConstants Condition="'$(FeatureHostAssemblyResolver)' == 'true'">$(DefineConstants);FEATURE_HOST_ASSEMBLY_RESOLVER</DefineConstants> <DefineConstants Condition="'$(FeatureHosting)' == 'true'">$(DefineConstants);FEATURE_HOSTING</DefineConstants> <DefineConstants Condition="'$(FeatureIdentityReference)' == 'true'">$(DefineConstants);FEATURE_IDENTITY_REFERENCE</DefineConstants> <DefineConstants Condition="'$(FeatureImpersonation)' == 'true'">$(DefineConstants);FEATURE_IMPERSONATION</DefineConstants> diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index f95f6a1565..ead6193d61 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -1011,7 +1011,7 @@ <Member Name="EndInvoke(System.IAsyncResult)" /> <Member Name="Invoke(T,T)" /> </Type> - <Type Name="System.Runtime.Loader.AssemblyLoadContext" condition="FEATURE_HOST_ASSEMBLY_RESOLVER"> + <Type Name="System.Runtime.Loader.AssemblyLoadContext"> <Member Name="#ctor" /> <Member MemberType="Property" Name="Default" /> <Member Name="GetAssemblyName(System.String)" /> diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props index 5470c17327..ef7f4b8008 100644 --- a/src/mscorlib/mscorlib.shared.sources.props +++ b/src/mscorlib/mscorlib.shared.sources.props @@ -914,7 +914,7 @@ <ExceptionservicesSources Include="$(BclSourcesRoot)\System\Runtime\ExceptionServices\ExceptionNotification.cs" /> </ItemGroup> <ItemGroup> - <HostingSources Condition="'$(FeatureHostAssemblyResolver)' == 'true'" Include="$(BclSourcesRoot)\System\Runtime\Loader\AssemblyLoadContext.cs" /> + <HostingSources Include="$(BclSourcesRoot)\System\Runtime\Loader\AssemblyLoadContext.cs" /> </ItemGroup> <ItemGroup> <SerializationSources Include="$(BclSourcesRoot)\System\Runtime\Serialization\FormatterConverter.cs" /> diff --git a/src/mscorlib/src/System.Private.CoreLib.txt b/src/mscorlib/src/System.Private.CoreLib.txt index 81647f92a5..9548c38613 100644 --- a/src/mscorlib/src/System.Private.CoreLib.txt +++ b/src/mscorlib/src/System.Private.CoreLib.txt @@ -2007,11 +2007,9 @@ Loader_ContextPolicies = Context Policies: ; AppDomain Exceptions AppDomain_RequireApplicationName = ApplicationName must be set before the DynamicBase can be set. AppDomain_AppBaseNotSet = The ApplicationBase must be set before retrieving this property. - -#if FEATURE_HOST_ASSEMBLY_RESOLVER AppDomain_BindingModelIsLocked = Binding model is already locked for the AppDomain and cannot be reset. Argument_CustomAssemblyLoadContextRequestedNameMismatch = Resolved assembly's simple name should be the same as of the requested assembly. -#endif // FEATURE_HOST_ASSEMBLY_RESOLVER + ; ; XMLSyntaxExceptions XMLSyntax_UnexpectedEndOfFile = Unexpected end of file. diff --git a/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs b/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs index ee9861f604..9c130b5268 100644 --- a/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs +++ b/src/mscorlib/src/System/Runtime/Loader/AssemblyLoadContext.cs @@ -13,7 +13,6 @@ using System.Runtime.InteropServices; using System.Security; using System.Threading; -#if FEATURE_HOST_ASSEMBLY_RESOLVER namespace System.Runtime.Loader { @@ -526,4 +525,3 @@ namespace System.Runtime.Loader } } -#endif // FEATURE_HOST_ASSEMBLY_RESOLVER |