Rename project

27 files changed, 66 insertions, 44 deletions

diff --git a/RhXlPLugin.sln b/RhSolutions.sln
index d5d77c2..e1850b4 100644
--- a/RhXlPLugin.sln
+++ b/RhSolutions.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RehauSku.Assist", "src\RehauSku.Assist.csproj", "{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhSolutions", "src\RhSolutions.csproj", "{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/AddIn/AddIn.cs b/src/AddIn/AddIn.cs
index a60fc9e..5486103 100644
--- a/src/AddIn/AddIn.cs
+++ b/src/AddIn/AddIn.cs
@@ -5,7 +5,7 @@ using Microsoft.Office.Interop.Excel;
 using System.Net.Http;
 using System.Runtime.Caching;
 
-namespace RehauSku
+namespace RhSolutions
 {
     class AddIn : IExcelAddIn
     {
diff --git a/src/AddIn/EventsUtil.cs b/src/AddIn/EventsUtil.cs
index c10a69a..3ceccfd 100644
--- a/src/AddIn/EventsUtil.cs
+++ b/src/AddIn/EventsUtil.cs
@@ -1,6 +1,6 @@
 using Microsoft.Office.Interop.Excel;
 
-namespace RehauSku
+namespace RhSolutions
 {
     internal static class EventsUtil
     {
diff --git a/src/AddIn/Functions.cs b/src/AddIn/Functions.cs
index 54d50a5..804e1c9 100644
--- a/src/AddIn/Functions.cs
+++ b/src/AddIn/Functions.cs
@@ -7,7 +7,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace RehauSku
+namespace RhSolutions
 {
     public class Functions
     {
diff --git a/src/AddIn/RegistryUtil.cs b/src/AddIn/RegistryUtil.cs
index 54e071e..e848462 100644
--- a/src/AddIn/RegistryUtil.cs
+++ b/src/AddIn/RegistryUtil.cs
@@ -1,10 +1,10 @@
 using Microsoft.Win32;
-using RehauSku.Interface;
+using RhSolutions.Interface;
 using System;
 using System.IO;
 using System.Windows.Forms;
 
-namespace RehauSku
+namespace RhSolutions
 {
     static class RegistryUtil
     {
diff --git a/src/AddIn/RehauSku.cs b/src/AddIn/RehauSku.cs
index 40e5d30..68d95b7 100644
--- a/src/AddIn/RehauSku.cs
+++ b/src/AddIn/RehauSku.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace RehauSku
+namespace RhSolutions
 {
     internal class RauSku
     {
diff --git a/src/AddIn/SkuExtensions.cs b/src/AddIn/SkuExtensions.cs
index c7fe2bc..2e97406 100644
--- a/src/AddIn/SkuExtensions.cs
+++ b/src/AddIn/SkuExtensions.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace RehauSku
+namespace RhSolutions
 {
     static class SkuExtensions
     {
diff --git a/src/AddIn/WorksheetExtensions.cs b/src/AddIn/WorksheetExtensions.cs
index 7880b66..b07e2c1 100644
--- a/src/AddIn/WorksheetExtensions.cs
+++ b/src/AddIn/WorksheetExtensions.cs
@@ -1,8 +1,8 @@
 using Microsoft.Office.Interop.Excel;
-using RehauSku.PriceListTools;
+using RhSolutions.PriceListTools;
 using System.Linq;
 
-namespace RehauSku
+namespace RhSolutions
 {
     public static class WorksheetExtensions
     {
diff --git a/src/Interface/AbstractBar.cs b/src/Interface/AbstractBar.cs
index dda7ea1..9a06e03 100644
--- a/src/Interface/AbstractBar.cs
+++ b/src/Interface/AbstractBar.cs
@@ -2,7 +2,7 @@
 using Microsoft.Office.Interop.Excel;
 using System;
 
-namespace RehauSku.Interface
+namespace RhSolutions.Interface
 {
     internal abstract class AbstractBar : IDisposable
     {
diff --git a/src/Interface/Dialog.cs b/src/Interface/Dialog.cs
index 95d676f..992368c 100644
--- a/src/Interface/Dialog.cs
+++ b/src/Interface/Dialog.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace RehauSku.Interface
+namespace RhSolutions.Interface
 {
     static class Dialog
     {
diff --git a/src/Interface/ProgressBar.cs b/src/Interface/ProgressBar.cs
index f0f2985..f703c65 100644
--- a/src/Interface/ProgressBar.cs
+++ b/src/Interface/ProgressBar.cs
@@ -1,4 +1,4 @@
-namespace RehauSku.Interface
+namespace RhSolutions.Interface
 {
     internal class ProgressBar : AbstractBar
     {
diff --git a/src/Interface/ResultBar.cs b/src/Interface/ResultBar.cs
index f59eb0a..f085e3d 100644
--- a/src/Interface/ResultBar.cs
+++ b/src/Interface/ResultBar.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace RehauSku.Interface
+namespace RhSolutions.Interface
 {
     internal class ResultBar : AbstractBar
     {
diff --git a/src/Interface/RibbonController.cs b/src/Interface/RibbonController.cs
index 9c83d37..ef45cb0 100644
--- a/src/Interface/RibbonController.cs
+++ b/src/Interface/RibbonController.cs
@@ -1,13 +1,13 @@
 using ExcelDna.Integration.CustomUI;
 using Microsoft.Office.Interop.Excel;
-using RehauSku.PriceListTools;
+using RhSolutions.PriceListTools;
 using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace RehauSku.Interface
+namespace RhSolutions.Interface
 {
     [ComVisible(true)]
     public class RibbonController : ExcelRibbon
diff --git a/src/PriceListTools/AbstractPriceList.cs b/src/PriceListTools/AbstractPriceList.cs
index 2f89a85..2274a7f 100644
--- a/src/PriceListTools/AbstractPriceList.cs
+++ b/src/PriceListTools/AbstractPriceList.cs
@@ -1,6 +1,6 @@
 using Microsoft.Office.Interop.Excel;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal abstract class AbstractPriceList
     {
diff --git a/src/PriceListTools/AbstractTool.cs b/src/PriceListTools/AbstractTool.cs
index abf4bae..dc2129a 100644
--- a/src/PriceListTools/AbstractTool.cs
+++ b/src/PriceListTools/AbstractTool.cs
@@ -1,11 +1,11 @@
 using Microsoft.Office.Interop.Excel;
-using RehauSku.Interface;
+using RhSolutions.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using ProgressBar = RehauSku.Interface.ProgressBar;
+using ProgressBar = RhSolutions.Interface.ProgressBar;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal abstract class AbstractTool
     {
diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs
index cd3fc8a..6959ac2 100644
--- a/src/PriceListTools/CombineTool.cs
+++ b/src/PriceListTools/CombineTool.cs
@@ -1,11 +1,11 @@
 using Microsoft.Office.Interop.Excel;
-using RehauSku.Interface;
+using RhSolutions.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dialog = RehauSku.Interface.Dialog;
+using Dialog = RhSolutions.Interface.Dialog;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class CombineTool : AbstractTool
     {
diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs
index 04cf1ec..57895b3 100644
--- a/src/PriceListTools/ConvertTool.cs
+++ b/src/PriceListTools/ConvertTool.cs
@@ -1,6 +1,6 @@
-using RehauSku.Interface;
+using RhSolutions.Interface;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class ConvertTool : AbstractTool
     {
diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs
index 4e51563..3fe1ccd 100644
--- a/src/PriceListTools/ExportTool.cs
+++ b/src/PriceListTools/ExportTool.cs
@@ -1,9 +1,9 @@
 using Microsoft.Office.Interop.Excel;
 using System;
 using System.Collections.Generic;
-using RehauSku.Interface;
+using RhSolutions.Interface;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class ExportTool : AbstractTool
     {
diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs
index ac2a455..b9673e7 100644
--- a/src/PriceListTools/MergeTool.cs
+++ b/src/PriceListTools/MergeTool.cs
@@ -1,9 +1,9 @@
-using RehauSku.Interface;
+using RhSolutions.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class MergeTool : AbstractTool
     {
diff --git a/src/PriceListTools/Position.cs b/src/PriceListTools/Position.cs
index 713ba90..8ae5863 100644
--- a/src/PriceListTools/Position.cs
+++ b/src/PriceListTools/Position.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     public class Position
     {
diff --git a/src/PriceListTools/PriceListHeaders.cs b/src/PriceListTools/PriceListHeaders.cs
index 74c7870..9c09ed7 100644
--- a/src/PriceListTools/PriceListHeaders.cs
+++ b/src/PriceListTools/PriceListHeaders.cs
@@ -1,4 +1,4 @@
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal static class PriceListHeaders
     {
diff --git a/src/PriceListTools/SourcePriceList.cs b/src/PriceListTools/SourcePriceList.cs
index b11e060..2196d39 100644
--- a/src/PriceListTools/SourcePriceList.cs
+++ b/src/PriceListTools/SourcePriceList.cs
@@ -3,9 +3,9 @@ using Microsoft.Office.Interop.Excel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using RehauSku.Interface;
+using RhSolutions.Interface;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class SourcePriceList : AbstractPriceList
     {
diff --git a/src/PriceListTools/TargetPriceList.cs b/src/PriceListTools/TargetPriceList.cs
index 2f23168..da540ae 100644
--- a/src/PriceListTools/TargetPriceList.cs
+++ b/src/PriceListTools/TargetPriceList.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace RehauSku.PriceListTools
+namespace RhSolutions.PriceListTools
 {
     internal class TargetPriceList : AbstractPriceList
     {
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
index 6a5c3a2..afa623f 100644
--- a/src/Properties/AssemblyInfo.cs
+++ b/src/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("RehauSku.Assist")]
+[assembly: AssemblyTitle("RhXlPLugin")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RehauSku.Assist")]
-[assembly: AssemblyCopyright("Copyright ©  2021-2022")]
+[assembly: AssemblyProduct("RhXlPLugin")]
+[assembly: AssemblyCopyright("Copyright ©  2021-2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/RehauSku.Assist-AddIn.dna b/src/RehauSku.Assist-AddIn.dna
index 0b173b3..f283d24 100644
--- a/src/RehauSku.Assist-AddIn.dna
+++ b/src/RehauSku.Assist-AddIn.dna
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DnaLibrary Name="RehauSku.Assist Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2020/07/dnalibrary">
-  <ExternalLibrary Path="RehauSku.Assist.dll" ExplicitRegistration="true" LoadFromBytes="true" Pack="true" IncludePdb="false" />
+<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-AddIn.dna b/src/RhSolutions-AddIn.dna
new file mode 100644
index 0000000..3b9f26a
--- /dev/null
+++ b/src/RhSolutions-AddIn.dna
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DnaLibrary Name="RhSolutions Add-In" RuntimeVersion="v4.0" xmlns="http://schemas.excel-dna.net/addin/2020/07/dnalibrary">
+  <ExternalLibrary Path="RhExcelAddin.dll" ExplicitExports="false" LoadFromBytes="true" Pack="true" IncludePdb="false" />
+
+  <!--
+       The RuntimeVersion attribute above allows only the following setting:
+       * RuntimeVersion="v4.0" - for .NET 4.5 or higher
+
+       You can have IntelliSense (autocomplete) and validation for this file.
+       See https://github.com/Excel-DNA/ExcelDna/tree/master/Distribution/XmlSchemas/
+
+       Additional referenced assemblies can be specified by adding 'Reference' tags. 
+       These libraries will not be examined and registered with Excel as add-in libraries, 
+       but will be packed into the -packed.xll file and loaded at runtime as needed.
+       For example:
+
+       <Reference Path="Another.Library.dll" Pack="true" />
+
+       Excel-DNA also allows the XML for ribbon UI extensions to be specified in the .dna file.
+       See the main Excel-DNA site at https://excel-dna.net for downloads of the full distribution.
+  -->
+</DnaLibrary>
diff --git a/src/RehauSku.Assist.csproj b/src/RhSolutions.csproj
index 2f14d69..e3f3359 100644
--- a/src/RehauSku.Assist.csproj
+++ b/src/RhSolutions.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RehauSku.Assist</RootNamespace>
-    <AssemblyName>RehauSku.Assist</AssemblyName>
+    <RootNamespace>RhExcelAddin</RootNamespace>
+    <AssemblyName>RhExcelAddin</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -106,9 +106,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="RhSolutions-AddIn.dna" />
     <None Include="packages.config" />
     <None Include="Properties\ExcelDna.Build.props" />
-    <None Include="RehauSku.Assist-AddIn.dna" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -117,10 +117,10 @@
     <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'))" />
-    <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'))" />
   </Target>
-  <Import Project="..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets" Condition="Exists('..\packages\ExcelDna.AddIn.1.6.0\build\ExcelDna.AddIn.targets')" />
   <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