Cleanup and refactoring.

NTDLS · Jul 31, 2024 · ce6a355 · ce6a355
1 parent 6e0d9cf
commit ce6a355
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/@Installers/Setup.Iss b/@Installers/Setup.Iss
@@ -1,7 +1,7 @@
 [Setup]
 ;-- Main Setup Information
  AppName                          = Katzebase Server
- AppVerName                       = Katzebase Server 0.11.0
+ AppVerName                       = Katzebase Server 0.12.0
  AppCopyright                     = Copyright © 2024 NetworkDLS.
  DefaultDirName                   = {commonpf}\NetworkDLS\Katzebase\Server
  DefaultGroupName                 = NetworkDLS\Katzebase
@@ -12,14 +12,12 @@
  MinVersion                       = 0.0,7.0
  Compression                      = bZIP/9
  ChangesAssociations              = Yes
- OutputBaseFilename               = Katzebase_Server
+ OutputBaseFilename               = Katzebase.Server
  ArchitecturesInstallIn64BitMode  = x64
-
-;-- Windows 2000 & XP (Support Dialog)
- AppPublisher    = NetworkDLS
- AppPublisherURL = http://www.NetworkDLS.com/
- AppUpdatesURL   = http://www.NetworkDLS.com/
- AppVersion      = 0.11.0
+ AppPublisher                     = NetworkDLS
+ AppPublisherURL                  = http://www.NetworkDLS.com/
+ AppUpdatesURL                    = http://www.NetworkDLS.com/
+ AppVersion                       = 0.12.0
 
 [Files]
  Source: "..\NTDLS.Katzebase.Server\bin\Release\net8.0\runtimes\*.*";  DestDir: "{app}\runtimes";              Flags: IgnoreVersion recursesubdirs;

diff --git a/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj b/NTDLS.Katzebase.Engine/NTDLS.Katzebase.Engine.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <Company>NetworkDLS</Company>
     <Copyright>Copyright © 2024 NetworkDLS</Copyright>
-    <Version>0.11.0</Version>
+    <Version>0.12.0</Version>
     <Authors>NetworkDLS</Authors>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
@@ -18,13 +18,9 @@
 
   <ItemGroup>
     <PackageReference Include="CoreCLR-NCalc" Version="3.1.253" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NTDLS.DelegateThreadPooling" Version="1.2.15" />
     <PackageReference Include="NTDLS.FastMemoryCache" Version="1.5.3" />
-    <PackageReference Include="NTDLS.Helpers" Version="1.2.2" />
     <PackageReference Include="NTDLS.Katzebase.Client" Version="1.3.6" />
-    <PackageReference Include="NTDLS.Semaphore" Version="3.3.2" />
-    <PackageReference Include="protobuf-net" Version="3.2.30" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NTDLS.Katzebase.Engine/Query/StaticQueryParser.cs b/NTDLS.Katzebase.Engine/Query/StaticQueryParser.cs
@@ -217,7 +217,7 @@ static public PreparedQuery PrepareNextQuery(QueryTokenizer query)
                             if (Enum.TryParse(token, true, out KbProcedureParameterType paramType) == false || Enum.IsDefined(typeof(KbProcedureParameterType), paramType) == false)
                             {
                                 string acceptableValues = string.Join("', '",
-                                    Enum.GetValues< KbProcedureParameterType>().Where(o => o != KbProcedureParameterType.Undefined));
+                                    Enum.GetValues<KbProcedureParameterType>().Where(o => o != KbProcedureParameterType.Undefined));
 
                                 throw new KbParserException($"Invalid query. Found '{token}', expected: '{acceptableValues}'.");
                             }

diff --git a/NTDLS.Katzebase.Server/NTDLS.Katzebase.Server.csproj b/NTDLS.Katzebase.Server/NTDLS.Katzebase.Server.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Company>NetworkDLS</Company>
     <Copyright>Copyright © 2024 NetworkDLS</Copyright>
-    <Version>0.11.0</Version>
+    <Version>0.12.0</Version>
     <Authors>NetworkDLS</Authors>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <OutputType>Exe</OutputType>

diff --git a/NTDLS.Katzebase.Shared/NTDLS.Katzebase.Shared.csproj b/NTDLS.Katzebase.Shared/NTDLS.Katzebase.Shared.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
-    <Version>0.11.0</Version>
+    <Version>0.12.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TestApplications/Benchmark/Benchmark.csproj b/TestApplications/Benchmark/Benchmark.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.1.1\contentFiles\any\net8.0\NTDLS.Katzebase.ico" />
     <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.5\contentFiles\any\net8.0\%40Art\IconFull.ico" />
+    <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.6\contentFiles\any\net8.0\%40Art\IconFull.ico" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TestApplications/ClientTest/ClientTest.csproj b/TestApplications/ClientTest/ClientTest.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.1.1\contentFiles\any\net8.0\NTDLS.Katzebase.ico" />
     <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.5\contentFiles\any\net8.0\%40Art\IconFull.ico" />
+    <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.6\contentFiles\any\net8.0\%40Art\IconFull.ico" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TestApplications/ImportSOUses/ImportSOUses.csproj b/TestApplications/ImportSOUses/ImportSOUses.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.5\contentFiles\any\net8.0\%40Art\IconFull.ico" />
+    <Content Remove="C:\Users\ntdls\.nuget\packages\ntdls.katzebase.client\1.3.6\contentFiles\any\net8.0\%40Art\IconFull.ico" />
   </ItemGroup>
 
   <ItemGroup>