Merge pull request #7914 from agocke/allow-public-sign-and-delay-sign-false

Allow publicsign true and delaysign false

src/Compilers/CSharp/Portable/CSharpCompilationOptions.cs

@@ -566,7 +566,7 @@ internal override void ValidateOptions(ArrayBuilder<Diagnostic> builder)
                 }
             }
 
-            if (PublicSign && DelaySign.HasValue)
+            if (PublicSign && DelaySign == true)
             {
                 builder.Add(Diagnostic.Create(MessageProvider.Instance, (int)ErrorCode.ERR_MutuallyExclusiveOptions, nameof(PublicSign), nameof(DelaySign)));
             }

src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs

@@ -555,6 +555,23 @@ public void PublicSignAndDelaySign()
             Assert.True(comp.Options.DelaySign);
         }
 
+        [Fact]
+        public void PublicSignAndDelaySignFalse()
+        {
+            var snk = Temp.CreateFile().WriteAllBytes(TestResources.General.snKey);
+
+            var comp = CreateCompilationWithMscorlib("public class C {}",
+                options: TestOptions.ReleaseDll
+                    .WithPublicSign(true)
+                    .WithDelaySign(false)
+                    .WithCryptoKeyFile(snk.Path));
+
+            comp.VerifyDiagnostics();
+
+            Assert.True(comp.Options.PublicSign);
+            Assert.False(comp.Options.DelaySign);
+        }
+
         [Fact]
         public void PublicSignNoKey()
         {

src/Compilers/VisualBasic/Portable/VisualBasicCompilationOptions.vb

@@ -933,7 +933,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                 End If
             End If
 
-            If PublicSign AndAlso DelaySign.HasValue Then
+            If PublicSign AndAlso DelaySign = True Then
                 builder.Add(Diagnostic.Create(MessageProvider.Instance, ERRID.ERR_MutuallyExclusiveOptions, NameOf(PublicSign), NameOf(DelaySign)))
             End If
         End Sub

src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb

@@ -1767,6 +1767,28 @@ BC2046: Compilation options 'PublicSign' and 'DelaySign' can't both be specified
         Assert.True(comp.Options.DelaySign)
     End Sub
 
+    <Fact>
+    Public Sub PublicSignAndDelaySignFalse()
+        Dim snk = Temp.CreateFile().WriteAllBytes(TestResources.General.snKey)
+        Dim options = TestOptions.ReleaseDll.WithCryptoKeyFile(snk.Path).WithPublicSign(True).WithDelaySign(False)
+
+        Dim comp = CreateCompilationWithMscorlib(
+            <compilation>
+                <file name="a.vb"><![CDATA[
+Public Class C
+End Class
+]]>
+                </file>
+            </compilation>,
+            options:=options
+        )
+
+        AssertTheseDiagnostics(comp)
+
+        Assert.True(comp.Options.PublicSign)
+        Assert.False(comp.Options.DelaySign)
+    End Sub
+
     <Fact, WorkItem(769840, "DevDiv")>
     Public Sub Bug769840()
         Dim ca = CreateCompilationWithMscorlib(