FB

Author: LakshanF

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

@@ -27,61 +27,19 @@ Copyright (c) .NET Foundation. All rights reserved.
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- We disable startup hooks for trimmed apps here so that the feature
-       switch can flow to the runtimeconfig.json. Startup hooks are disabled
-       by default since they may require assemblies, types or members that
-       could be removed by the linker, causing a trimmed app to crash. -->
-  <PropertyGroup Condition="'$(StartupHookSupport)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
-                            $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <StartupHookSupport>false</StartupHookSupport>
-  </PropertyGroup>
-
-  <!-- We disable custom resource types for trimmed apps here so that the feature
-       switch can flow to the runtimeconfig.json. Custom resource types are disabled
-       by default since they may require assemblies, types or members that
-       could be removed by the linker, causing a trimmed app to crash. -->
-  <PropertyGroup Condition="'$(CustomResourceTypesSupport)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
-                            $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <CustomResourceTypesSupport>false</CustomResourceTypesSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
-                            $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization>false</EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization>
-  </PropertyGroup>
-
-  <!-- We disable in-built COM Interop support for trimmed apps here so that the feature
-       switch can flow to the runtimeconfig.json. Built-in COM Interop support is disabled
-       by default since they may require assemblies, types or members that
-       could be removed by the linker, causing a trimmed app to crash. -->
-  <PropertyGroup Condition="'$(BuiltInComInteropSupport)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
-                            $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
-  </PropertyGroup>
-
-  <!-- We disable Native Host entry point support for IJW (C++/CLI Assemblies) for trimmed
-       apps here so that the feature switch can flow to the runtimeconfig.json. 
-       Native Host entry point support is disabled
-       by default since they may require assemblies, types or members that
-       could be removed by the linker, causing a trimmed app to crash. -->
-  <PropertyGroup Condition="'$(EnableCPlusPlusCLIHostActivation)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
-                            $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <EnableCPlusPlusCLIHostActivation>false</EnableCPlusPlusCLIHostActivation>
-  </PropertyGroup>
 
-  <!-- We disable Native Host entry point support for loading managed components for trimmed
-       apps here so that the feature switch can flow to the runtimeconfig.json. 
-       Native Host entry point support is disabled
-       by default since they may require assemblies, types or members that
-       could be removed by the linker, causing a trimmed app to crash. -->
-  <PropertyGroup Condition="'$(_EnableCallingManagedFunctionFromNativeHosting)' == '' And
-                            '$(PublishTrimmed)' == 'true' And
+  <!-- We disable features for trimmed apps here so that the feature
+      switches can flow to the runtimeconfig.json. Features are disabled
+      by default since they may require assemblies, types or members that
+      could be removed by the linker, causing a trimmed app to crash. -->
+  <PropertyGroup Condition="'$(PublishTrimmed)' == 'true' And
                             $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))">
-    <_EnableCallingManagedFunctionFromNativeHosting>false</_EnableCallingManagedFunctionFromNativeHosting>
+    <StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
+    <CustomResourceTypesSupport Condition="'$(CustomResourceTypesSupport)' == ''">false</CustomResourceTypesSupport>
+    <EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization Condition="'$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)' == ''">false</EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization>
+    <BuiltInComInteropSupport Condition="'$(BuiltInComInteropSupport)' == ''">false</BuiltInComInteropSupport>
+    <EnableCPlusPlusCLIHostActivation Condition="'$(EnableCPlusPlusCLIHostActivation)' == ''">false</EnableCPlusPlusCLIHostActivation>
+    <_EnableCallingManagedFunctionFromNativeHosting Condition="'$(_EnableCallingManagedFunctionFromNativeHosting)' == ''">false</_EnableCallingManagedFunctionFromNativeHosting>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(SuppressTrimAnalysisWarnings)' == '' And ('$(EnableTrimAnalyzer)' == 'true' Or '$(PublishTrimmed)' == 'true')">