From 21e9c71f7b1c9aef6b2ebe43e1caca5c11daf595 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Mon, 12 Dec 2016 18:25:50 +0100 Subject: [PATCH] [xbuild] Add a workaround for not yet implemented full /keyfile signing using csc --- .../Microsoft.Build.Tasks/ManagedCompiler.cs | 3 +++ .../Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs index 375b82782c2..d81ed3422e9 100644 --- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs +++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ManagedCompiler.cs @@ -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) diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs index 91308f5855b..2295366716e 100644 --- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs +++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ManagedCompilerTest.cs @@ -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"); } -- 2.25.1