Infer self-contained and RID for PublishAot

am11 · Jan 9, 2023 · dc23244 · dc23244
1 parent dbfe834
commit dc23244
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -78,7 +78,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == ''">
     <UseCurrentRuntimeIdentifier Condition="
                  '$(RuntimeIdentifier)' == '' and
-                 '$(_IsExecutable)' == 'true' and '$(IsTestProject)' != 'true' and
+                 ('$(_IsExecutable)' == 'true' and '$(IsTestProject)' != 'true' or '$(PublishAot)' == 'true') and
                  '$(IsRidAgnostic)' != 'true' and
                  (
                    '$(SelfContained)' == 'true' or
@@ -147,6 +147,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <!-- Detecting property presence is not harmful and can be done in an unconditioned way -->
     <_SelfContainedWasSpecified Condition="'$(SelfContained)' != ''">true</_SelfContainedWasSpecified>
+    <!-- PublishAot implies SelfContained -->
+    <SelfContained Condition="'$(SelfContained)' == '' and '$(PublishAot)' == 'true'">true</SelfContained>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'">
     <SelfContained Condition="'$(SelfContained)' == '' and '$(RuntimeIdentifier)' != ''">true</SelfContained>