Skip to content
Merged

#698 #40

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
@@ -1,5 +1,6 @@
using cloudscribe.SimpleContactForm.CoreIntegration;
using cloudscribe.SimpleContactForm.Models;
using cloudscribe.Versioning;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection.Extensions;

Expand All @@ -15,6 +16,8 @@ IConfiguration configuration
services.TryAddScoped<ITenantResolver, CoreTenantResolver>();
services.TryAddScoped<IContactFormResolver, SiteContactFormResolver>();
services.TryAddScoped<IPrePopulateContactForm, FormPrepopulator>();
services.AddScoped<IVersionProvider, VersionProvider>();
services.AddScoped<IVersionProvider, cloudscribe.SimpleContactForm.VersionProvider>();

return services;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using cloudscribe.Versioning;
using System;
using System.Reflection;

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

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

}

public Guid ApplicationId { get { return new Guid("fs5r3f82-5n38-4c83-93c8-cc4c303209ed"); } }

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;
}
}
}
}
1 change: 0 additions & 1 deletion src/cloudscribe.SimpleContactForm/StartupExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public static IServiceCollection AddCloudscribeSimpleContactForm(
services.Configure<ContactFormMessageOptions>(configuration.GetSection("ContactFormMessageOptions"));
services.Configure<ContactFormSettings>(configuration.GetSection("ContactFormSettings"));


services.TryAddScoped<IRecaptchaKeysProvider, ConfigRecaptchaKeysProvider>();
services.AddScoped<ContactFormService, ContactFormService>();

Expand Down
37 changes: 37 additions & 0 deletions src/cloudscribe.SimpleContactForm/VersionProvider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using cloudscribe.SimpleContactForm.ViewModels;
using cloudscribe.Versioning;
using System;
using System.Reflection;

namespace cloudscribe.SimpleContactForm
{
public class VersionProvider : IVersionProvider
{
private Assembly assembly = typeof(MessageViewModel).Assembly;

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

}

public Guid ApplicationId { get { return new Guid("fs5r3f82-4b27-4c83-93c8-cc4c303209ed"); } }

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;
}
}
}
}