Skip to content

Commit a15fced

Browse files
authored
Merge pull request #55 from cloudscribe/feature/698
Feature/698
2 parents 88c6804 + abf4682 commit a15fced

File tree

5 files changed

+73
-4
lines changed

5 files changed

+73
-4
lines changed

cloudscribe.DynamicPolicy.CoreIntegration/StartupExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using cloudscribe.Core.Models.EventHandlers;
33
using cloudscribe.DynamicPolicy.CoreIntegration;
44
using cloudscribe.DynamicPolicy.Models;
5+
using cloudscribe.Versioning;
56
using Microsoft.Extensions.Configuration;
67

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

1819
services.AddScoped<IRoleSelectorProperties, SiteRoleSelectorProperties>();
19-
20+
services.AddScoped<IVersionProvider, cloudscribe.DynamicPolicy.CoreIntegration.VersionProvider>();
2021
services.AddScoped<IHandleSitePreDelete, SiteDeleteHandler>();
2122
services.AddScoped<IHandleSiteCloned, SiteCloneHandler>();
2223
services.AddScoped<IGuardNeededRoles, AuthPolicyRoleGuard>();
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using cloudscribe.Versioning;
2+
using System;
3+
using System.Reflection;
4+
5+
namespace cloudscribe.DynamicPolicy.CoreIntegration
6+
{
7+
public class VersionProvider : IVersionProvider
8+
{
9+
private Assembly assembly = typeof(SiteCloneHandler).Assembly;
10+
11+
public string Name
12+
{
13+
get { return assembly.GetName().Name; }
14+
15+
}
16+
17+
public Guid ApplicationId { get { return new Guid("8t3t3daa-7f4f-4939-831c-401fcec37335"); } }
18+
19+
public Version CurrentVersion
20+
{
21+
22+
get
23+
{
24+
25+
var version = new Version(2, 0, 0, 0);
26+
var versionString = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
27+
if (!string.IsNullOrWhiteSpace(versionString))
28+
{
29+
Version.TryParse(versionString, out version);
30+
}
31+
32+
return version;
33+
}
34+
}
35+
}
36+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using cloudscribe.Versioning;
2+
using cloudscribe.Web.Common;
3+
using System;
4+
using System.Reflection;
5+
6+
namespace cloudscribe.DynamicPolicy.Web.Views.Bootstrap5
7+
{
8+
public class VersionProvider : IVersionProvider
9+
{
10+
public string Name { get { return "cloudscribe.DynamicPolicy.Web.Views.Bootstrap5"; } }
11+
12+
public Guid ApplicationId { get { return new Guid("8t3t3daa-7a4a-4939-831c-401fcec37335"); } }
13+
14+
public Version CurrentVersion
15+
{
16+
17+
get
18+
{
19+
20+
var version = new Version(2, 0, 0, 0);
21+
var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
22+
if (!string.IsNullOrWhiteSpace(versionString))
23+
{
24+
Version.TryParse(versionString, out version);
25+
}
26+
27+
return version;
28+
}
29+
}
30+
}
31+
}

cloudscribeDemo.Web/Config/CloudscribeFeatures.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Hosting;
1+
using cloudscribe.Versioning;
2+
using Microsoft.AspNetCore.Hosting;
23
using Microsoft.Extensions.Configuration;
34
using System.IO;
45

@@ -122,7 +123,7 @@ IConfiguration config
122123
services.AddCloudscribeCoreIntegrationForSimpleContent(config);
123124
services.AddSimpleContentMvc(config);
124125
services.AddContentTemplatesForSimpleContent(config);
125-
126+
services.AddScoped<IVersionProvider, cloudscribe.DynamicPolicy.Web.Views.Bootstrap5.VersionProvider>();
126127
services.AddMetaWeblogForSimpleContent(config.GetSection("MetaWeblogApiOptions"));
127128
services.AddSimpleContentRssSyndiction();
128129

Original file line numberDiff line numberDiff line change
@@ -1 +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":""}
1+
{"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":""}

0 commit comments

Comments
 (0)