Skip to content

Commit 9b8be19

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #637 from cloudscribe/feature/698
#698 version providers
2 parents eb88c8e + 916dd0b commit 9b8be19

File tree

9 files changed

+148
-6
lines changed

9 files changed

+148
-6
lines changed

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using System.Reflection;
3+
using cloudscribe.Versioning;
4+
using cloudscribe.Web.Common;
5+
6+
namespace cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5
7+
{
8+
public class VersionProvider : IVersionProvider
9+
{
10+
public string Name { get { return "cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5"; } }
11+
12+
public Guid ApplicationId { get { return new Guid("f93067b4-919d-4910-acd1-4b3b1c210ecf"); } }
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+
}

‎src/cloudscribe.Core.SimpleContent/StartupExtenstions.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using cloudscribe.SimpleContent.Models;
66
using cloudscribe.SimpleContent.Web.Design;
77
using cloudscribe.SimpleContent.Web.TagHelpers;
8+
using cloudscribe.Versioning;
89
using cloudscribe.Web.Navigation.Caching;
910
using Microsoft.AspNetCore.Authorization;
1011
using Microsoft.Extensions.Configuration;
@@ -34,7 +35,7 @@ public static IServiceCollection AddCloudscribeCoreIntegrationForSimpleContent(
3435
services.AddScoped<ITreeCacheKeyResolver, SiteNavigationCacheKeyResolver>();
3536
services.AddScoped<IHandleRoleUpdated, HandleRoleUpdated>();
3637
services.AddScoped<IHandleRoleDeleted, HandleRoleDeleted>();
37-
38+
services.AddScoped<IVersionProvider, VersionProvider>();
3839

3940
if (configuration != null)
4041
{

‎src/cloudscribe.Core.SimpleContent/VersionProvider.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using cloudscribe.Core.SimpleContent.Integration;
2+
using cloudscribe.Versioning;
3+
using cloudscribe.Web.Common;
4+
using System;
5+
using System.Reflection;
6+
7+
namespace cloudscribe.Core.SimpleContent
8+
{
9+
public class VersionProvider : IVersionProvider
10+
{
11+
private Assembly assembly = typeof(AuthorNameResolver).Assembly;
12+
13+
public string Name
14+
{
15+
get { return assembly.GetName().Name; }
16+
17+
}
18+
19+
public Guid ApplicationId { get { return new Guid("f94177b4-919d-4910-acd1-4b3b1c210ecf"); } }
20+
21+
public Version CurrentVersion
22+
{
23+
24+
get
25+
{
26+
27+
var version = new Version(2, 0, 0, 0);
28+
var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
29+
if (!string.IsNullOrWhiteSpace(versionString))
30+
{
31+
Version.TryParse(versionString, out version);
32+
}
33+
34+
return version;
35+
}
36+
}
37+
}
38+
}

‎src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs‎

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.SimpleContent.CompiledViews.Bootstrap5
7+
{
8+
public class VersionProvider : IVersionProvider
9+
{
10+
public string Name { get { return "cloudscribe.SimpleContent.CompiledViews.Bootstrap5"; } }
11+
12+
public Guid ApplicationId { get { return new Guid("f94067b4-919d-4910-acd1-4b3b1c210ecf"); } }
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+
}

‎src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/StartupExtensions.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
using cloudscribe.SimpleContent.ContentTemplates.Configuration;
1+
using cloudscribe.SimpleContent.ContentTemplates.Bootstrap5;
2+
using cloudscribe.SimpleContent.ContentTemplates.Configuration;
23
using cloudscribe.SimpleContent.ContentTemplates.Services;
34
using cloudscribe.SimpleContent.Models;
5+
using cloudscribe.Versioning;
46
using Microsoft.Extensions.Configuration;
57
using Microsoft.Extensions.DependencyInjection.Extensions;
68

@@ -26,7 +28,7 @@ IConfiguration configuration
2628

2729
services.Configure<ImageWithContentOptions>(configuration.GetSection("ContentTemplateSettings:ImageWithContentOptions"));
2830
services.TryAddScoped<IImageWithContentOptionsProvider, ConfigImageWithContentOptionsProvider>();
29-
31+
services.AddScoped<IVersionProvider, VersionProvider>();
3032

3133

3234

‎src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/VersionProvider.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using cloudscribe.Versioning;
2+
using cloudscribe.Web.Common;
3+
using System;
4+
using System.Reflection;
5+
6+
namespace cloudscribe.SimpleContent.ContentTemplates.Bootstrap5
7+
{
8+
public class VersionProvider : IVersionProvider
9+
{
10+
private Assembly assembly = typeof(ContentTemplateResources).Assembly;
11+
12+
public string Name
13+
{
14+
get { return assembly.GetName().Name; }
15+
16+
}
17+
18+
public Guid ApplicationId { get { return new Guid("f94167b4-919d-4910-acd1-4b3b1c210ecf"); } }
19+
20+
public Version CurrentVersion
21+
{
22+
23+
get
24+
{
25+
26+
var version = new Version(2, 0, 0, 0);
27+
var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
28+
if (!string.IsNullOrWhiteSpace(versionString))
29+
{
30+
Version.TryParse(versionString, out version);
31+
}
32+
33+
return version;
34+
}
35+
}
36+
}
37+
}

‎src/cloudscribe.SimpleContent.Web/VersionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace cloudscribe.SimpleContent.Web
1616
{
1717
public class VersionInfo : IVersionProvider
1818
{
19-
public string Name { get { return "cloudscribe.SimpleContent"; } }
19+
public string Name { get { return "cloudscribe.SimpleContent.Web"; } }
2020

2121
public Guid ApplicationId { get { return new Guid("f83067b4-919d-4910-acd1-4b3b1c210ecf"); } }
2222

‎src/sourceDev.WebApp/Config/CloudscribeFeatures.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.IO;
77
using System.Collections.Generic;
88
using cloudscribe.SimpleContent.Models;
9+
using cloudscribe.Versioning;
910

1011
namespace Microsoft.Extensions.DependencyInjection
1112
{
@@ -77,7 +78,8 @@ public static IServiceCollection SetupCloudscribeFeatures(
7778
IConfiguration config
7879
)
7980
{
80-
81+
services.AddScoped<IVersionProvider, cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.VersionProvider>();
82+
services.AddScoped<IVersionProvider, cloudscribe.SimpleContent.CompiledViews.Bootstrap5.VersionProvider>();
8183
services.AddCloudscribeLogging(config);
8284

8385
services.AddScoped<cloudscribe.Web.Navigation.INavigationNodePermissionResolver, cloudscribe.Web.Navigation.NavigationNodePermissionResolver>();

‎src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json‎

Lines changed: 1 addition & 1 deletion
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":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"a1490bf5-7bc0-4c51-8781-50e43a7f2698","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"[email protected]","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2024-12-11T14:19:23.5104068Z","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":"2024-06-03T14:17:55.2771124Z","MustChangePwd":false,"PasswordHash":"AQAAAAIAAYagAAAAEGVnALS6pFN3EERYv0nYhCQ4jy0t3WB+uYVRUM40L55rqYdKv3yw1MmjWvEYd6x2Pw==","CanAutoLockout":true,"AccessFailedCount":0,"RolesChanged":false,"SecurityStamp":"S7ZJ6RCVYLDHBWTECX2S2GQXJKWUXNSL","Signature":"","TwoFactorEnabled":false,"BrowserKey":"443ec848-e7da-49e2-9617-806793b4da1f","Id":"17595de8-d27a-4304-bded-76b61a16ad19","SiteId":"f83067b4-919d-4910-acd1-4b3b1c210ecf","Email":"[email protected]","UserName":"admin","DisplayName":"Admin","FirstName":"","LastName":"","AvatarUrl":"","DateOfBirth":null,"CreatedUtc":"2016-08-04T12:03:50.2175089Z","LastModifiedUtc":"2016-08-04T12:03:50.2175089Z","DisplayInMemberList":true,"Gender":"","IsLockedOut":false,"LastLoginUtc":"2025-05-07T10:40:36.453754Z","PhoneNumber":"","PhoneNumberConfirmed":false,"AccountApproved":true,"TimeZoneId":"","WebSiteUrl":""}

0 commit comments

Comments
 (0)