From 256deabc519a4a355752b1dc74721160d87253ab Mon Sep 17 00:00:00 2001
From: Grace Kulin <gracekulin@microsoft.com>
Date: Thu, 17 Feb 2022 14:46:22 -0800
Subject: [PATCH] fix self contained warning #23705

---
 ...oft.NET.RuntimeIdentifierInference.targets |  1 +
 .../targets/Microsoft.NET.Sdk.targets         |  2 +-
 .../GivenDotnetBuildBuildsCsproj.cs           | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 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
index 615c2be6201f..478dfc9e1e31 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
@@ -110,6 +110,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     This avoids a breaking change from 1.0 behavior.
     -->
   <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'">
+    <_SelfContainedWasSpecified Condition="'$(SelfContained)' != ''">true</_SelfContainedWasSpecified>
     <SelfContained Condition="'$(SelfContained)' == '' and '$(RuntimeIdentifier)' != ''">true</SelfContained>
     <SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
     <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false</_RuntimeIdentifierUsesAppHost>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index d8a626295e53..fa155b7b5c3b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -1107,7 +1107,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target Name="ValidateCommandLineProperties"
           AfterTargets="_CheckForInvalidConfigurationAndPlatform" >
 
-    <NETSdkWarning Condition="'$(_CommandLineDefinedSelfContained)' != 'true' and
+    <NETSdkWarning Condition="'$(_SelfContainedWasSpecified)' != 'true' and
                    '$(_CommandLineDefinedRuntimeIdentifier)' == 'true' and
                    '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                    $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0'))"
diff --git a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
index 1a4d48fc57f7..27d7419cac9e 100644
--- a/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
+++ b/src/Tests/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -194,6 +194,27 @@ public void It_warns_on_rid_without_self_contained_options()
                .HaveStdOutContaining("NETSDK1179");
         }
 
+        [Fact]
+        public void It_does_not_warn_on_rid_with_self_contained_set_in_project()
+        {
+            var testProject = new TestProject()
+            {
+                IsExe = true,
+                TargetFrameworks = ToolsetInfo.CurrentTargetFramework,
+            };
+            testProject.AdditionalProperties["SelfContained"] = "true";
+            
+            var testInstance = _testAssetsManager.CreateTestProject(testProject);
+
+            new DotnetBuildCommand(Log)
+               .WithWorkingDirectory(Path.Combine(testInstance.Path, testProject.Name))
+               .Execute("-r", "win-x64")
+               .Should()
+               .Pass()
+               .And
+               .NotHaveStdOutContaining("NETSDK1179");
+        }
+
         [WindowsOnlyTheory]
         [InlineData("build")]
         [InlineData("run")]