Usings simplify

RhSolutions.AddIn/AddIn/RhSolutionsFunction.cs

@@ -1,12 +1,5 @@
-using ExcelDna.Integration;
+namespace RhSolutions.AddIn;
-using Microsoft.Extensions.DependencyInjection;
-using RhSolutions.Models;
-using RhSolutions.Services;
-using System.Collections.Generic;
-using System.Linq;
 
-namespace RhSolutions.AddIn
-{
 public class RhSolutionsFunction
 {
     [ExcelFunction(Description = "Распознать артикул и попробовать найти его в прайс-листе")]
@@ -54,4 +47,3 @@ namespace RhSolutions.AddIn
         }
     }
 }
-}

RhSolutions.AddIn/Controllers/CombineTool.cs

@@ -1,13 +1,7 @@
-using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
-using RhSolutions.AddIn;
+
-using RhSolutions.Models;
+namespace RhSolutions.Controllers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
-namespace RhSolutions.Controllers
-{
 internal class CombineTool : ToolBase
 {
     private List<SourcePriceList> SourceFiles { get; set; }
@@ -63,4 +57,3 @@ namespace RhSolutions.Controllers
         }
     }
 }
-}

RhSolutions.AddIn/Controllers/ConvertTool.cs

@@ -1,7 +1,5 @@
-using RhSolutions.Models;
+namespace RhSolutions.Controllers;
 
-namespace RhSolutions.Controllers
-{
 internal class ConvertTool : ToolBase
 {
     private SourcePriceList Current { get; set; }
@@ -27,4 +25,3 @@ namespace RhSolutions.Controllers
         }
     }
 }
-}

RhSolutions.AddIn/Controllers/ExportTool.cs

@@ -1,12 +1,9 @@
-using Microsoft.Office.Interop.Excel;
+using RhSolutions.Models;
-using System;
 using System.Collections.Generic;
-using RhSolutions.Models;
 using System.Linq;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
-namespace RhSolutions.Controllers
+namespace RhSolutions.Controllers;
-{
+
 internal class ExportTool : ToolBase
 {
     private Dictionary<Product, double> PositionAmount;
@@ -97,5 +94,4 @@ namespace RhSolutions.Controllers
         }
     }
 }
-}
 

RhSolutions.AddIn/Controllers/RibbonController.cs

@@ -1,15 +1,11 @@
 using ExcelDna.Integration.CustomUI;
-using Microsoft.Office.Interop.Excel;
 using RhSolutions.AddIn;
-using RhSolutions.Services;
-using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
-namespace RhSolutions.Controllers
+namespace RhSolutions.Controllers;
-{
+
 [ComVisible(true)]
 public class RibbonController : ExcelRibbon
 {
@@ -129,4 +125,3 @@ namespace RhSolutions.Controllers
         return string.IsNullOrEmpty(name) ? "Нет файла шаблона!" : name;
     }
 }
-}

RhSolutions.AddIn/Controllers/ToolBase.cs

@@ -1,11 +1,4 @@
-using Microsoft.Office.Interop.Excel;
+using RhSolutions.AddIn;
-using RhSolutions.AddIn;
-using RhSolutions.Models;
-using RhSolutions.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
 namespace RhSolutions.Controllers
 {

RhSolutions.AddIn/Models/SourcePriceList.cs

@@ -1,13 +1,7 @@
-using ExcelDna.Integration;
+using System.IO;
-using Microsoft.Office.Interop.Excel;
+
-using System;
+namespace RhSolutions.Models;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
-namespace RhSolutions.Models
-{
 internal class SourcePriceList : PriceListBase
 {
     public Dictionary<Product, double> PositionAmount { get; private set; }
@@ -112,5 +106,4 @@ namespace RhSolutions.Models
         }
     }
 }
-}
 

RhSolutions.AddIn/Models/TargetPriceList.cs

@@ -1,11 +1,7 @@
-using Microsoft.Office.Interop.Excel;
+using System.IO;
-using System;
+
-using System.IO;
+namespace RhSolutions.Models;
-using System.Linq;
-using Range = Microsoft.Office.Interop.Excel.Range;
 
-namespace RhSolutions.Models
-{
 internal class TargetPriceList : PriceListBase
 {
     public Range OldSkuCell { get; private set; }
@@ -37,5 +33,4 @@ namespace RhSolutions.Models
         }
     }
 }
-}
 

RhSolutions.AddIn/Models/WorksheetExtensions.cs

@@ -1,9 +1,5 @@
-using Microsoft.Office.Interop.Excel;
+namespace RhSolutions.Services;
-using RhSolutions.Models;
-using System.Linq;
 
-namespace RhSolutions.Services
-{
 public static class WorksheetExtensions
 {
     public static bool IsRehauSource(this Worksheet worksheet)
@@ -37,5 +33,4 @@ namespace RhSolutions.Services
         }
     }
 }
-}
 

RhSolutions.AddIn/Usings.cs

@@ -1,5 +1,9 @@
 global using ExcelDna.Integration;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Office.Interop.Excel;
+global using RhSolutions.Models;
 global using RhSolutions.Services;
 global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using Range = Microsoft.Office.Interop.Excel.Range;