Merge pull request #19731 from dsplaisted/fix-netstandard-facades

Fix publishing .NET Standard facades

Author: dsplaisted

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.NETFramework.targets

@@ -104,9 +104,7 @@ Copyright (c) .NET Foundation. All rights reserved.
            and VS won't show a warning icon on the reference.  See https://github.com/dotnet/sdk/issues/1499
            -->
 
-      <ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)" Condition="'%(FileName)' != 'netfx.force.conflicts'">
-        <Private>false</Private>
-      </ReferenceCopyLocalPaths>
+      <ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)" Condition="'%(FileName)' != 'netfx.force.conflicts'"/>
 
       <_UpdatedReference Remove="@(_UpdatedReference)" />
     </ItemGroup>

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

@@ -50,8 +50,9 @@ public void It_solves_conflicts_between_package_and_implicit_references()
             var files = getValuesCommand.GetValues()
                 .Where(file => file.Contains(reference));
             files.Count().Should().Be(1);
-            // We should choose the file from system.runtime.interopservices.runtimeinformation package version
-            files.FirstOrDefault().Contains(@"system.runtime.interopservices.runtimeinformation\4.3.0").Should().BeTrue();
+
+            // We should choose the system.runtime.interopservices.runtimeinformation file from Microsoft.NET.Build.Extensions as it has a higher AssemblyVersion (4.0.2.0 compared to 4.0.1.0)
+            files.FirstOrDefault().Contains(@"Microsoft.NET.Build.Extensions\net461\lib\System.Runtime.InteropServices.RuntimeInformation.dll").Should().BeTrue();
         }
 
         [Theory]

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

@@ -0,0 +1,64 @@
+// 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;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Assertions;
+using Microsoft.NET.TestFramework.Commands;
+using Microsoft.NET.TestFramework.ProjectConstruction;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.NET.Publish.Tests
+{
+    public class PublishNetFrameworkApp : SdkTest
+    {
+        public PublishNetFrameworkApp(ITestOutputHelper log) : base(log)
+        {
+        }
+
+        [Fact]
+        public void NetStandardFacadesArePublished()
+        {
+            var netStandardProject = new TestProject()
+            {
+                Name = "NetStandardProject",
+                TargetFrameworks = "netstandard2.0"
+            };
+
+            var testProject = new TestProject()
+            {
+                TargetFrameworks = "net461",
+                IsExe = true
+            };
+            testProject.ReferencedProjects.Add(netStandardProject);
+
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            var publishCommand = new PublishCommand(testAsset);
+
+            publishCommand.Execute()
+                .Should()
+                .Pass();
+
+            //  There are close to 100 facades that should be copied, just check for a few of them here
+            publishCommand.GetOutputDirectory(testProject.TargetFrameworks)
+                .Should()
+                .HaveFiles(new[]
+                {
+                    "netstandard.dll",
+                    "System.IO.dll",
+                    "System.Runtime.dll"
+                })
+                .And
+                .NotHaveFile("netfx.force.conflicts.dll");
+        }
+    }
+}