clean up

Author: trgiangv

RevitDevTool.sln

@@ -68,10 +68,10 @@ Global
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R24|Any CPU.Build.0 = Debug R24|Any CPU
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R25|Any CPU.ActiveCfg = Debug R25|Any CPU
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R25|Any CPU.Build.0 = Debug R25|Any CPU
-								{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R26|Any CPU.ActiveCfg = Debug R26|Any CPU
-								{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R26|Any CPU.Build.0 = Debug R26|Any CPU
-								{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R21|Any CPU.ActiveCfg = Release R21|Any CPU
-								{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R21|Any CPU.Build.0 = Release R21|Any CPU
+        {DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R26|Any CPU.ActiveCfg = Debug R26|Any CPU
+        {DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Debug R26|Any CPU.Build.0 = Debug R26|Any CPU
+        {DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R21|Any CPU.ActiveCfg = Release R21|Any CPU
+        {DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R21|Any CPU.Build.0 = Release R21|Any CPU
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R22|Any CPU.ActiveCfg = Release R22|Any CPU
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R22|Any CPU.Build.0 = Release R22|Any CPU
 		{DD53351A-AD4D-48A0-897F-EA44F84A6A52}.Release R23|Any CPU.ActiveCfg = Release R23|Any CPU

install/Installer.cs

@@ -21,7 +21,7 @@
     Version = Assembly.GetExecutingAssembly().GetName().Version.ClearRevision(),
     ControlPanelInfo =
     {
-        Manufacturer = Environment.UserName,
+        Manufacturer = projectName,
         ProductIcon = @"install\Resources\Icons\ShellIcon.ico"
     }
 };

source/RevitDevTool/Models/ConsoleRedirector.cs

@@ -39,21 +39,14 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    private class ConsoleTextWriter : TextWriter
+    private class ConsoleTextWriter(TraceEventType eventType) : TextWriter
     {
-        private readonly TraceEventType _eventType;
-
-        public ConsoleTextWriter(TraceEventType eventType)
-        {
-            _eventType = eventType;
-        }
-
         public override void Write(string? value)
         {
             if (string.IsNullOrEmpty(value))
                 return;
 
-            switch (_eventType)
+            switch (eventType)
             {
                 case TraceEventType.Error:
                 case TraceEventType.Critical:

source/RevitDevTool/Models/SerilogTraceListener.cs

@@ -3,6 +3,7 @@
 using System.Globalization;
 using Serilog;
 using Serilog.Events;
+// ReSharper disable UnusedMember.Local
 
 namespace RevitDevTool.Models;
 
@@ -140,8 +141,7 @@ public override void TraceEvent(
         if (!ShouldTrace(eventCache, source, eventType, id, format, args, null, null))
             return;
         var traceProperties = CreateTraceProperties(source, eventType, id);
-        Exception exception;
-        AddFormatArgs(traceProperties, args, out exception);
+        AddFormatArgs(traceProperties, args, out var exception);
         Write(eventType, exception, format, traceProperties);
     }
 
@@ -219,21 +219,21 @@ private void AddFormatArgs(
         }
     }
 
-    private IList<LogEventProperty> CreateFailProperties()
+    private List<LogEventProperty> CreateFailProperties()
     {
         var properties = CreateProperties();
         SafeAddProperty(properties, "TraceEventType", "Fail");
         return properties;
     }
 
-    private IList<LogEventProperty> CreateProperties()
+    private List<LogEventProperty> CreateProperties()
     {
         var properties = new List<LogEventProperty>();
         SafeAddProperty(properties, "ActivityId", Trace.CorrelationManager.ActivityId);
         return properties;
     }
 
-    private IList<LogEventProperty> CreateTraceProperties(
+    private List<LogEventProperty> CreateTraceProperties(
         string source,
         TraceEventType eventType,
         int id)
@@ -247,8 +247,7 @@ private IList<LogEventProperty> CreateTraceProperties(
 
     private void SafeAddProperty(IList<LogEventProperty> properties, string name, object value)
     {
-        LogEventProperty property;
-        if (!(_logger ?? Log.Logger).BindProperty(name, value, false, out property))
+        if (!(_logger ?? Log.Logger).BindProperty(name, value, false, out var property))
             return;
         properties.Add(property);
     }
@@ -268,11 +267,9 @@ private void Write(
         string messageTemplate,
         IList<LogEventProperty> properties)
     {
-        if (messageTemplate == null)
-            messageTemplate = string.Empty;
+        messageTemplate ??= string.Empty;
         var logger = _logger ?? Log.Logger;
-        MessageTemplate parsedTemplate;
-        if (!logger.BindMessageTemplate(messageTemplate, null, out parsedTemplate, out var _))
+        if (!logger.BindMessageTemplate(messageTemplate, null, out var parsedTemplate, out _))
             return;
         var logEvent = new LogEvent(DateTimeOffset.Now, level, exception, parsedTemplate, properties);
         logger.Write(logEvent);

source/RevitDevTool/RevitDevTool.addin

@@ -3,11 +3,12 @@
     <AddIn Type="Application">
         <Name>RevitDevTool</Name>
         <Assembly>RevitDevTool/RevitDevTool.dll</Assembly>
-        <ClientId>1773964F-5248-45E5-B893-55A2C89334E2</ClientId>
+        <AddInId>1773964F-5248-45E5-B893-55A2C89334E2</AddInId>
         <FullClassName>RevitDevTool.Application</FullClassName>
+        <VisibilityMode>AlwaysVisible</VisibilityMode>
         <Text>RevitDevTool</Text>
-        <VendorId>Zhuangkh</VendorId>
-        <VendorDescription>Zhuangkh, zhuangkh.com</VendorDescription>
+        <VendorId>RevitDevTool</VendorId>
+        <VendorDescription>RevitDevTool</VendorDescription>
     </AddIn>
     <ManifestSettings>
         <UseRevitContext>False</UseRevitContext>

source/RevitDevTool/Theme/ThemeBundle.cs

@@ -1,4 +1,3 @@
-using Autodesk.Revit.UI;
 using MaterialDesignThemes.Wpf;
 
 namespace RevitDevTool.Theme;
@@ -7,12 +6,16 @@ public class ThemeBundle : BundledTheme
 {
     public ThemeBundle()
     {
-        BaseTheme = UIThemeManager.CurrentTheme switch
+#if REVIT2024_OR_GREATER
+        BaseTheme = Autodesk.Revit.UI.UIThemeManager.CurrentTheme switch
         {
-            UITheme.Light => MaterialDesignThemes.Wpf.BaseTheme.Light,
-            UITheme.Dark => MaterialDesignThemes.Wpf.BaseTheme.Dark,
+            Autodesk.Revit.UI.UITheme.Light => MaterialDesignThemes.Wpf.BaseTheme.Light,
+            Autodesk.Revit.UI.UITheme.Dark => MaterialDesignThemes.Wpf.BaseTheme.Dark,
             _ => throw new ArgumentOutOfRangeException()
         };
+#else
+        BaseTheme = MaterialDesignThemes.Wpf.BaseTheme.Light;
+#endif
         PrimaryColor = MaterialDesignColors.PrimaryColor.Orange;
         SecondaryColor = MaterialDesignColors.SecondaryColor.Amber;
         ColorAdjustment = new ColorAdjustment();