From 945547d3a9858da706b483bdd8d1230e171d2472 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Tue, 28 Apr 2020 21:43:14 -0700
Subject: [PATCH 1/5] Generate target platform assembly attributes

---
 ...Microsoft.NET.GenerateAssemblyInfo.targets |   6 +
 ...osoft.NET.TargetFrameworkInference.targets |   5 +
 ...WantToBuildALibraryWithOSMinimumVersion.cs | 142 ++++++++++++++++++
 3 files changed, 153 insertions(+)
 create mode 100644 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
index cba52d198122..edd5a4c6cd4b 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
@@ -115,6 +115,12 @@ Copyright (c) .NET Foundation. All rights reserved.
         <_Parameter2>%(AssemblyMetadata.Value)</_Parameter2>
       </AssemblyAttribute>
     </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetPlatformIdentifier)' != '' and '$(MinimumOSPlatform)' != ''">
+      <AssemblyAttribute Include="System.Runtime.Versioning.MinimumOSPlatformAttribute">
+        <_Parameter1>$(TargetPlatformIdentifier.ToLower())$(MinimumOSPlatform)</_Parameter1>
+      </AssemblyAttribute>
+    </ItemGroup>
   </Target>
 
   <!-- 
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
index 9ef2457e8d0e..645d926fbe11 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
@@ -88,6 +88,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_UnsupportedTargetFrameworkError>true</_UnsupportedTargetFrameworkError>
   </PropertyGroup>
 
+  <!--Default MinimumOSPlatform to TargetPlatformVersion-->
+  <PropertyGroup Condition="'$(MinimumOSPlatform)' == '' and '$(TargetPlatformVersion)' != ''">
+    <MinimumOSPlatform>$(TargetPlatformVersion)</MinimumOSPlatform>
+  </PropertyGroup>
+
   <!--
     NOTE: We must not validate the TFM before restore target runs as it prevents adding additional TFM 
           support from being provided by a nuget package such as MSBuild.Sdk.Extras.
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs
new file mode 100644
index 000000000000..ceb83bc105d4
--- /dev/null
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs
@@ -0,0 +1,142 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Assertions;
+using Microsoft.NET.TestFramework.Commands;
+using Xunit;
+using FluentAssertions;
+using Xunit.Abstractions;
+using Microsoft.NET.TestFramework.ProjectConstruction;
+using System.Runtime.Versioning;
+
+namespace Microsoft.NET.Build.Tests
+{
+    public class GivenThatWeWantToBuildALibraryWithOSMinimumVersion : SdkTest
+    {
+        public GivenThatWeWantToBuildALibraryWithOSMinimumVersion(ITestOutputHelper log) : base(log)
+        {
+        }
+
+        [Fact]
+        public void WhenPropertiesAreNotSetItShouldNotGenerateMinimumOSPlatformAttribute()
+        {
+            TestProject testProject = SetUpProject();
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            var runCommand = new DotnetCommand(Log, "run");
+            runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name);
+            runCommand.Execute()
+                .Should()
+                .Pass().And.HaveStdOutContaining("NO ATTRIBUTE");
+        }
+
+        [Fact]
+        public void WhenPropertiesAreSetItCanGenerateMinimumOSPlatformAttribute()
+        {
+            TestProject testProject = SetUpProject();
+
+            var targetPlatformIdentifier = "iOS";
+            testProject.AdditionalProperties["TargetPlatformIdentifier"] = targetPlatformIdentifier;
+            testProject.AdditionalProperties["MinimumOSPlatform"] = "13.2";
+
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            var runCommand = new DotnetCommand(Log, "run");
+            runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name);
+            runCommand.Execute()
+                .Should()
+                .Pass().And.HaveStdOutContaining("PlatformName:ios13.2");
+        }
+
+        [Fact]
+        public void WhenMinimumOSPlatformISNotSetTargetPlatformVersionIsSetItCanGenerateMinimumOSPlatformAttribute()
+        {
+            TestProject testProject = SetUpProject();
+
+            var targetPlatformIdentifier = "iOS";
+            testProject.AdditionalProperties["TargetPlatformIdentifier"] = targetPlatformIdentifier;
+            testProject.AdditionalProperties["TargetPlatformVersion"] = "13.2";
+
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            var runCommand = new DotnetCommand(Log, "run");
+            runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name);
+            runCommand.Execute()
+                .Should()
+                .Pass().And.HaveStdOutContaining("PlatformName:ios13.2");
+        }
+
+        private static TestProject SetUpProject()
+        {
+            TestProject testProject = new TestProject()
+            {
+                Name = "Project",
+                IsSdkProject = true,
+                IsExe = true,
+                TargetFrameworks = "net5.0",
+            };
+
+            testProject.SourceFiles["PrintAttribute.cs"] = _printAttribute;
+            testProject.SourceFiles[$"AttributeIsNotDefinedYetWorkaround.cs"] = _attributeIsNotDefinedYetWorkaround;
+            return testProject;
+        }
+
+        private static readonly string _printAttribute = @"
+using System;
+using System.Runtime.Versioning;
+
+namespace CustomAttributesTestApp
+{
+    internal static class CustomAttributesTestApp
+    {
+        public static void Main()
+        {
+            var assembly = typeof(CustomAttributesTestApp).Assembly;
+            object[] attributes = assembly.GetCustomAttributes(typeof(System.Runtime.Versioning.MinimumOSPlatformAttribute), false);
+            if (attributes.Length > 0)
+            {
+                var attribute = attributes[0] as System.Runtime.Versioning.MinimumOSPlatformAttribute;
+                Console.WriteLine($""PlatformName:{attribute.PlatformName}"");
+            }
+            else
+            {
+                Console.WriteLine(""NO ATTRIBUTE"");
+            }
+        }
+    }
+}
+";
+
+        private static readonly string _attributeIsNotDefinedYetWorkaround = @"
+namespace System.Runtime.Versioning
+{
+    [AttributeUsage(AttributeTargets.Assembly |
+                AttributeTargets.Class |
+                AttributeTargets.Constructor |
+                AttributeTargets.Event |
+                AttributeTargets.Method |
+                AttributeTargets.Module |
+                AttributeTargets.Property |
+                AttributeTargets.Struct,
+                AllowMultiple = true, Inherited = false)]
+    public sealed class MinimumOSPlatformAttribute : OSPlatformAttribute
+    {
+        public MinimumOSPlatformAttribute(string platformName) : base(platformName)
+        {
+        }
+    }
+
+    public abstract class OSPlatformAttribute : Attribute
+    {
+        private protected OSPlatformAttribute(string platformName)
+        {
+            PlatformName = platformName;
+        }
+        public string PlatformName { get; }
+    }
+}";
+
+    }
+}

From a0370c53d81d5d012135458d21933a1399b05b6e Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 9 Jul 2020 21:15:04 -0700
Subject: [PATCH 2/5] Update stage 0

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index d2bddf0631cc..4c8477da6fe6 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.8.20351.5",
+    "dotnet": "5.0.100-preview.8.20359.7",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimePackageVersion)"

From 302008748edd6aea07a63ffb558888787ad56dcb Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 9 Jul 2020 21:31:47 -0700
Subject: [PATCH 3/5] Address code review

---
 ...Microsoft.NET.GenerateAssemblyInfo.targets |  2 +-
 ...WantToBuildALibraryWithOSMinimumVersion.cs | 36 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
index edd5a4c6cd4b..c1c4ea22daf8 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
@@ -118,7 +118,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup Condition="'$(TargetPlatformIdentifier)' != '' and '$(MinimumOSPlatform)' != ''">
       <AssemblyAttribute Include="System.Runtime.Versioning.MinimumOSPlatformAttribute">
-        <_Parameter1>$(TargetPlatformIdentifier.ToLower())$(MinimumOSPlatform)</_Parameter1>
+        <_Parameter1>$(TargetPlatformIdentifier)$(MinimumOSPlatform)</_Parameter1>
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs
index ceb83bc105d4..5b69e59fd163 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithOSMinimumVersion.cs
@@ -9,7 +9,6 @@
 using FluentAssertions;
 using Xunit.Abstractions;
 using Microsoft.NET.TestFramework.ProjectConstruction;
-using System.Runtime.Versioning;
 
 namespace Microsoft.NET.Build.Tests
 {
@@ -40,6 +39,7 @@ public void WhenPropertiesAreSetItCanGenerateMinimumOSPlatformAttribute()
             var targetPlatformIdentifier = "iOS";
             testProject.AdditionalProperties["TargetPlatformIdentifier"] = targetPlatformIdentifier;
             testProject.AdditionalProperties["MinimumOSPlatform"] = "13.2";
+            testProject.AdditionalProperties["TargetPlatformVersion"] = "14.0";
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
@@ -47,7 +47,7 @@ public void WhenPropertiesAreSetItCanGenerateMinimumOSPlatformAttribute()
             runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name);
             runCommand.Execute()
                 .Should()
-                .Pass().And.HaveStdOutContaining("PlatformName:ios13.2");
+                .Pass().And.HaveStdOutContaining("PlatformName:iOS13.2");
         }
 
         [Fact]
@@ -65,7 +65,7 @@ public void WhenMinimumOSPlatformISNotSetTargetPlatformVersionIsSetItCanGenerate
             runCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, testProject.Name);
             runCommand.Execute()
                 .Should()
-                .Pass().And.HaveStdOutContaining("PlatformName:ios13.2");
+                .Pass().And.HaveStdOutContaining("PlatformName:iOS13.2");
         }
 
         private static TestProject SetUpProject()
@@ -79,7 +79,6 @@ private static TestProject SetUpProject()
             };
 
             testProject.SourceFiles["PrintAttribute.cs"] = _printAttribute;
-            testProject.SourceFiles[$"AttributeIsNotDefinedYetWorkaround.cs"] = _attributeIsNotDefinedYetWorkaround;
             return testProject;
         }
 
@@ -109,34 +108,5 @@ public static void Main()
 }
 ";
 
-        private static readonly string _attributeIsNotDefinedYetWorkaround = @"
-namespace System.Runtime.Versioning
-{
-    [AttributeUsage(AttributeTargets.Assembly |
-                AttributeTargets.Class |
-                AttributeTargets.Constructor |
-                AttributeTargets.Event |
-                AttributeTargets.Method |
-                AttributeTargets.Module |
-                AttributeTargets.Property |
-                AttributeTargets.Struct,
-                AllowMultiple = true, Inherited = false)]
-    public sealed class MinimumOSPlatformAttribute : OSPlatformAttribute
-    {
-        public MinimumOSPlatformAttribute(string platformName) : base(platformName)
-        {
-        }
-    }
-
-    public abstract class OSPlatformAttribute : Attribute
-    {
-        private protected OSPlatformAttribute(string platformName)
-        {
-            PlatformName = platformName;
-        }
-        public string PlatformName { get; }
-    }
-}";
-
     }
 }

From 7c0262449bc7d940b57000e21308681a9d994adc Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Fri, 10 Jul 2020 10:08:43 -0700
Subject: [PATCH 4/5] Add condition on net5.0

---
 .../targets/Microsoft.NET.GenerateAssemblyInfo.targets       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
index c1c4ea22daf8..28bcccbbb8f7 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateAssemblyInfo.targets
@@ -116,7 +116,10 @@ Copyright (c) .NET Foundation. All rights reserved.
       </AssemblyAttribute>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetPlatformIdentifier)' != '' and '$(MinimumOSPlatform)' != ''">
+    <ItemGroup Condition="'$(TargetPlatformIdentifier)' != ''
+                         and '$(MinimumOSPlatform)' != ''
+                         and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+                         and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '5.0'))">
       <AssemblyAttribute Include="System.Runtime.Versioning.MinimumOSPlatformAttribute">
         <_Parameter1>$(TargetPlatformIdentifier)$(MinimumOSPlatform)</_Parameter1>
       </AssemblyAttribute>

From c9655b944fabde75234e29a7895dfed8a4fe1d7a Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Fri, 10 Jul 2020 13:29:07 -0700
Subject: [PATCH 5/5] Change expect files per
 https://github.com/dotnet/installer/pull/7943#issuecomment-655739840

---
 .../GivenThatWeWantToPublishASingleFileApp.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
index 13bbbc4ae84f..67a543fd4d9b 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
@@ -202,7 +202,7 @@ public void It_generates_a_single_file_for_self_contained_apps()
                 .Should()
                 .Pass();
 
-            string[] expectedFiles = { SingleFile, PdbFile, SmallNameDirWord, LargeNameDirWord, GetNativeDll("coreclr"), GetNativeDll("clrjit") };
+            string[] expectedFiles = { SingleFile, PdbFile, SmallNameDirWord, LargeNameDirWord };
             string[] unexpectedFiles = { GetNativeDll("hostfxr"), GetNativeDll("hostpolicy") };
 
             GetPublishDirectory(publishCommand)