From 01b2e4665136e519d3b35ca4cd1199d8616a4b85 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 8 Feb 2023 15:59:30 +0300 Subject: [PATCH] Move to .net6 --- src/Controllers/CombineTool.cs | 1 + src/Controllers/ExportTool.cs | 1 + src/Controllers/RibbonController.cs | 1 + src/Controllers/ToolBase.cs | 1 + src/Models/SourcePriceList.cs | 1 + src/Models/TargetPriceList.cs | 1 + src/Properties/launchSettings.json | 9 +++ src/RehauSku.Assist-AddIn.dna | 6 -- src/RhSolutions.csproj | 117 +++------------------------- src/packages.config | 9 --- 10 files changed, 26 insertions(+), 121 deletions(-) create mode 100644 src/Properties/launchSettings.json delete mode 100644 src/RehauSku.Assist-AddIn.dna delete mode 100644 src/packages.config diff --git a/src/Controllers/CombineTool.cs b/src/Controllers/CombineTool.cs index 75c0f51..4d84d44 100644 --- a/src/Controllers/CombineTool.cs +++ b/src/Controllers/CombineTool.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; using Dialog = RhSolutions.Models.Dialog; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Controllers { diff --git a/src/Controllers/ExportTool.cs b/src/Controllers/ExportTool.cs index cb5aefb..e2bbde4 100644 --- a/src/Controllers/ExportTool.cs +++ b/src/Controllers/ExportTool.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using RhSolutions.Models; using System.Linq; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Controllers { diff --git a/src/Controllers/RibbonController.cs b/src/Controllers/RibbonController.cs index 1175e91..148daca 100644 --- a/src/Controllers/RibbonController.cs +++ b/src/Controllers/RibbonController.cs @@ -7,6 +7,7 @@ using System.IO; using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Controllers { diff --git a/src/Controllers/ToolBase.cs b/src/Controllers/ToolBase.cs index 1d92871..08493d4 100644 --- a/src/Controllers/ToolBase.cs +++ b/src/Controllers/ToolBase.cs @@ -5,6 +5,7 @@ using RhSolutions.Services; using System; using System.Collections.Generic; using System.Linq; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Controllers { diff --git a/src/Models/SourcePriceList.cs b/src/Models/SourcePriceList.cs index 1e47759..dc950eb 100644 --- a/src/Models/SourcePriceList.cs +++ b/src/Models/SourcePriceList.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Models { diff --git a/src/Models/TargetPriceList.cs b/src/Models/TargetPriceList.cs index 163d429..2dcd48e 100644 --- a/src/Models/TargetPriceList.cs +++ b/src/Models/TargetPriceList.cs @@ -2,6 +2,7 @@ using System; using System.IO; using System.Linq; +using Range = Microsoft.Office.Interop.Excel.Range; namespace RhSolutions.Models { diff --git a/src/Properties/launchSettings.json b/src/Properties/launchSettings.json new file mode 100644 index 0000000..c36dbc3 --- /dev/null +++ b/src/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "Excel": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Microsoft Office\\root\\Office16\\EXCEL.EXE", + "commandLineArgs": "RhSolutions-AddIn64.xll" + } + } +} \ No newline at end of file diff --git a/src/RehauSku.Assist-AddIn.dna b/src/RehauSku.Assist-AddIn.dna deleted file mode 100644 index f283d24..0000000 --- a/src/RehauSku.Assist-AddIn.dna +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/RhSolutions.csproj b/src/RhSolutions.csproj index 9d07f05..8aa73cc 100644 --- a/src/RhSolutions.csproj +++ b/src/RhSolutions.csproj @@ -1,126 +1,31 @@ - - - - + - Debug - AnyCPU - {18A2FF67-0E46-4A86-B872-29F2B3F23ADF} + net6.0-windows Library - Properties RhSolutions.AddIn RhSolutions.AddIn - v4.8 - 512 - true - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + true + true - - ..\packages\ExcelDna.Integration.1.6.0\lib\net452\ExcelDna.Integration.dll - - - ..\packages\ExcelDna.IntelliSense.1.6.0\lib\net452\ExcelDna.IntelliSense.dll - - - ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Office.Interop.Excel.dll - True - - - ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Vbe.Interop.dll - True - - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\ExcelDna.Interop.15.0.0\lib\net452\Office.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/packages.config b/src/packages.config deleted file mode 100644 index 74be17f..0000000 --- a/src/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file