[genproj] Simplify strong name key handling

[mono.git] / msvc / scripts / genproj.cs

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index bf450539688c65b76e790b6beae92a2971d2f91d..c60bc5397ce28ad027f8856df3061ebfad69d4f6 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -900,6 +900,12 @@ class MsbuildGenerator {
                else
                        build_output_dir = "bin\\Debug\\" + library;
 
+               if (build_output_dir.Contains ("-linux") || build_output_dir.Contains ("-darwin") || build_output_dir.Contains ("-win32"))
+                       build_output_dir = build_output_dir
+                               .Replace ("-linux", "-$(HostPlatform)")
+                               .Replace ("-darwin", "-$(HostPlatform)")
+                               .Replace ("-win32", "-$(HostPlatform)");
+
                bool basic_or_build = (library.Contains ("-basic") || library.Contains ("-build"));
 
                //
@@ -909,13 +915,10 @@ class MsbuildGenerator {
                string strongNameSection = "";
                if (StrongNameKeyFile != null){
                        strongNameSection = String.Format (
-                               "  <PropertyGroup>" + NewLine +
                                "    <SignAssembly>true</SignAssembly>" + NewLine +
                                "{1}" +
-                               "  </PropertyGroup>" + NewLine +
-                               "  <PropertyGroup>" + NewLine +
-                               "    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>" + NewLine +
-                               "  </PropertyGroup>", StrongNameKeyFile, StrongNameDelaySign ? "    <DelaySign>true</DelaySign>" + NewLine : "");
+                               "    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>",
+                               StrongNameKeyFile, StrongNameDelaySign ? "    <DelaySign>true</DelaySign>" + NewLine : "");
                }
                Csproj.output = template.
                        Replace ("@OUTPUTTYPE@", Target == Target.Library ? "Library" : "Exe").