From 964bb01a80bb2d6e1046a206716d5852e49c43da Mon Sep 17 00:00:00 2001
From: Serghei Cebotari <serghei@cebotari.ru>
Date: Sun, 21 Jan 2024 15:14:35 +0300
Subject: [PATCH] Revert "Refactoring Excel application field"

This reverts commit 56112eae51349ce88cc4ec0c34f6269cc821f0d0.
---
 RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
index 0edfe07..983c0e6 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
@@ -4,7 +4,7 @@ namespace RhSolutions.AddIn;
 
 public sealed class RhSolutionsAddIn : IExcelAddIn
 {
-    public static readonly Application Excel = (Application)ExcelDnaUtil.Application;
+    public static Application Excel { get; private set; }
     public static ServiceProvider ServiceProvider { get; private set; }
     public static IAddInConfiguration Configuration { get; private set; }
 
@@ -14,6 +14,7 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
 
         Services.AddHttpClient()
             .AddMemoryCache()
+            .AddSingleton((Application)ExcelDnaUtil.Application)
             .AddSingleton<IAddInConfiguration, AddInConfiguration>()
             .AddSingleton<IDatabaseClient, DatabaseClient>()
             .AddSingleton<ICurrencyClient, CurrencyClient>()
@@ -43,6 +44,7 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
 
         ServiceProvider = Services.BuildServiceProvider();
         Configuration = ServiceProvider.GetService<IAddInConfiguration>();
+        Excel = ServiceProvider.GetService<Application>();
 
         EventsUtil.Initialize();