Minor fixes to StaticAnalysis

Author: cormacpayne

tools/StaticAnalysis/BreakingChangeAttributesAnalyzer/BreakingChangeAttributesAnalyzer.cs

@@ -12,6 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if !NETSTANDARD
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+#endif
 using StaticAnalysis.BreakingChangeAnalyzer;
 using System;
 using System.Collections.Generic;
@@ -229,7 +232,13 @@ private void LogBreakingChangesInModule(BreakingChangeAttributesInModule moduleD
             foreach (BreakingChangeAttributesInCmdlet cmdletData in moduleData.CmdletList)
             {
                 textForBreakingChangesInModule += string.Format(BREAKING_CHANGE_CMDLET_HEADER_FORMAT_STRING, cmdletData.CmdletName);
-            }
+#if !NETSTANDARD
+                foreach (GenericBreakingChangeAttribute attribute in cmdletData.BreakingChangeAttributes)
+                {
+                    textForBreakingChangesInModule += attribute.GetBreakingChangeTextFromAttribute(cmdletData.CmdletType, true) + "\n\n";
+                }
+#endif
+                }
 
             //Now that we have the text, add it to the log file
             logger.LogMessage(textForBreakingChangesInModule);

tools/StaticAnalysis/BreakingChangeAttributesAnalyzer/CmdletBreakingChangeAttributeLoader.cs

@@ -18,6 +18,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Management.Automation;
+#if !NETSTANDARD
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
+#endif
 using Tools.Common.Extensions;
 
 namespace StaticAnalysis.BreakingChangeAttributesAnalyzer
@@ -37,6 +40,9 @@ public class BreakingChangeAttributesInCmdlet
     {
         public Type CmdletType { get; set; }
         public string CmdletName { get; set; }
+#if !NETSTANDARD
+        public List<GenericBreakingChangeAttribute> BreakingChangeAttributes { get; set; }
+#endif
     }
 
     public class CmdletBreakingChangeAttributeLoader : MarshalByRefObject
@@ -56,11 +62,19 @@ public BreakingChangeAttributesInModule GetModuleBreakingChangeAttributes(string
                 foreach (var type in assembly.GetCmdletTypes())
                 {
                     var cmdlet = type.GetAttribute<CmdletAttribute>();
+#if !NETSTANDARD
+                    var attributes = type.GetAttributes<GenericBreakingChangeAttribute>();
+
+                    if (attributes != null && (attributes.Count() > 0)) { }
+#endif
                     var cmdletMetadata = new BreakingChangeAttributesInCmdlet
                     {
                         CmdletType = type,
-                        CmdletName = cmdlet.VerbName + "-" + cmdlet.NounName
-                    };
+                        CmdletName = cmdlet.VerbName + "-" + cmdlet.NounName,
+#if !NETSTANDARD
+                        BreakingChangeAttributes = attributes.ToList()
+#endif
+                        };
 
                     results.Add(cmdletMetadata);
                 }

tools/Tools.Common/Loaders/AssemblyLoader.cs

@@ -73,10 +73,10 @@ public AssemblyMetadata GetReflectedAssemblyFromFile(string assemblyPath)
 #else
                 return new AssemblyMetadata(AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath));
             }
-            catch(System.IO.FileLoadException ex) when (string.Equals(ex.Message, "Assembly with same name is already loaded"))
+            catch(System.IO.FileLoadException ex) when (ex != null && string.Equals(ex.Message, "Assembly with same name is already loaded"))
             {
                 var assemblyName = AssemblyLoadContext.GetAssemblyName(assemblyPath);
-                var assembly = AppDomain.CurrentDomain.GetAssemblies().Where(a => a.GetName().Name == assemblyName.Name).FirstOrDefault();
+                var assembly = AppDomain.CurrentDomain.GetAssemblies().Where(a => a.GetName().Name == assemblyName?.Name).FirstOrDefault();
                 if (assembly != null)
                 {
                     result = new AssemblyMetadata(assembly);