Skip to content

Commit d63c8f2

Browse files
JimKerslakeJimKerslake
committed
Reapply "Merge pull request #33 from cloudscribe/feature/698"
This reverts commit 4034ff4.
1 parent 4034ff4 commit d63c8f2

File tree

8 files changed

+89
-14
lines changed

8 files changed

+89
-14
lines changed

‎src/WebApp/WebApp.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="cloudscribe.Core.Web" Version="8.4.*" />
28-
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap3" Version="8.4.0" />
29-
<PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.4.0" />
30-
<PackageReference Include="cloudscribe.Logging.Web" Version="8.4.0" />
31-
<PackageReference Include="cloudscribe.Logging.NoDb" Version="8.4.0" />
27+
<PackageReference Include="cloudscribe.Core.Web" Version="8.5.*" />
28+
<PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap5" Version="8.5.0" />
29+
<PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.5.0" />
30+
<PackageReference Include="cloudscribe.Logging.Web" Version="8.5.0" />
31+
<PackageReference Include="cloudscribe.Logging.NoDb" Version="8.5.0" />
3232
</ItemGroup>
3333

3434
</Project>

‎src/cloudscribe.SimpleContactForm.CoreIntegration/StartupExtensions.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using cloudscribe.SimpleContactForm.CoreIntegration;
22
using cloudscribe.SimpleContactForm.Models;
3+
using cloudscribe.Versioning;
34
using Microsoft.Extensions.Configuration;
45
using Microsoft.Extensions.DependencyInjection.Extensions;
56

@@ -15,6 +16,8 @@ IConfiguration configuration
1516
services.TryAddScoped<ITenantResolver, CoreTenantResolver>();
1617
services.TryAddScoped<IContactFormResolver, SiteContactFormResolver>();
1718
services.TryAddScoped<IPrePopulateContactForm, FormPrepopulator>();
19+
services.AddScoped<IVersionProvider, VersionProvider>();
20+
services.AddScoped<IVersionProvider, cloudscribe.SimpleContactForm.VersionProvider>();
1821

1922
return services;
2023
}

‎src/cloudscribe.SimpleContactForm.CoreIntegration/VersionProvider.cs‎

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.SimpleContactForm.CoreIntegration
6+
{
7+
public class VersionProvider : IVersionProvider
8+
{
9+
private Assembly assembly = typeof(CoreTenantResolver).Assembly;
10+
11+
public string Name
12+
{
13+
get { return assembly.GetName().Name; }
14+
15+
}
16+
17+
public Guid ApplicationId { get { return new Guid("fs5r3f82-5n38-4c83-93c8-cc4c303209ed"); } }
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+
}

‎src/cloudscribe.SimpleContactForm.CoreIntegration/cloudscribe.SimpleContactForm.CoreIntegration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Integration library for usingcloudscribe SimpleContactForm with cloudscribe.Core</Description>
5-
<Version>8.4.0</Version>
5+
<Version>8.5.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;contact form</PackageTags>
@@ -25,7 +25,7 @@
2525
<ProjectReference Include="..\cloudscribe.SimpleContactForm\cloudscribe.SimpleContactForm.csproj" />
2626
</ItemGroup>
2727
<ItemGroup>
28-
<PackageReference Include="cloudscribe.Core.Models" Version="8.4.0" />
28+
<PackageReference Include="cloudscribe.Core.Models" Version="8.5.0" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/cloudscribe.SimpleContactForm/StartupExtensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public static IServiceCollection AddCloudscribeSimpleContactForm(
2626
services.Configure<ContactFormMessageOptions>(configuration.GetSection("ContactFormMessageOptions"));
2727
services.Configure<ContactFormSettings>(configuration.GetSection("ContactFormSettings"));
2828

29-
3029
services.TryAddScoped<IRecaptchaKeysProvider, ConfigRecaptchaKeysProvider>();
3130
services.AddScoped<ContactFormService, ContactFormService>();
3231

‎src/cloudscribe.SimpleContactForm/VersionProvider.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using cloudscribe.SimpleContactForm.ViewModels;
2+
using cloudscribe.Versioning;
3+
using System;
4+
using System.Reflection;
5+
6+
namespace cloudscribe.SimpleContactForm
7+
{
8+
public class VersionProvider : IVersionProvider
9+
{
10+
private Assembly assembly = typeof(MessageViewModel).Assembly;
11+
12+
public string Name
13+
{
14+
get { return assembly.GetName().Name; }
15+
16+
}
17+
18+
public Guid ApplicationId { get { return new Guid("fs5r3f82-4b27-4c83-93c8-cc4c303209ed"); } }
19+
20+
public Version CurrentVersion
21+
{
22+
23+
get
24+
{
25+
26+
var version = new Version(2, 0, 0, 0);
27+
var versionString = 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.SimpleContactForm/cloudscribe.SimpleContactForm.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>A simple contact form for ASP.NET Core</Description>
5-
<Version>8.4.0</Version>
5+
<Version>8.5.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
@@ -38,8 +38,8 @@
3838
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
3939
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
4040
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.0" />
41-
<PackageReference Include="cloudscribe.Web.Common" Version="8.4.0" />
42-
<PackageReference Include="cloudscribe.Email.Senders" Version="8.4.0" />
41+
<PackageReference Include="cloudscribe.Web.Common" Version="8.5.0" />
42+
<PackageReference Include="cloudscribe.Email.Senders" Version="8.5.0" />
4343
</ItemGroup>
4444

4545
</Project>

‎update_version.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
$directory = "src"
1717

1818
# Define the old & new versions
19-
$oldVersion = '8\.3' # slash needed !
20-
$newVersion = "8.4.0"
21-
$newWildcardVersion = "8.4.*"
19+
$oldVersion = '8\.4' # slash needed !
20+
$newVersion = "8.5.0"
21+
$newWildcardVersion = "8.5.*"
2222

2323

2424
# Get all .csproj files in the directory and subdirectories

0 commit comments

Comments
 (0)