C#: Fix assembly labels when public key token is null.

calumgrant · calumgrant · commit d76a9805aeaf · 2019-03-18T17:59:56.000Z
diff --git a/csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs b/csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs
@@ -37,19 +37,21 @@ public Assembly(Context cx) : base(cx)
             if (!def.PublicKey.IsNil)
                 assemblyName.SetPublicKey(cx.mdReader.GetBlobBytes(def.PublicKey));
 
-            ShortId = cx.GetId(assemblyName.FullName) + "#file:///" + cx.assemblyPath.Replace("\\", "/");
+            ShortId = cx.GetId(FullName) + "#file:///" + cx.assemblyPath.Replace("\\", "/");
 
             file = new File(cx, cx.assemblyPath);
         }
 
         static readonly Id suffix = new StringId(";assembly");
 
+        string FullName => assemblyName.GetPublicKey() is null ? assemblyName.FullName + ", PublicKeyToken=null" : assemblyName.FullName;
+
         public override IEnumerable<IExtractionProduct> Contents
         {
             get
             {
                 yield return file;
-                yield return Tuples.assemblies(this, file, assemblyName.FullName, assemblyName.Name, assemblyName.Version.ToString());
+                yield return Tuples.assemblies(this, file, FullName, assemblyName.Name, assemblyName.Version.ToString());
 
                 if (cx.pdb != null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -37,19 +37,21 @@ public Assembly(Context cx) : base(cx)`
`37`	`37`	`if (!def.PublicKey.IsNil)`
`38`	`38`	`assemblyName.SetPublicKey(cx.mdReader.GetBlobBytes(def.PublicKey));`
`39`	`39`
`40`		`- ShortId = cx.GetId(assemblyName.FullName) + "#file:///" + cx.assemblyPath.Replace("\\", "/");`
	`40`	`+ ShortId = cx.GetId(FullName) + "#file:///" + cx.assemblyPath.Replace("\\", "/");`
`41`	`41`
`42`	`42`	`file = new File(cx, cx.assemblyPath);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`static readonly Id suffix = new StringId(";assembly");`
`46`	`46`
	`47`	`+ string FullName => assemblyName.GetPublicKey() is null ? assemblyName.FullName + ", PublicKeyToken=null" : assemblyName.FullName;`
	`48`	`+`
`47`	`49`	`public override IEnumerable<IExtractionProduct> Contents`
`48`	`50`	`{`
`49`	`51`	`get`
`50`	`52`	`{`
`51`	`53`	`yield return file;`
`52`		`- yield return Tuples.assemblies(this, file, assemblyName.FullName, assemblyName.Name, assemblyName.Version.ToString());`
	`54`	`+ yield return Tuples.assemblies(this, file, FullName, assemblyName.Name, assemblyName.Version.ToString());`
`53`	`55`
`54`	`56`	`if (cx.pdb != null)`
`55`	`57`	`{`