RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs

@@ -55,9 +55,15 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
 
         EventsUtil.Initialize();
 
-        if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
+        bool isTesting = Environment.GetEnvironmentVariable("ISTESTING") switch
         {
-            IntelliSenseServer.Install();
+            "true" => true,
+            "false" => false,
+            _ => false
+        };
+        if (!isTesting)
+        {
+            //IntelliSenseServer.Install();
         }
 
         ServicePointManager.SecurityProtocol =
@@ -68,9 +74,15 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
     {
         EventsUtil.Uninitialize();
 
-        if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
+        bool isTesting = Environment.GetEnvironmentVariable("ISTESTING") switch
         {
-            IntelliSenseServer.Uninstall();
+            "true" => true,
+            "false" => false,
+            _ => false
+        };
+        if (!isTesting)
+        {
+            //IntelliSenseServer.Uninstall();
         }
     }
 }

RhSolutions.AddIn/Controllers/RibbonController.cs

@@ -20,21 +20,21 @@ public class RibbonController : ExcelRibbon
     public override string GetCustomUI(string RibbonID)
     {
         return @"
-      <customUI onLoad='RibbonLoad' xmlns='http://schemas.microsoft.com/office/2006/01/customui' loadImage='LoadImage'>
+      <customUI onLoad='RibbonLoad' xmlns='http://schemas.microsoft.com/office/2006/01/customui'>
       <ribbon>
         <tabs>
           <tab id='rau' label='RhSolutions'>
             <group id='priceList' label='Прайс-лист'>
-                <button id='export' getEnabled='GetExportEnabled' label='Экспорт в новый файл' size='normal' image='RhSolutions' onAction='OnToolPressed'/> 
+                <button id='export' getEnabled='GetExportEnabled' label='Экспорт в новый файл' size='normal' imageMso='PivotExportToExcel' onAction='OnToolPressed'/> 
                 <button id='convert' getEnabled='GetConvertEnabled' label='Актуализировать' size='normal' imageMso='FileUpdate' onAction='OnToolPressed'/> 
                 <button id='merge' label='Объединить' size='normal' imageMso='Copy' onAction='OnToolPressed'/> 
                 <button id='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='normal' imageMso='ControlWizards' onAction='OnToolPressed'/>
                 <button id='fillsleeves' getEnabled='GetFittingsCalcEnabled' label='Подобрать гильзы' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
                 <button id='fillcouplings' getEnabled='GetFittingsCalcEnabled' label='Подобрать муфты' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
-                <button id='dxfexport' getEnabled='GetDxfEnabled' label='Экспортировать в DXF' size='normal' image='DXF' onAction='OnToolPressed'/>
+                <button id='dxfexport' getEnabled='GetDxfEnabled' label='Экспортировать в DXF' size='normal' imageMso='ExportExcel' onAction='OnToolPressed'/>
             </group>
             <group id='rausettings' getLabel='GetVersionLabel'>
-                <button id='setPriceList' getLabel='GetPriceListPathLabel' size='large' image='RhSolutions' onAction='OnSetPricePressed'/>
+                <button id='setPriceList' getLabel='GetPriceListPathLabel' size='large' imageMso='TableExcelSpreadsheetInsert' onAction='OnSetPricePressed'/>
             </group>
           </tab>
         </tabs>

RhSolutions.AddIn/RhSolutions-AddIn.dna

@@ -22,7 +22,5 @@
 	<Reference Path="System.Numerics.Vectors.dll" Pack="true" />
 	<Reference Path="System.Runtime.CompilerServices.Unsafe.dll" Pack="true" />
 	<Reference Path="System.Threading.Tasks.Extensions.dll" Pack="true" />
-	<Reference Path="System.ValueTuple.dll" Pack="true" />
-	<Image Name='RhSolutions' Path='Images\RhSolutions.png' Pack='true' />
-	<Image Name='DXF' Path='Images\DXF.png' Pack='true' />
+	<Reference Path="System.ValueTuple.dll" Pack="true" />	
 </DnaLibrary>

RhSolutions.AddIn/RhSolutions.AddIn.csproj

@@ -45,12 +45,4 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <None Update="Images\DXF.png">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	  <None Update="Images\RhSolutions.png">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
 </Project>

RhSolutions.Tests/.runsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+	<RunConfiguration>
+		<EnvironmentVariables>
+			<ISTESTING>true</ISTESTING>
+		</EnvironmentVariables>
+	</RunConfiguration>
+</RunSettings>

RhSolutions.Tests/CanDoGuess.cs

@@ -13,7 +13,6 @@ public class CanDoGuess : IDisposable
 
     public CanDoGuess()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _addIn.AutoOpen();
         _guessReader = new GuessReader(Util.Application);

RhSolutions.Tests/CanFillCouplings.cs

@@ -13,7 +13,6 @@ public class CanFillCouplings : IDisposable
 
     public CanFillCouplings()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _addIn.AutoOpen();
         _calculator = new CouplingsCalculator();

RhSolutions.Tests/CanFillSleeves.cs

@@ -13,7 +13,6 @@ public class CanFillSleeves : IDisposable
 
     public CanFillSleeves()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _addIn.AutoOpen();
         _calculator = new SleevesCalculator();

RhSolutions.Tests/CanReadProducts.cs

@@ -12,7 +12,6 @@ public class CanReadProducts : IDisposable
 
     public CanReadProducts()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _testWorkbook = Util.Application.Workbooks.Add();
         _addIn.AutoOpen();

RhSolutions.Tests/CanWriteProducts.cs

@@ -12,7 +12,6 @@ public class CanWriteProducts : IDisposable
 
     public CanWriteProducts()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _addIn.AutoOpen();
         _reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);

RhSolutions.Tests/RealPricelistTest.cs

@@ -12,7 +12,6 @@ public class RealPricelistTest : IDisposable
 
     public RealPricelistTest()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new();
         _addIn.AutoOpen();
         _reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);

RhSolutions.Tests/WorkbookValidationTests.cs

@@ -10,7 +10,6 @@ public class WorkbookValidationTests : IDisposable
 
     public WorkbookValidationTests()
     {
-        Environment.SetEnvironmentVariable("ISTESTING", "true");
         _addIn = new RhSolutionsAddIn();
         _addIn.AutoOpen();
         Util.Application.Workbooks.Add();