Skip to content

Feature/698 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using cloudscribe.Core.Models.EventHandlers;
using cloudscribe.DynamicPolicy.CoreIntegration;
using cloudscribe.DynamicPolicy.Models;
using cloudscribe.Versioning;
using Microsoft.Extensions.Configuration;

namespace Microsoft.Extensions.DependencyInjection
Expand All @@ -16,7 +17,7 @@ IConfiguration configuration
services.AddSingleton<ITenantIdProvider, TenantIdProvider>();

services.AddScoped<IRoleSelectorProperties, SiteRoleSelectorProperties>();

services.AddScoped<IVersionProvider, VersionProvider>();
services.AddScoped<IHandleSitePreDelete, SiteDeleteHandler>();
services.AddScoped<IHandleSiteCloned, SiteCloneHandler>();
services.AddScoped<IGuardNeededRoles, AuthPolicyRoleGuard>();
Expand Down
36 changes: 36 additions & 0 deletions cloudscribe.DynamicPolicy.CoreIntegration/VersionProvider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using cloudscribe.Versioning;
using System;
using System.Reflection;

namespace cloudscribe.DynamicPolicy.CoreIntegration
{
public class VersionProvider : IVersionProvider
{
private Assembly assembly = typeof(SiteCloneHandler).Assembly;

public string Name
{
get { return assembly.GetName().Name; }

}

public Guid ApplicationId { get { return new Guid("8t3t3daa-7f4f-4939-831c-401fcec37335"); } }

public Version CurrentVersion
{

get
{

var version = new Version(2, 0, 0, 0);
var versionString = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
if (!string.IsNullOrWhiteSpace(versionString))
{
Version.TryParse(versionString, out version);
}

return version;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>cloudscribe Core integration for Dynamic Authorization Policy Services for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -17,8 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Core.Models" Version="8.1.0" />
<PackageReference Include="cloudscribe.Multitenancy" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Models" Version="8.2.0" />
<PackageReference Include="cloudscribe.Multitenancy" Version="8.2.0" />

<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>model classes for Dynamic Authorization Policy for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Pagination.Models" Version="8.1.0" />
<PackageReference Include="cloudscribe.Pagination.Models" Version="8.2.0" />

<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Entity Framework Core implementation of commands and queries for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>MSSQL Entity Framework Core implementation of commands and queries for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>MySql Entity Framework Core implementation of commands and queries for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />

<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>PostgreSql Entity Framework Core implementation of commands and queries for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -23,12 +23,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />

<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="8.1.0" />
<PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="8.2.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>SQLite Entity Framework Core implementation of commands and queries for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />

<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>NoDb storage for Dynamic Authorization Policies for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -21,8 +21,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Pagination.Models" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Pagination.Models" Version="8.2.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />
<PackageReference Include="NoDb" Version="1.2.2" />

<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Dynamic Authorization Policy Services for ASP.NET Core</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -21,10 +21,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
<PackageReference Include="cloudscribe.Versioning" Version="8.2.0" />

<PackageReference Include="cloudscribe.Web.Common" Version="8.1.0" />
<PackageReference Include="cloudscribe.Web.Pagination" Version="8.1.0" />
<PackageReference Include="cloudscribe.Web.Common" Version="8.2.0" />
<PackageReference Include="cloudscribe.Web.Pagination" Version="8.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Bootstrap 3 views for cloudscribe Dynamic Authorization Policy</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Bootstrap 4 views for cloudscribe Dynamic Authorization Policy</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
31 changes: 31 additions & 0 deletions cloudscribe.DynamicPolicy.Web.Views.Bootstrap5/VersionProvider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using cloudscribe.Versioning;
using cloudscribe.Web.Common;
using System;
using System.Reflection;

namespace cloudscribe.DynamicPolicy.Web.Views.Bootstrap5
{
public class VersionProvider : IVersionProvider
{
public string Name { get { return "cloudscribe.DynamicPolicy.Web.Views.Bootstrap5"; } }

public Guid ApplicationId { get { return new Guid("8t3t3daa-7a4a-4939-831c-401fcec37335"); } }

public Version CurrentVersion
{

get
{

var version = new Version(2, 0, 0, 0);
var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
if (!string.IsNullOrWhiteSpace(versionString))
{
Version.TryParse(versionString, out version);
}

return version;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Description>Bootstrap 5 views for cloudscribe Dynamic Authorization Policy</Description>
<Version>8.1.0</Version>
<Version>8.2.0</Version>
<TargetFramework>net8.0</TargetFramework>
<Authors>Joe Audette</Authors>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
Expand Down
5 changes: 3 additions & 2 deletions cloudscribeDemo.Web/Config/CloudscribeFeatures.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Hosting;
using cloudscribe.Versioning;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using System.IO;

Expand Down Expand Up @@ -122,7 +123,7 @@ IConfiguration config
services.AddCloudscribeCoreIntegrationForSimpleContent(config);
services.AddSimpleContentMvc(config);
services.AddContentTemplatesForSimpleContent(config);

services.AddScoped<IVersionProvider, cloudscribe.DynamicPolicy.Web.Views.Bootstrap5.VersionProvider>();
services.AddMetaWeblogForSimpleContent(config.GetSection("MetaWeblogApiOptions"));
services.AddSimpleContentRssSyndiction();

Expand Down
58 changes: 29 additions & 29 deletions cloudscribeDemo.Web/cloudscribeDemo.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,39 +28,39 @@

<ItemGroup Label="Package References">

<PackageReference Include="cloudscribe.Core.Web" Version="8.1.*" />
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap5" Version="8.1.0" />
<PackageReference Include="cloudscribe.Web.StaticFiles" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Web" Version="8.2.*" />
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap5" Version="8.2.0" />
<PackageReference Include="cloudscribe.Web.StaticFiles" Version="8.2.0" />

<PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.pgsql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.2.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="8.2.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.pgsql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="8.2.0" />

<PackageReference Include="cloudscribe.Core.SimpleContent" Version="8.1.*" />
<PackageReference Include="cloudscribe.SimpleContent.Web" Version="8.1.*" />
<PackageReference Include="cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.CompiledViews.Bootstrap5" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.MetaWeblog" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Syndication" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.ContentTemplates.Bootstrap5" Version="8.1.0" />
<PackageReference Include="cloudscribe.Core.SimpleContent" Version="8.2.*" />
<PackageReference Include="cloudscribe.SimpleContent.Web" Version="8.2.*" />
<PackageReference Include="cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.CompiledViews.Bootstrap5" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.MetaWeblog" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Syndication" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.ContentTemplates.Bootstrap5" Version="8.2.0" />

<PackageReference Include="cloudscribe.SimpleContent.Storage.NoDb" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.MSSQL" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.MySQL" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.pgsql" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.PostgreSql" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.SQLite" Version="8.1.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.NoDb" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.MSSQL" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.MySQL" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.pgsql" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.PostgreSql" Version="8.2.0" />
<PackageReference Include="cloudscribe.SimpleContent.Storage.EFCore.SQLite" Version="8.2.0" />

<PackageReference Include="cloudscribe.Logging.Web" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.NoDb" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.MSSQL" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.MySql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.pgsql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.PostgreSql" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.SQLite" Version="8.1.0" />
<PackageReference Include="cloudscribe.Logging.Web" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.NoDb" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.MSSQL" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.MySql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.pgsql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.PostgreSql" Version="8.2.0" />
<PackageReference Include="cloudscribe.Logging.EFCore.SQLite" Version="8.2.0" />

<PackageReference Include="cloudscribe.Web.Localization" Version="6.0.0" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"AuthorBio":"","Comment":"","NormalizedEmail":"[email protected]","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2019-06-29T16:37:23.1308797Z","MustChangePwd":false,"PasswordHash":"AQAAAAEAACcQAAAAEEgtWGofRbYv2zOxMShQf2qznBNMWVNWjq+f7aw3i07AlUqYq/OTiyRbGZlrCJtPCg==","CanAutoLockout":false,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"YSWYLIDNJ4KIBB2VO7YH2O6DMZPADVPV","Signature":"","TwoFactorEnabled":false,"BrowserKey":"dbd17f27-eebe-461d-9d8f-07fa00bb693d","Id":"66f735ce-4f15-4cd6-9d1c-35387d3804bb","SiteId":"fd0d9072-2fcf-4ba1-90c1-711b1f8a97fc","Email":"[email protected]","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2018-01-05T15:12:15.5419204Z","LastModifiedUtc":"2018-01-05T15:12:15.5419204Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2023-07-19T14:40:47.6373506Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""}
{"AuthorBio":"","Comment":"","NormalizedEmail":"[email protected]","NormalizedUserName":"ADMIN","EmailConfirmed":true,"EmailConfirmSentUtc":null,"AgreementAcceptedUtc":null,"LockoutEndDateUtc":null,"NewEmail":"","NewEmailApproved":false,"LastPasswordChangeUtc":"2025-05-07T13:52:42.7164823Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAELKrQwvQak6FTpALQ4tFouvkRhtxne2SCzNTDx4xk8mtxu5Ul7A+NWFGrhn+aE0P8w==","CanAutoLockout":false,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"FCKO276DCAL5VW4NOBGTQS466B7KR3Y4","Signature":"","TwoFactorEnabled":false,"BrowserKey":"6a8f6843-e353-4af8-b665-c3832134f7d2","Id":"66f735ce-4f15-4cd6-9d1c-35387d3804bb","SiteId":"fd0d9072-2fcf-4ba1-90c1-711b1f8a97fc","Email":"[email protected]","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2018-01-05T15:12:15.5419204Z","LastModifiedUtc":"2018-01-05T15:12:15.5419204Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2025-05-07T13:52:42.7774975Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""}
2 changes: 1 addition & 1 deletion update_version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


# Define the directory containing the .csproj files
$directory = "src"
$directory = "./" # DIFFERENT in this Repo !!!!

# Define the old & new versions
$oldVersion = '8\.1' # slash needed !
Expand Down