FB on naming

Author: LakshanF

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets

@@ -359,16 +359,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     -->
 
   <ItemGroup>
-    <RuntimeHostConfigurationOption Include="Internal.Runtime.InteropServices.ComponentActivator.IsSupported"
-                                    Condition="'$(_EnableCallingManagedFunctionFromNativeHosting)' != ''"
-                                    Value="$(_EnableCallingManagedFunctionFromNativeHosting)"
-                                    Trim="true" />
-
-    <RuntimeHostConfigurationOption Include="Internal.Runtime.InteropServices.InMemoryAssemblyLoader.IsSupported"
-                                    Condition="'$(EnableCPlusPlusCLIHostActivation)' != ''"
-                                    Value="$(EnableCPlusPlusCLIHostActivation)"
-                                    Trim="true" />
-
     <RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization"
                                     Condition="'$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)' != ''"
                                     Value="$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)"
@@ -426,6 +416,16 @@ Copyright (c) .NET Foundation. All rights reserved.
                                     Value="$(BuiltInComInteropSupport)"
                                     Trim="true" />
 
+    <RuntimeHostConfigurationOption Include="System.Runtime.InteropServices.CallingManagedFunctionFromNativeHosting.IsSupported"
+                                    Condition="'$(_EnableCallingManagedFunctionFromNativeHosting)' != ''"
+                                    Value="$(_EnableCallingManagedFunctionFromNativeHosting)"
+                                    Trim="true" />
+
+    <RuntimeHostConfigurationOption Include="System.Runtime.InteropServices.CPlusPlusCLIHostActivation.IsSupported"
+                                    Condition="'$(EnableCPlusPlusCLIHostActivation)' != ''"
+                                    Value="$(EnableCPlusPlusCLIHostActivation)"
+                                    Trim="true" />
+
     <RuntimeHostConfigurationOption Include="System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization"
                                     Condition="'$(EnableUnsafeBinaryFormatterSerialization)' != ''"
                                     Value="$(EnableUnsafeBinaryFormatterSerialization)"

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs

@@ -682,31 +682,31 @@ public void TrimmingOptions_are_defaulted_correctly_on_trimmed_apps(string targe
             {
                 JObject runtimeConfig = JObject.Parse(runtimeConfigContents);
                 runtimeConfig["runtimeOptions"]["configProperties"]
-                    ["Internal.Runtime.InteropServices.ComponentActivator.IsSupported"].Value<bool>()
+                    ["System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization"].Value<bool>()
                     .Should().BeFalse();
                 runtimeConfig["runtimeOptions"]["configProperties"]
-                    ["Internal.Runtime.InteropServices.InMemoryAssemblyLoader.IsSupported"].Value<bool>()
+                    ["System.Resources.ResourceManager.AllowCustomResourceTypes"].Value<bool>()
                     .Should().BeFalse();
                 runtimeConfig["runtimeOptions"]["configProperties"]
-                    ["System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization"].Value<bool>()
+                    ["System.Runtime.InteropServices.BuiltInComInterop.IsSupported"].Value<bool>()
                     .Should().BeFalse();
                 runtimeConfig["runtimeOptions"]["configProperties"]
-                    ["System.Resources.ResourceManager.AllowCustomResourceTypes"].Value<bool>()
+                    ["System.Runtime.InteropServices.CallingManagedFunctionFromNativeHosting.IsSupported"].Value<bool>()
                     .Should().BeFalse();
                 runtimeConfig["runtimeOptions"]["configProperties"]
-                    ["System.Runtime.InteropServices.BuiltInComInterop.IsSupported"].Value<bool>()
+                    ["System.Runtime.InteropServices.CPlusPlusCLIHostActivation.IsSupported"].Value<bool>()
                     .Should().BeFalse();
                 runtimeConfig["runtimeOptions"]["configProperties"]
                     ["System.StartupHookProvider.IsSupported"].Value<bool>()
                     .Should().BeFalse();
             }
             else
             {
-                runtimeConfigContents.Should().NotContain("Internal.Runtime.InteropServices.ComponentActivator.IsSupported");
-                runtimeConfigContents.Should().NotContain("Internal.Runtime.InteropServices.InMemoryAssemblyLoader.IsSupported");
                 runtimeConfigContents.Should().NotContain("System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization");
                 runtimeConfigContents.Should().NotContain("System.Resources.ResourceManager.AllowCustomResourceTypes");
                 runtimeConfigContents.Should().NotContain("System.Runtime.InteropServices.BuiltInComInterop.IsSupported");
+                runtimeConfigContents.Should().NotContain("System.Runtime.InteropServices.CallingManagedFunctionFromNativeHosting.IsSupported");
+                runtimeConfigContents.Should().NotContain("System.Runtime.InteropServices.CPlusPlusCLIHostActivation.IsSupported");
                 runtimeConfigContents.Should().NotContain("System.StartupHookProvider.IsSupported");
             }
         }