Test codesign enabled and disabled

Author: jtschuster

test/Microsoft.NET.Build.Tests/AppHostTests.cs

@@ -79,40 +79,6 @@ public void It_builds_a_runnable_apphost_by_default(string targetFramework)
                 .HaveStdOutContaining("Hello World!");
         }
 
-        [PlatformSpecificTheory(TestPlatforms.OSX)]
-        [InlineData("netcoreapp3.1")]
-        [InlineData("net5.0")]
-        [InlineData(ToolsetInfo.CurrentTargetFramework)]
-        public void It_can_disable_codesign_if_opt_out(string targetFramework)
-        {
-            var testAsset = _testAssetsManager
-                .CopyTestAsset("HelloWorld", identifier: targetFramework)
-                .WithSource()
-                .WithTargetFramework(targetFramework);
-
-            var buildCommand = new BuildCommand(testAsset);
-            buildCommand
-                .Execute(new string[] {
-                    "/p:_EnableMacOSCodeSign=false;ProduceReferenceAssembly=false",
-                })
-                .Should()
-                .Pass();
-
-            var outputDirectory = buildCommand.GetOutputDirectory(targetFramework);
-            var appHostFullPath = Path.Combine(outputDirectory.FullName, "HelloWorld");
-
-            // Check that the apphost was not signed
-            var codesignPath = @"/usr/bin/codesign";
-            new RunExeCommand(Log, codesignPath, new string[] { "-d", appHostFullPath })
-                .Execute()
-                .Should()
-                .Fail()
-                .And
-                .HaveStdErrContaining($"{appHostFullPath}: code object is not signed at all");
-
-            outputDirectory.Should().OnlyHaveFiles(GetExpectedFilesFromBuild(testAsset, targetFramework));
-        }
-
         [PlatformSpecificTheory(TestPlatforms.OSX)]
         [InlineData("netcoreapp3.1", "win-x64")]
         [InlineData("net5.0", "win-x64")]
@@ -153,11 +119,15 @@ public void It_does_not_try_to_codesign_non_osx_app_hosts(string targetFramework
         }
 
         [Theory]
-        [InlineData("net6.0", "osx-x64")]
-        [InlineData("net6.0", "osx-arm64")]
-        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-x64")]
-        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-arm64")]
-        public void It_codesigns_an_app_targeting_osx(string targetFramework, string rid)
+        [InlineData("net8.0", "osx-x64", true)]
+        [InlineData("net8.0", "osx-arm64", true)]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-x64", true)]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-arm64", true)]
+        [InlineData("net8.0", "osx-x64", false)]
+        [InlineData("net8.0", "osx-arm64", false)]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-x64", false)]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, "osx-arm64", false)]
+        public void It_codesigns_an_app_targeting_osx(string targetFramework, string rid, bool shouldSign)
         {
             const string testAssetName = "HelloWorld";
             var testAsset = _testAssetsManager
@@ -166,7 +136,7 @@ public void It_codesigns_an_app_targeting_osx(string targetFramework, string rid
                 .WithTargetFramework(targetFramework);
 
             var buildCommand = new BuildCommand(testAsset);
-            var buildArgs = new List<string>() { $"/p:RuntimeIdentifier={rid}" };
+            var buildArgs = new List<string>() { $"/p:RuntimeIdentifier={rid}", $"/p:_EnableMacOSCodeSign={shouldSign}" };
             buildCommand
                 .Execute(buildArgs.ToArray())
                 .Should()
@@ -176,12 +146,12 @@ public void It_codesigns_an_app_targeting_osx(string targetFramework, string rid
             var appHostFullPath = Path.Combine(outputDirectory.FullName, testAssetName);
 
             // Check that the apphost is signed
-            MachOSignature.HasMachOSignatureLoadCommand(new FileInfo(appHostFullPath)).Should().BeTrue();
+            MachOSignature.HasMachOSignatureLoadCommand(new FileInfo(appHostFullPath)).Should().Be(shouldSign, $"The app host should {(shouldSign ? "" : "not ")}have a Mach-O signature load command.");
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                MachOSignature.HasValidMachOSignature(new FileInfo(appHostFullPath))
+                MachOSignature.HasValidMachOSignature(new FileInfo(appHostFullPath), Log)
                     .Should()
-                    .BeTrue($"The app host should have a valid Mach-O signature for {rid}.");
+                    .Be(shouldSign, $"The app host should have a valid Mach-O signature for {rid}.");
             }
         }
 

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs

@@ -1128,9 +1128,11 @@ static void VerifyPrepareForBundle(XDocument project)
         }
 
         [Theory]
-        [InlineData("osx-x64")]
-        [InlineData("osx-arm64")]
-        public void It_codesigns_an_app_targeting_osx(string rid)
+        [InlineData("osx-x64", true)]
+        [InlineData("osx-arm64", true)]
+        [InlineData("osx-x64", false)]
+        [InlineData("osx-arm64", false)]
+        public void It_codesigns_an_app_targeting_osx(string rid, bool enableMacOSCodeSign)
         {
             var targetFramework = ToolsetInfo.CurrentTargetFramework;
             var testProject = new TestProject()
@@ -1143,10 +1145,10 @@ public void It_codesigns_an_app_targeting_osx(string rid)
 
             var testAsset = _testAssetsManager.CreateTestProject(
                 testProject,
-                identifier: rid);
+                identifier: $"{rid}_{enableMacOSCodeSign}");
             var publishCommand = new PublishCommand(testAsset);
 
-            publishCommand.Execute(PublishSingleFile, $"/p:RuntimeIdentifier={rid}", IncludeDefault)
+            publishCommand.Execute(PublishSingleFile, $"/p:RuntimeIdentifier={rid}", $"/p:_EnableMacOSCodeSign={enableMacOSCodeSign}")
                 .Should()
                 .Pass();
 
@@ -1155,13 +1157,13 @@ public void It_codesigns_an_app_targeting_osx(string rid)
 
             MachOSignature.HasMachOSignatureLoadCommand(new FileInfo(singleFilePath))
                 .Should()
-                .BeTrue($"The app host should have a Mach-O signature load command for {rid}.");
+                .Be(enableMacOSCodeSign, $"The app host should {(enableMacOSCodeSign ? "" : "not ")}have a Mach-O signature load command.");
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 MachOSignature.HasValidMachOSignature(new FileInfo(singleFilePath), Log)
                     .Should()
-                    .BeTrue($"The app host should have a valid Mach-O signature for {rid}.");
+                    .Be(enableMacOSCodeSign, $"The app host should {(enableMacOSCodeSign ? "" : "not ")}have a valid Mach-O signature for {rid}.");
             }
         }
     }