Merge pull request #51 from cloudscribe/feature/49

#49
cloudscribe · May 25, 2023 · 2541095 · 2541095
2 parents f914c98 + d3df71e
commit 2541095
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/src/cloudscribe.PwaKit.Integration.CloudscribeCore/NetworkOnlyUrlProvider.cs b/src/cloudscribe.PwaKit.Integration.CloudscribeCore/NetworkOnlyUrlProvider.cs
@@ -1,4 +1,5 @@
 using cloudscribe.PwaKit.Interfaces;
+using cloudscribe.PwaKit.Models;
 using cloudscribe.Web.Navigation;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/src/cloudscribe.PwaKit.Integration.CloudscribeCore/StartupExtensions.cs b/src/cloudscribe.PwaKit.Integration.CloudscribeCore/StartupExtensions.cs
@@ -35,7 +35,6 @@ public static PwaBuilder MakeCloudscribeAdminPagesNetworkOnly(this PwaBuilder bu
         public static PwaBuilder PreCacheContentFiles(this PwaBuilder builder)
         {
             builder.Services.Configure<PwaContentFilesPreCacheOptions>(builder.Configuration.GetSection("PwaContentFilesPreCacheOptions"));
-            builder.Services.Configure<PwaNetworkOnlyUrlOptions>(builder.Configuration.GetSection("PwaNetworkOnlyUrlOptions"));
 
             builder.Services.AddScoped<IRuntimeCacheItemProvider, ContentFilesRuntimeCacheItemProvider>();
             builder.Services.AddScoped<IHandleFilesUploaded, FileUploadCacheUpdateHandler>();

diff --git a/....PwaKit.Integration.CloudscribeCore/cloudscribe.PwaKit.Integration.CloudscribeCore.csproj b/....PwaKit.Integration.CloudscribeCore/cloudscribe.PwaKit.Integration.CloudscribeCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Integration between cloudscribe.Core and cloudscribe.PwaKit</Description>
-    <Version>6.0.2</Version>
+    <Version>6.0.4</Version>
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>

diff --git a/...oudscribeCore/PwaNetworkOnlyUrlOptions.cs → ...PwaKit/Models/PwaNetworkOnlyUrlOptions.cs b/...oudscribeCore/PwaNetworkOnlyUrlOptions.cs → ...PwaKit/Models/PwaNetworkOnlyUrlOptions.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace cloudscribe.PwaKit.Integration.CloudscribeCore
+namespace cloudscribe.PwaKit.Models
 {
     public class PwaNetworkOnlyUrlOptions
     {

diff --git a/src/cloudscribe.PwaKit/StartupExtensions.cs b/src/cloudscribe.PwaKit/StartupExtensions.cs
@@ -26,6 +26,8 @@ IConfiguration config
             services.Configure<PwaOptions>(config.GetSection("PwaOptions"));
             services.Configure<PwaPreCacheItems>(config.GetSection("PwaPreCacheItems"));
             services.Configure<PwaRuntimeCacheItems>(config.GetSection("PwaRuntimeCacheItems"));
+            services.Configure<PwaNetworkOnlyUrlOptions>(config.GetSection("PwaNetworkOnlyUrlOptions"));
+
 
             services.Configure<PushClientSettings>(config.GetSection("PushServiceClient"));
 

diff --git a/src/cloudscribe.PwaKit/cloudscribe.PwaKit.csproj b/src/cloudscribe.PwaKit/cloudscribe.PwaKit.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>A set of tools for building a dynamic serviceworker at runtime for ASP.NET Core</Description>
-    <Version>6.0.1</Version>
-    <TargetFramework>net6.0</TargetFramework>
+    <Version>6.0.4</Version>
+    <TargetFramework>net6.0</TargetFramework> 
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageTags>pwa,serviceworker,manifest,cloudscribe</PackageTags>