[xbuild] Add a workaround for not yet implemented full /keyfile signing using csc
authorMarek Safar <marek.safar@gmail.com>
Mon, 12 Dec 2016 17:25:50 +0000 (18:25 +0100)
committerMarek Safar <marek.safar@gmail.com>
Mon, 12 Dec 2016 17:28:42 +0000 (18:28 +0100)
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs

index 375b82782c27a61cc32ef07d1c7cde4cfd2f4b3c..d81ed3422e9ac43fe545fe7008ab26007990aab5 100644 (file)
@@ -77,6 +77,9 @@ namespace Microsoft.Build.Tasks {
                        //fileAlignment
                        commandLine.AppendSwitchIfNotNull ("/keycontainer:", KeyContainer);
                        commandLine.AppendSwitchIfNotNull ("/keyfile:", KeyFile);
+                       if (KeyFile != null)
+                               commandLine.AppendSwitch("/publicsign");
+
                        // FIXME: add ids from metadata
                        if (LinkResources != null)
                                foreach (ITaskItem item in LinkResources)
index 91308f5855beb1414062a97fc59556faa56b8e5e..2295366716e6628f7d3a12d8b22474c98e19bff5 100644 (file)
@@ -366,7 +366,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
                        mc.ARFC (c1);
                        mc.ACLC (c2);
                        
-                       Assert.AreEqual ("/keyfile:A", c1.ToString (), "A1");
+                       Assert.AreEqual ("/keyfile:A /publicsign", c1.ToString (), "A1");
                        Assert.AreEqual (String.Empty, c2.ToString (), "A2");
                }