From d3df71e99aad0c11bd53447359aaaab6d5c2aefc Mon Sep 17 00:00:00 2001
From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com>
Date: Thu, 25 May 2023 18:47:48 +0100
Subject: [PATCH] #49

---
 .../NetworkOnlyUrlProvider.cs                                 | 1 +
 .../StartupExtensions.cs                                      | 1 -
 .../cloudscribe.PwaKit.Integration.CloudscribeCore.csproj     | 2 +-
 .../Models}/PwaNetworkOnlyUrlOptions.cs                       | 2 +-
 src/cloudscribe.PwaKit/StartupExtensions.cs                   | 2 ++
 src/cloudscribe.PwaKit/cloudscribe.PwaKit.csproj              | 4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename src/{cloudscribe.PwaKit.Integration.CloudscribeCore => cloudscribe.PwaKit/Models}/PwaNetworkOnlyUrlOptions.cs (87%)

diff --git a/src/cloudscribe.PwaKit.Integration.CloudscribeCore/NetworkOnlyUrlProvider.cs b/src/cloudscribe.PwaKit.Integration.CloudscribeCore/NetworkOnlyUrlProvider.cs
index 2873997..f65c7b9 100644
--- 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
index 7b278e5..78db1ec 100644
--- 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/src/cloudscribe.PwaKit.Integration.CloudscribeCore/cloudscribe.PwaKit.Integration.CloudscribeCore.csproj b/src/cloudscribe.PwaKit.Integration.CloudscribeCore/cloudscribe.PwaKit.Integration.CloudscribeCore.csproj
index a03b41e..d8b8016 100644
--- a/src/cloudscribe.PwaKit.Integration.CloudscribeCore/cloudscribe.PwaKit.Integration.CloudscribeCore.csproj
+++ b/src/cloudscribe.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/src/cloudscribe.PwaKit.Integration.CloudscribeCore/PwaNetworkOnlyUrlOptions.cs b/src/cloudscribe.PwaKit/Models/PwaNetworkOnlyUrlOptions.cs
similarity index 87%
rename from src/cloudscribe.PwaKit.Integration.CloudscribeCore/PwaNetworkOnlyUrlOptions.cs
rename to src/cloudscribe.PwaKit/Models/PwaNetworkOnlyUrlOptions.cs
index a79067a..e086065 100644
--- a/src/cloudscribe.PwaKit.Integration.CloudscribeCore/PwaNetworkOnlyUrlOptions.cs
+++ b/src/cloudscribe.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
index a29837c..5c516dd 100644
--- 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
index 6bc9bdf..90c6c67 100644
--- 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>