Move to .net6

10 files changed, 26 insertions, 121 deletions

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DnaLibrary Name="RhXlPLugin" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2020/07/dnalibrary">
-  <ExternalLibrary Path="RhXlPLugin.dll" ExplicitRegistration="true" LoadFromBytes="true" Pack="true" IncludePdb="false" />
-  <Reference Path="ExcelDna.Registration.dll" Pack="true" />
-  <Reference Path="ExcelDna.IntelliSense.dll" Pack="true" />
-</DnaLibrary>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.props" Condition="Exists('..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}</ProjectGuid>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RhSolutions.AddIn</RootNamespace>
     <AssemblyName>RhSolutions.AddIn</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ExcelDna.Integration, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDna.Integration.1.6.0\lib\net452\ExcelDna.Integration.dll</HintPath>
-    </Reference>
-    <Reference Include="ExcelDna.IntelliSense, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f225e9659857edbe, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDna.IntelliSense.1.6.0\lib\net452\ExcelDna.IntelliSense.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Office.Interop.Excel.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.Vbe.Interop, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDna.Interop.15.0.0\lib\net452\Microsoft.Vbe.Interop.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\ExcelDna.Interop.15.0.0\lib\net452\Office.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Services\EventsUtil.cs" />
-    <Compile Include="Services\RhDatabaseClient.cs" />
-    <Compile Include="Models\Sku.cs" />
-    <Compile Include="Models\StatusbarBase.cs" />
-    <Compile Include="Models\Dialog.cs" />
-    <Compile Include="Services\RegistryUtil.cs" />
-    <Compile Include="Models\ProgressBar.cs" />
-    <Compile Include="Models\ResultBar.cs" />
-    <Compile Include="Controllers\CombineTool.cs" />
-    <Compile Include="Controllers\ConvertTool.cs" />
-    <Compile Include="Models\Product.cs" />
-    <Compile Include="Controllers\ToolBase.cs" />
-    <Compile Include="Controllers\MergeTool.cs" />
-    <Compile Include="Models\PriceListBase.cs" />
-    <Compile Include="Models\PriceListHeaders.cs" />
-    <Compile Include="Models\SourcePriceList.cs" />
-    <Compile Include="Models\TargetPriceList.cs" />
-    <Compile Include="Controllers\RibbonController.cs" />
-    <Compile Include="Controllers\ExportTool.cs" />
-    <Compile Include="AddIn\RhSolutionsAddIn.cs" />
-    <Compile Include="AddIn\Functions.cs" />
-    <Compile Include="Models\WorksheetExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="RhSolutions-AddIn.dna" />
-    <None Include="packages.config" />
-    <None Include="Properties\ExcelDna.Build.props" />
+    <PackageReference Include="ExcelDna.AddIn" Version="1.6.0" />
+    <PackageReference Include="ExcelDna.IntelliSense" Version="1.6.0" />
+    <PackageReference Include="ExcelDna.Interop" Version="15.0.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets" Condition="Exists('packages\ExcelDna.AddIn.1.5.1\build\ExcelDna.AddIn.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>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}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\ExcelDna.Interop.15.0.0\build\ExcelDna.Interop.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.Interop.15.0.0\build\ExcelDna.Interop.targets'))" />
-    <Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.props'))" />
-    <Error Condition="!Exists('..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets'))" />
-  </Target>
-  <Import Project="..\packages\ExcelDna.Interop.15.0.0\build\ExcelDna.Interop.targets" Condition="Exists('..\packages\ExcelDna.Interop.15.0.0\build\ExcelDna.Interop.targets')" />
-  <Import Project="..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets')" />
 </Project>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ExcelDna.AddIn" version="1.6.0" targetFramework="net48" />
-  <package id="ExcelDna.Integration" version="1.6.0" targetFramework="net48" />
-  <package id="ExcelDna.IntelliSense" version="1.6.0" targetFramework="net48" />
-  <package id="ExcelDna.Interop" version="15.0.0" targetFramework="net48" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
-</packages>
\ No newline at end of file