diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-07 18:54:30 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-07 23:10:58 +0300 |
| commit | 83dde0759ffef4e98a8650b36df34d23f9c95205 (patch) | |
| tree | cd28cae1bec1ef995f5be5f673e1673e5ea30ee8 /msvc | |
| parent | 757741bd90f6c0882d319d7ba0c4af745c97c233 (diff) | |
[genproj] Simplify strong name key handling
It doesn't need to be in a separate PropertyGroup.
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/scripts/csproj.tmpl | 2 | ||||
| -rw-r--r-- | msvc/scripts/genproj.cs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/msvc/scripts/csproj.tmpl b/msvc/scripts/csproj.tmpl index 1b2e850e5e3..b43ad7901c1 100644 --- a/msvc/scripts/csproj.tmpl +++ b/msvc/scripts/csproj.tmpl @@ -25,8 +25,8 @@ <AssemblyName>@ASSEMBLYNAME@</AssemblyName>
<TargetFrameworkVersion>v@FX_VERSION</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+@SIGNATURE@
</PropertyGroup>
- @SIGNATURE@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index 378d1c00db7..c60bc5397ce 100644 --- a/msvc/scripts/genproj.cs +++ b/msvc/scripts/genproj.cs @@ -915,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"). |