diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 02:47:47 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-26 13:32:21 -0700 |
| commit | f01d284101e95d490497062c2dc9065423d0cf37 (patch) | |
| tree | 39e5516a836ccd3436c117f790e7c5374e59a6b2 /src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs | |
| parent | 98bdcfac8bd4f699bc6865abd283f710943e77bc (diff) | |
| download | wix-f01d284101e95d490497062c2dc9065423d0cf37.tar.gz wix-f01d284101e95d490497062c2dc9065423d0cf37.tar.bz2 wix-f01d284101e95d490497062c2dc9065423d0cf37.zip | |
Fix MsiAssembly table processing
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs index 0df1a7e9..759ba303 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AssemblyName.cs | |||
| @@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 16 | this.Architecture = architecture; | 16 | this.Architecture = architecture; |
| 17 | 17 | ||
| 18 | this.StrongNamedSigned = !String.IsNullOrEmpty(publicKeyToken); | 18 | this.StrongNamedSigned = !String.IsNullOrEmpty(publicKeyToken); |
| 19 | this.PublicKeyToken = publicKeyToken ?? "null"; | 19 | this.PublicKeyToken = publicKeyToken; |
| 20 | this.Type = type; | 20 | this.Type = type; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| @@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 46 | assemblyName.Append(", Culture="); | 46 | assemblyName.Append(", Culture="); |
| 47 | assemblyName.Append(this.Culture); | 47 | assemblyName.Append(this.Culture); |
| 48 | assemblyName.Append(", PublicKeyToken="); | 48 | assemblyName.Append(", PublicKeyToken="); |
| 49 | assemblyName.Append(this.PublicKeyToken); | 49 | assemblyName.Append(this.PublicKeyToken ?? "null"); |
| 50 | 50 | ||
| 51 | if (!String.IsNullOrEmpty(this.Architecture)) | 51 | if (!String.IsNullOrEmpty(this.Architecture)) |
| 52 | { | 52 | { |