aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerghei Cebotari <serghei@cebotari.ru>2024-01-18 23:23:26 +0300
committerSerghei Cebotari <serghei@cebotari.ru>2024-01-18 23:23:26 +0300
commit84001e050c21458712717807c444ff44d3f583d9 (patch)
treeb742c739392b31b87a81f271dfdc2957422e65a6
parent7b2a5955d8a573bdd7b743571d46a338bcaf73e5 (diff)
Remove IntelliSense server
-rw-r--r--RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs17
-rw-r--r--RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs25
-rw-r--r--RhSolutions.AddIn/RhSolutions.AddIn.csproj1
3 files changed, 12 insertions, 31 deletions
diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
index a5ff466..cd62e22 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
@@ -1,14 +1,7 @@
using System.Net;
-using ExcelDna.IntelliSense;
-#if !NET472
-using System.Runtime.Versioning;
-#endif
namespace RhSolutions.AddIn;
-#if !NET472
-[SupportedOSPlatform("windows")]
-#endif
public sealed class RhSolutionsAddIn : IExcelAddIn
{
public static Application Excel { get; private set; }
@@ -55,11 +48,6 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
EventsUtil.Initialize();
- if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
- {
- IntelliSenseServer.Install();
- }
-
ServicePointManager.SecurityProtocol =
SecurityProtocolType.Tls12;
}
@@ -67,10 +55,5 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
public void AutoClose()
{
EventsUtil.Uninitialize();
-
- if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
- {
- IntelliSenseServer.Uninstall();
- }
}
}
diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
index 9bffcb1..0d69d42 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsFunctions.cs
@@ -5,8 +5,8 @@ public static class RhSolutionsFunctions
private static IDatabaseClient databaseClient = RhSolutionsAddIn.ServiceProvider.GetService<IDatabaseClient>();
private static ICurrencyClient currencyClient = RhSolutionsAddIn.ServiceProvider.GetRequiredService<ICurrencyClient>();
- [ExcelFunction(Description = "Поиск артикула в базе данных")]
- public static object РЕХАУ([ExcelArgument(Name = "СТРОКА", Description = "Ячейка с артикулом РЕХАУ или поисковый запрос в свободной форме")] string query)
+ [ExcelFunction]
+ public static object РЕХАУ(string query)
{
ProductSku.TryParse(query, out var skus);
@@ -45,8 +45,8 @@ public static class RhSolutionsFunctions
}
}
- [ExcelFunction(Description = "Выделить артикул РЕХАУ из ячейки")]
- public static object РЕХАУАРТИКУЛ([ExcelArgument(Name = "СТРОКА", Description = "Ячейка содержащая артикул РЕХАУ")] string query)
+ [ExcelFunction]
+ public static object РЕХАУАРТИКУЛ(string query)
{
if (ProductSku.TryParse(query, out var skus))
{
@@ -58,8 +58,8 @@ public static class RhSolutionsFunctions
}
}
- [ExcelFunction(Description = "Поиск названия по артикулу РЕХАУ")]
- public static object РЕХАУИМЯ([ExcelArgument(Name = "АРТИКУЛ", Description = "Ячейка содержащая артикул РЕХАУ")] string query)
+ [ExcelFunction]
+ public static object РЕХАУИМЯ(string query)
{
if (!ProductSku.TryParse(query, out var skus))
{
@@ -93,8 +93,8 @@ public static class RhSolutionsFunctions
}
}
- [ExcelFunction(Description = "Поиск цены артикула РЕХАУ в евро")]
- public static object РЕХАУЦЕНА([ExcelArgument(Name = "АРТИКУЛ", Description = "Ячейка содержащая артикул РЕХАУ")] string query)
+ [ExcelFunction]
+ public static object РЕХАУЦЕНА(string query)
{
if (!ProductSku.TryParse(query, out var skus))
{
@@ -128,9 +128,8 @@ public static class RhSolutionsFunctions
}
}
- [ExcelFunction(Description = "Поиск цены артикула РЕХАУ в рублях")]
- public static object РЕХАУЦЕНАРУБ([ExcelArgument(Name = "АРТИКУЛ", Description = "Ячейка содержащая артикул РЕХАУ")] string line,
- [ExcelArgument(Name = "ДАТА", Description = "Дата в формате Excel (необязательно)")] double dateField)
+ [ExcelFunction]
+ public static object РЕХАУЦЕНАРУБ(string line, double dateField)
{
if (!ProductSku.TryParse(line, out var skus))
{
@@ -180,8 +179,8 @@ public static class RhSolutionsFunctions
}
}
- [ExcelFunction(Description = "Получить курс евро по ЦБ")]
- public static object КУРСЕВРО([ExcelArgument(Name = "ДАТА", Description = "Дата в формате Excel (необязательно)")] double dateField)
+ [ExcelFunction]
+ public static object КУРСЕВРО(double dateField)
{
DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField);
diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
index 7d91dde..9babc24 100644
--- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj
+++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
@@ -30,7 +30,6 @@
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="ExcelDna.Integration" Version="1.7.0" />
- <PackageReference Include="ExcelDna.IntelliSense" Version="1.7.0" />
<PackageReference Include="ExcelDna.Interop" Version="15.0.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />