Revert "Merge pull request #33 from cloudscribe/feature/698"

This reverts commit f0a4f81, reversing
changes made to e572cd3.

Author: JimKerslake

src/WebApp/WebApp.csproj

@@ -24,11 +24,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Core.Web" Version="8.5.*" />
-    <PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap5" Version="8.5.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.5.0" />
-    <PackageReference Include="cloudscribe.Logging.Web" Version="8.5.0" />
-    <PackageReference Include="cloudscribe.Logging.NoDb" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Core.Web" Version="8.4.*" />
+    <PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap3" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Logging.Web" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Logging.NoDb" Version="8.4.0" />
   </ItemGroup>
 
 </Project>

src/cloudscribe.SimpleContactForm.CoreIntegration/StartupExtensions.cs

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

src/cloudscribe.SimpleContactForm.CoreIntegration/VersionProvider.cs

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Integration library for usingcloudscribe SimpleContactForm with cloudscribe.Core</Description>
-    <Version>8.5.0</Version>
+    <Version>8.4.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;contact form</PackageTags>
@@ -25,7 +25,7 @@
     <ProjectReference Include="..\cloudscribe.SimpleContactForm\cloudscribe.SimpleContactForm.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Core.Models" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Core.Models" Version="8.4.0" />
   </ItemGroup>
 
 </Project>

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

@@ -26,6 +26,7 @@ public static IServiceCollection AddCloudscribeSimpleContactForm(
             services.Configure<ContactFormMessageOptions>(configuration.GetSection("ContactFormMessageOptions"));
             services.Configure<ContactFormSettings>(configuration.GetSection("ContactFormSettings"));
 
+           
             services.TryAddScoped<IRecaptchaKeysProvider, ConfigRecaptchaKeysProvider>();
             services.AddScoped<ContactFormService, ContactFormService>();
 

src/cloudscribe.SimpleContactForm/StartupExtensions.cs

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A simple contact form for ASP.NET Core</Description>
-    <Version>8.5.0</Version>
+    <Version>8.4.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
@@ -38,8 +38,8 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Web.Common" Version="8.5.0" />
-    <PackageReference Include="cloudscribe.Email.Senders" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Web.Common" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Email.Senders" Version="8.4.0" />
   </ItemGroup>
 
 </Project>

src/cloudscribe.SimpleContactForm/VersionProvider.cs

@@ -16,9 +16,9 @@
 $directory = "src"
 
 # Define the old & new versions
-$oldVersion = '8\.4'   # slash needed !
-$newVersion = "8.5.0"
-$newWildcardVersion = "8.5.*"
+$oldVersion = '8\.3'   # slash needed !
+$newVersion = "8.4.0"
+$newWildcardVersion = "8.4.*"
 
 
 # Get all .csproj files in the directory and subdirectories