Merge pull request #12536 from jaredpar/tool

Fix a bad merge

src/Tools/SignRoslyn/BinaryData.json

@@ -45,7 +45,6 @@
                 "Microsoft.VisualStudio.VisualBasic.Repl.dll",
                 "Microsoft.VisualStudio.VsInteractiveWindow.dll",
                 "Pdb2Xml.exe",
-                "Roslyn.VisualStudio.Setup.Interactive.dll",
                 "Roslyn.Compilers.Extension.dll",
                 "Roslyn.Hosting.Diagnostics.dll",
                 "Roslyn.VisualStudio.DiagnosticsWindow.dll",

src/Tools/SignRoslyn/Program.cs

@@ -37,15 +37,29 @@ internal static SignData ReadSignData(string rootBinaryPath)
                 var serializer = new JsonSerializer();
                 var fileJson = (Json.FileJson)serializer.Deserialize(file, typeof(Json.FileJson));
                 var map = new Dictionary<string, FileSignData>();
+                var allGood = false;
                 foreach (var item in fileJson.SignList)
                 {
                     var data = new FileSignData(certificate: item.Certificate, strongName: item.StrongName);
                     foreach (var name in item.FileList)
                     {
-                        map.Add(name, data);
+                        if (map.ContainsKey(name))
+                        {
+                            Console.WriteLine($"Duplicate file entry: {name}");
+                            allGood = false;
+                        }
+                        else
+                        {
+                            map.Add(name, data);
+                        }
                     }
                 }
 
+                if (!allGood)
+                {
+                    Environment.Exit(1);
+                }
+
                 return new SignData(rootBinaryPath, map, fileJson.ExcludeList);
             }
         }