Crossplatform ResourceUpdater (#34394)

Author: joeloff

src/Cli/dotnet/ShellShim/AppHostShimMaker.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.DotNet.Tools;
 using Microsoft.Extensions.EnvironmentAbstractions;
-using Microsoft.NET.HostModel;
 using Microsoft.NET.HostModel.AppHost;
 
 namespace Microsoft.DotNet.ShellShim
@@ -40,27 +39,14 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
             string entryPointFullPath = Path.GetFullPath(entryPoint.Value);
             var appBinaryFilePath = Path.GetRelativePath(Path.GetDirectoryName(appHostDestinationFilePath), entryPointFullPath);
 
+            var windowsGraphicalUserInterfaceBit = PEUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
+            var windowsGraphicalUserInterface = (windowsGraphicalUserInterfaceBit == WindowsGUISubsystem) && OperatingSystem.IsWindows();
 
-            if (ResourceUpdater.IsSupportedOS())
-            {
-                var windowsGraphicalUserInterfaceBit = PEUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
-                HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
-                                         appHostDestinationFilePath: appHostDestinationFilePath,
-                                         appBinaryFilePath: appBinaryFilePath,
-                                         windowsGraphicalUserInterface: (windowsGraphicalUserInterfaceBit == WindowsGUISubsystem) && OperatingSystem.IsWindows(),
-                                         assemblyToCopyResourcesFrom: entryPointFullPath);
-            }
-            else
-            {
-                // by passing null to assemblyToCopyResourcesFrom, it will skip copying resources,
-                // which is only supported on Windows
-                HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
-                                         appHostDestinationFilePath: appHostDestinationFilePath,
-                                         appBinaryFilePath: appBinaryFilePath,
-                                         windowsGraphicalUserInterface: false,
-                                         assemblyToCopyResourcesFrom: null,
-                                         enableMacOSCodeSign: OperatingSystem.IsMacOS());
-            }
+            HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
+                                     appHostDestinationFilePath: appHostDestinationFilePath,
+                                     appBinaryFilePath: appBinaryFilePath,
+                                     windowsGraphicalUserInterface: windowsGraphicalUserInterface,
+                                     assemblyToCopyResourcesFrom: entryPointFullPath);
 
             _filePermissionSetter.SetUserExecutionPermission(appHostDestinationFilePath);
         }

src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs

@@ -53,17 +53,6 @@ protected override void ExecuteCore()
                 var isGUI = WindowsGraphicalUserInterface;
                 var resourcesAssembly = IntermediateAssembly;
 
-                if (!ResourceUpdater.IsSupportedOS())
-                {
-                    if (isGUI)
-                    {
-                        Log.LogWarning(Strings.AppHostCustomizationRequiresWindowsHostWarning);
-                    }
-
-                    isGUI = false;
-                    resourcesAssembly = null;
-                }
-
                 int attempts = 0;
 
                 while (true)

src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using Microsoft.NET.HostModel;
 using Microsoft.NET.HostModel.AppHost;
 using NuGet.Versioning;
 
@@ -108,7 +107,7 @@ protected override void ExecuteCore()
                 try
                 {
                     var windowsGraphicalUserInterface = runtimeIdentifier.StartsWith("win") && "WinExe".Equals(OutputType, StringComparison.OrdinalIgnoreCase);
-                    if (ResourceUpdater.IsSupportedOS() && runtimeIdentifier.StartsWith("win"))
+                    if (runtimeIdentifier.StartsWith("win"))
                     {
                         HostWriter.CreateAppHost(appHostSourceFilePath: resolvedApphostAssetPath,
                                                  appHostDestinationFilePath: appHostDestinationFilePath,

src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.IO.MemoryMappedFiles;
 using System.Runtime.CompilerServices;
 using Microsoft.NET.Build.Tasks;
 
@@ -104,6 +105,41 @@ public void AppTargetingWindows10CanBuildOnNonWindows()
                 .Pass();
         }
 
+        [PlatformSpecificFact(TestPlatforms.Linux | TestPlatforms.OSX | TestPlatforms.FreeBSD)]
+        public void AppTargetingWindows10WillProduceWindowsGUISubsystemExe()
+        {
+            // check subsystem is successfully set as WindowsGUISubsystem
+            var testProject = new TestProject()
+            {
+                TargetFrameworks = ToolsetInfo.CurrentTargetFramework + "-windows10.0.19041.0",
+                IsWinExe = true
+            };
+            testProject.AdditionalProperties["EnableWindowsTargeting"] = "true";
+            testProject.AdditionalProperties["RuntimeIdentifier"] = "win-x64";
+
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            new PublishCommand(testAsset)
+                .Execute()
+                .Should()
+                .Pass();
+
+            var exePath = Path.Combine(testAsset.TestRoot, testAsset.TestProject.Name,
+                "bin", "Debug", testAsset.TestProject.TargetFrameworks, "win-x64", "publish",
+                $"{testAsset.TestProject.Name}.exe");
+
+            const int PEHeaderPointerOffset = 0x3C;
+            const int SubsystemOffset = 0x5C;
+            const ushort WindowsGUISubsystem = 0x2;
+
+            using var mmap = MemoryMappedFile.CreateFromFile(exePath);
+            using var accessor = mmap.CreateViewAccessor();
+
+            uint peHeaderOffset = accessor.ReadUInt32(PEHeaderPointerOffset);
+            ushort subsystem = accessor.ReadUInt16(peHeaderOffset + SubsystemOffset);
+            subsystem.Should().Be(WindowsGUISubsystem);
+        }
+
         [PlatformSpecificFact(TestPlatforms.Linux | TestPlatforms.OSX | TestPlatforms.FreeBSD)]
         public void WindowsFormsAppCanBuildOnNonWindows()
         {

src/Tests/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithPackagedShim.cs

@@ -383,7 +383,7 @@ public void When_version_and_packageVersion_is_different_It_produces_valid_shims
             AssertValidShim(_testRoot, nugetPackage);
         }
 
-        [WindowsOnlyFact]
+        [Fact]
         public void Given_wpf_project_It_contains_shim_with_WindowsGraphicalUserInterfaceBit()
         {
             ushort windowsGUISubsystem = 0x2;
@@ -395,6 +395,7 @@ public void Given_wpf_project_It_contains_shim_with_WindowsGraphicalUserInterfac
                 IsWinExe = true,
             };
 
+            testProject.AdditionalProperties.Add("EnableWindowsTargeting", "true");
             testProject.AdditionalProperties.Add("UseWPF", "true");
             testProject.AdditionalProperties.Add("PackAsToolShimRuntimeIdentifiers", $"win-x64;{ToolsetInfo.LatestMacRuntimeIdentifier}-x64");
             testProject.AdditionalProperties.Add("ToolCommandName", _customToolCommandName);