Rename project

This commit is contained in:
Sergey Chebotar 2022-12-19 20:25:35 +03:00
parent 012ec9d010
commit 965eb2b80c
27 changed files with 66 additions and 44 deletions

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339 VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -5,7 +5,7 @@ using Microsoft.Office.Interop.Excel;
using System.Net.Http; using System.Net.Http;
using System.Runtime.Caching; using System.Runtime.Caching;
namespace RehauSku namespace RhSolutions
{ {
class AddIn : IExcelAddIn class AddIn : IExcelAddIn
{ {

View File

@ -1,6 +1,6 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
namespace RehauSku namespace RhSolutions
{ {
internal static class EventsUtil internal static class EventsUtil
{ {

View File

@ -7,7 +7,7 @@ using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace RehauSku namespace RhSolutions
{ {
public class Functions public class Functions
{ {

View File

@ -1,10 +1,10 @@
using Microsoft.Win32; using Microsoft.Win32;
using RehauSku.Interface; using RhSolutions.Interface;
using System; using System;
using System.IO; using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
namespace RehauSku namespace RhSolutions
{ {
static class RegistryUtil static class RegistryUtil
{ {

View File

@ -1,6 +1,6 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace RehauSku namespace RhSolutions
{ {
internal class RauSku internal class RauSku
{ {

View File

@ -1,6 +1,6 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
namespace RehauSku namespace RhSolutions
{ {
static class SkuExtensions static class SkuExtensions
{ {

View File

@ -1,8 +1,8 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using RehauSku.PriceListTools; using RhSolutions.PriceListTools;
using System.Linq; using System.Linq;
namespace RehauSku namespace RhSolutions
{ {
public static class WorksheetExtensions public static class WorksheetExtensions
{ {

View File

@ -2,7 +2,7 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using System; using System;
namespace RehauSku.Interface namespace RhSolutions.Interface
{ {
internal abstract class AbstractBar : IDisposable internal abstract class AbstractBar : IDisposable
{ {

View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
namespace RehauSku.Interface namespace RhSolutions.Interface
{ {
static class Dialog static class Dialog
{ {

View File

@ -1,4 +1,4 @@
namespace RehauSku.Interface namespace RhSolutions.Interface
{ {
internal class ProgressBar : AbstractBar internal class ProgressBar : AbstractBar
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Text; using System.Text;
namespace RehauSku.Interface namespace RhSolutions.Interface
{ {
internal class ResultBar : AbstractBar internal class ResultBar : AbstractBar
{ {

View File

@ -1,13 +1,13 @@
using ExcelDna.Integration.CustomUI; using ExcelDna.Integration.CustomUI;
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using RehauSku.PriceListTools; using RhSolutions.PriceListTools;
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Forms; using System.Windows.Forms;
namespace RehauSku.Interface namespace RhSolutions.Interface
{ {
[ComVisible(true)] [ComVisible(true)]
public class RibbonController : ExcelRibbon public class RibbonController : ExcelRibbon

View File

@ -1,6 +1,6 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal abstract class AbstractPriceList internal abstract class AbstractPriceList
{ {

View File

@ -1,11 +1,11 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using RehauSku.Interface; using RhSolutions.Interface;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ProgressBar = RehauSku.Interface.ProgressBar; using ProgressBar = RhSolutions.Interface.ProgressBar;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal abstract class AbstractTool internal abstract class AbstractTool
{ {

View File

@ -1,11 +1,11 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using RehauSku.Interface; using RhSolutions.Interface;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Dialog = RehauSku.Interface.Dialog; using Dialog = RhSolutions.Interface.Dialog;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class CombineTool : AbstractTool internal class CombineTool : AbstractTool
{ {

View File

@ -1,6 +1,6 @@
using RehauSku.Interface; using RhSolutions.Interface;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class ConvertTool : AbstractTool internal class ConvertTool : AbstractTool
{ {

View File

@ -1,9 +1,9 @@
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using RehauSku.Interface; using RhSolutions.Interface;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class ExportTool : AbstractTool internal class ExportTool : AbstractTool
{ {

View File

@ -1,9 +1,9 @@
using RehauSku.Interface; using RhSolutions.Interface;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class MergeTool : AbstractTool internal class MergeTool : AbstractTool
{ {

View File

@ -1,6 +1,6 @@
using System.Linq; using System.Linq;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
public class Position public class Position
{ {

View File

@ -1,4 +1,4 @@
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal static class PriceListHeaders internal static class PriceListHeaders
{ {

View File

@ -3,9 +3,9 @@ using Microsoft.Office.Interop.Excel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using RehauSku.Interface; using RhSolutions.Interface;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class SourcePriceList : AbstractPriceList internal class SourcePriceList : AbstractPriceList
{ {

View File

@ -2,7 +2,7 @@
using System; using System;
using System.Linq; using System.Linq;
namespace RehauSku.PriceListTools namespace RhSolutions.PriceListTools
{ {
internal class TargetPriceList : AbstractPriceList internal class TargetPriceList : AbstractPriceList
{ {

View File

@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("RehauSku.Assist")] [assembly: AssemblyTitle("RhXlPLugin")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RehauSku.Assist")] [assembly: AssemblyProduct("RhXlPLugin")]
[assembly: AssemblyCopyright("Copyright © 2021-2022")] [assembly: AssemblyCopyright("Copyright © 2021-2023")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <DnaLibrary Name="RhXlPLugin" 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" /> <ExternalLibrary Path="RhXlPLugin.dll" ExplicitRegistration="true" LoadFromBytes="true" Pack="true" IncludePdb="false" />
<Reference Path="ExcelDna.Registration.dll" Pack="true" /> <Reference Path="ExcelDna.Registration.dll" Pack="true" />
<Reference Path="ExcelDna.IntelliSense.dll" Pack="true" /> <Reference Path="ExcelDna.IntelliSense.dll" Pack="true" />
</DnaLibrary> </DnaLibrary>

22
src/RhSolutions-AddIn.dna Normal file
View File

@ -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>

View File

@ -8,8 +8,8 @@
<ProjectGuid>{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}</ProjectGuid> <ProjectGuid>{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RehauSku.Assist</RootNamespace> <RootNamespace>RhExcelAddin</RootNamespace>
<AssemblyName>RehauSku.Assist</AssemblyName> <AssemblyName>RhExcelAddin</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
@ -106,9 +106,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="RhSolutions-AddIn.dna" />
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="Properties\ExcelDna.Build.props" /> <None Include="Properties\ExcelDna.Build.props" />
<None Include="RehauSku.Assist-AddIn.dna" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@ -117,10 +117,10 @@
<PropertyGroup> <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> <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> </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.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.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> </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.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> </Project>