Skip to content

Commit

Permalink
Fix bug with SimpleDB and upgrade to net8 (#283)
Browse files Browse the repository at this point in the history
* Fix bug with SimpleDB and upgrade to net8

* Updrade to net8

* Rename build.yml to SonarCloud.yml update readme and net version
  • Loading branch information
k3ldar authored Dec 1, 2023
1 parent 5b3da49 commit 01c39cb
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 41 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.x'
dotnet-version: '8.x'

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
Expand Down
2 changes: 1 addition & 1 deletion AspNetCore.PluginManager.Solution.sln
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{0B6C
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{30CA931F-8150-451B-8720-11D53C7C9749}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build.yml = .github\workflows\build.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
.github\workflows\SonarCloud.yml = .github\workflows\SonarCloud.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{054AB9E6-B61B-416E-9680-8F470C38D767}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,5 @@ public UniqueIndexException(string message, Exception innerException)
: base(message, innerException)
{
}

protected UniqueIndexException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ namespace SimpleDB.Internal
/// int Record Count 37
/// int Length of data before compression 41
/// int Length of data stored on disk 45
/// int PageCount 49
/// Data version specific 53
/// </summary>
/// <typeparam name="T"></typeparam>
Expand Down Expand Up @@ -1085,9 +1084,6 @@ private void ValidateTableContents()
_recordCount = reader.ReadInt32();
_ = reader.ReadInt32();
_dataLength = reader.ReadInt32();

if (_internalWriteVersion > 0 && _internalWriteVersion < 3)
_pageCount = reader.ReadInt32();
}

private (bool, string) ValidateTableName(string path, string domain, string name, PageSize pageSize)
Expand Down
1 change: 0 additions & 1 deletion Database/PluginManager.SimpleDB/PluginInitialisation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
using Microsoft.Extensions.DependencyInjection;

using PluginManager.Abstractions;
using SimpleDB.Internal;

using SharedPluginFeatures;

Expand Down
1 change: 0 additions & 1 deletion Demo/NetCorePluginDemoWebsite/wwwroot/css/Downloads.css
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ margin: 0;
}
.mainContent .pagination ul li {
display: inline;

}
.mainContent .pagination ul li a {
background: #eaeaea;
Expand Down
2 changes: 0 additions & 2 deletions Demo/NetCorePluginDemoWebsite/wwwroot/css/Helpdesk.css
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ text-align: left;
background-color: #707B7C;
color: white;
}

.helpdeskTab {
overflow: hidden;
border: 1px solid #ccc;
Expand Down Expand Up @@ -186,7 +185,6 @@ padding: 5px 15px 0 0;
height: auto;
display: block;
list-style: none;

}
.helpdeskGroupList ul li {
width: 300px;
Expand Down
3 changes: 0 additions & 3 deletions Demo/NetCorePluginDemoWebsite/wwwroot/css/products.css
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ font-weight: bold;
.leftColumn ul li a:hover {
color: #333;
}

.leftColumn ul.collapsible li {
background: none;
padding: 3px 0;
Expand Down Expand Up @@ -354,7 +353,6 @@ margin: 0;
}
.mainContent .pagination ul li {
display: inline;

}
.mainContent .pagination ul li a {
background: #eaeaea;
Expand Down Expand Up @@ -460,7 +458,6 @@ width: 800px;
height: 600px;
}
}

.search-buy {
overflow: visible;
float:right;
Expand Down
40 changes: 20 additions & 20 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
<PackageTags>Plugin Manager</PackageTags>
<PackageProjectUrl>http://pluginmanager.website/</PackageProjectUrl>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<PackageReleaseNotes>Supports net core 3.1, net 6.0 and net7.0</PackageReleaseNotes>
<PackageReleaseNotes>Supports net 6.0, net7.0 and net8.0</PackageReleaseNotes>
<PackageTags>asp net core plugin manager system admin internal statistics</PackageTags>
</PropertyGroup>

<PropertyGroup>
<FrameWorkLatestVersion>net7.0</FrameWorkLatestVersion>
<FrameWorkAllSupported>net7.0;net6.0;netcoreapp3.1;netstandard2.0</FrameWorkAllSupported>
<FrameWorkAllNotStandard>net7.0;net6.0;netcoreapp3.1</FrameWorkAllNotStandard>
<FrameWorkLatestVersion>net8.0</FrameWorkLatestVersion>
<FrameWorkAllSupported>net8.0;net7.0;net6.0;netstandard2.0</FrameWorkAllSupported>
<FrameWorkAllNotStandard>net8.0;net7.0;net6.0;</FrameWorkAllNotStandard>
</PropertyGroup>

<PropertyGroup>
<SharedVer>3.12.0</SharedVer>
<SharedWinVer>1.4.0</SharedWinVer>
<SharedVer>3.14.0</SharedVer>
<SharedWinVer>1.5.0</SharedWinVer>
</PropertyGroup>

<PropertyGroup>
<Version>5.5.2</Version>
<Version>5.6.0</Version>
<LangVersion>latest</LangVersion>
<Authors>Simon Carter (s1cart3r@gmail.com)</Authors>
<Company>Simon Carter</Company>
Expand All @@ -53,43 +53,43 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net7.0'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_7_0;NET_7_X</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net8.0'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_8_ABOVE;NET_8_0;NET_8_X</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net7.0'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_7_0;NET_7_X</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net8.0'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_8_ABOVE;NET_8_0;NET_8_X</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net6.0'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net7.0'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_7_0;NET_7_X</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net6.0'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net7.0'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_7_0;NET_7_X</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|netcoreapp3.1'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_CORE_3_1;NET_CORE_3_X;ISO_WEEK</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net6.0'">
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|netcoreapp3.1'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_CORE_3_1;NET_CORE_3_X;ISO_WEEK</DefineConstants>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net6.0'">
<DefineConstants>CODE_ANALYSIS;NET_CORE;NET_6_0;NET_6_X;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE</DefineConstants>
<CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
<DebugType>$(DebugType)</DebugType>
<DebugSymbols>$(DebugSymbols)</DebugSymbols>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ Password: password
It only uses mock data providers and will reset periodically

## Current Version
Version 5.0.0
Version 5.6.0


# ASPNetCore.PluginManager
Extend any website with plugin technology.

PM> Install-Package AspNetCore.PluginManager -Version 5.0.0
PM> Install-Package AspNetCore.PluginManager -Version 5.6.0

https://www.nuget.org/packages/AspNetCore.PluginManager/

See https://github.com/k3ldar/.NetCorePluginManager/wiki/Plugin-Manager-Setup-and-Configuration for setup and configuration.

# Build Prerequisites
In order to build the latest version both Visual Studio 2019 and Net Core 3.1, net 6.0 or net7.0.
In order to build the latest version both Visual Studio 2019 and net 6.0, net7.0 or net8.0.

# Current Plugins
There are a number of pre-built plugins which can be used in most application types, they include:
Expand Down

0 comments on commit 01c39cb

Please sign in to comment.