Fix build after cherry-pick

Author: govert

Source/ExcelDna.Integration/AssemblyLoader.cs

@@ -90,7 +90,7 @@ public static void ProcessAssemblies(
                             GetExcelMethods(type, explicitExports, methods, excelFunctionsExtendedRegistration);
                             GetExcelFunctionExecutionHandlerSelectors(type, excelFunctionExecutionHandlerSelectors);
                         }
-                        GetExcelAddIns(assembly, type, loadRibbons, addIns);
+                        GetExcelAddIns(assembly, type, addIns);
                         GetRtdServerTypes(type, rtdServerTypes, out isRtdServer);
                         GetComClassTypes(assembly, type, attribs, isRtdServer, comClassTypes);
                     }
@@ -306,7 +306,7 @@ public class ExcelAddInInfo
             public DnaLibrary ParentDnaLibrary;
         }
 
-        static public void GetExcelAddIns(ExportedAssembly assembly, Type t, bool loadRibbons, List<ExcelAddInInfo> addIns)
+        static public void GetExcelAddIns(ExportedAssembly assembly, Type t, List<ExcelAddInInfo> addIns)
         {
             // NOTE: We probably should have restricted this to public types, but didn't. Now it's too late.
             //       So internal classes that implement IExcelAddIn are also loaded.
@@ -320,7 +320,7 @@ static public void GetExcelAddIns(ExportedAssembly assembly, Type t, bool loadRi
 
                 Type addInType = t.GetInterface("ExcelDna.Integration.IExcelAddIn");
                 bool isRibbon = IsRibbonType(t);
-                if (addInType != null || (isRibbon && loadRibbons))
+                if (addInType != null || isRibbon)
                 {
                     ExcelAddInInfo info = new ExcelAddInInfo();
                     if (addInType != null)

Source/Tests/ExcelDna.RuntimeTests/UI.cs

@@ -7,7 +7,7 @@ namespace ExcelDna.RuntimeTests
 {
     public class UI
     {
-        [ExcelFact(Workbook = "", AddIn = AddInPath.RuntimeTests)]
+        [ExcelFact(Workbook = "", AddIn = @"..\..\..\..\ExcelDna.AddIn.RuntimeTests\bin\Debug\net6.0-windows\ExcelDna.AddIn.RuntimeTests-AddIn")]
         public void Command()
         {
             CommandBarPopup? menu = FindPopupMenu("ExcelDna.AddIn.RuntimeTests add-in");