remove all guard with ResourceUpdater.IsSupportedOS()

ResourceUpdater.IsSupportedOS() will always return true since dotnet/runtime#89303
anatawa12 · Aug 8, 2023 · 90f83e8 · 90f83e8
1 parent ca80028
commit 90f83e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 35 deletions.
diff --git a/src/Cli/dotnet/ShellShim/AppHostShimMaker.cs b/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
@@ -41,26 +40,12 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
             var appBinaryFilePath = Path.GetRelativePath(Path.GetDirectoryName(appHostDestinationFilePath), entryPointFullPath);
 
 
-            if (ResourceUpdater.IsSupportedOS())
-            {
-                var windowsGraphicalUserInterfaceBit = PEUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
-                HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
-                                         appHostDestinationFilePath: appHostDestinationFilePath,
-                                         appBinaryFilePath: appBinaryFilePath,
-                                         windowsGraphicalUserInterface: (windowsGraphicalUserInterfaceBit == WindowsGUISubsystem),
-                                         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());
-            }
+            var windowsGraphicalUserInterfaceBit = PEUtils.GetWindowsGraphicalUserInterfaceBit(entryPointFullPath);
+            HostWriter.CreateAppHost(appHostSourceFilePath: appHostSourcePath,
+                                     appHostDestinationFilePath: appHostDestinationFilePath,
+                                     appBinaryFilePath: appBinaryFilePath,
+                                     windowsGraphicalUserInterface: (windowsGraphicalUserInterfaceBit == WindowsGUISubsystem),
+                                     assemblyToCopyResourcesFrom: entryPointFullPath);
 
             _filePermissionSetter.SetUserExecutionPermission(appHostDestinationFilePath);
         }

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CreateAppHost.cs
@@ -53,19 +53,8 @@ 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)
                 {
                     try

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs b/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,