From af3e911905e973971904d0b640898f14de43d576 Mon Sep 17 00:00:00 2001
From: John Katsiotis <john@parkaround.com>
Date: Tue, 2 May 2023 08:08:12 +0300
Subject: [PATCH 1/2] Upgrade to .NET 7

---
 src/NavigationDemo.Web/NavigationDemo.Web.csproj  |  2 +-
 src/RazorPages.WebApp/RazorPages.WebApp.csproj    | 15 +++++++++------
 src/RazorPages.WebApp/Startup.cs                  |  2 +-
 .../cloudscribe.Web.Navigation.csproj             | 14 +++++++-------
 .../cloudscribe.Web.SiteMap.FromNavigation.csproj |  2 +-
 .../cloudscribe.Web.SiteMap.csproj                |  6 +++---
 .../cloudscribe.Web.Navigation.Test.csproj        | 11 +++++++----
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/NavigationDemo.Web/NavigationDemo.Web.csproj b/src/NavigationDemo.Web/NavigationDemo.Web.csproj
index ec01ac2..7263d24 100644
--- a/src/NavigationDemo.Web/NavigationDemo.Web.csproj
+++ b/src/NavigationDemo.Web/NavigationDemo.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     
   </PropertyGroup>
 
diff --git a/src/RazorPages.WebApp/RazorPages.WebApp.csproj b/src/RazorPages.WebApp/RazorPages.WebApp.csproj
index cafd0f9..370b2a4 100644
--- a/src/RazorPages.WebApp/RazorPages.WebApp.csproj
+++ b/src/RazorPages.WebApp/RazorPages.WebApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>aspnet-RazorPages.WebApp-0BEB55BD-36A5-4CAC-A1C9-81104294AB20</UserSecretsId>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
@@ -14,11 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview7.19362.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview7.19362.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/RazorPages.WebApp/Startup.cs b/src/RazorPages.WebApp/Startup.cs
index 32f1597..97a98e7 100644
--- a/src/RazorPages.WebApp/Startup.cs
+++ b/src/RazorPages.WebApp/Startup.cs
@@ -52,7 +52,7 @@ public void ConfigureServices(IServiceCollection services)
                 options.UseSqlServer(
                     Configuration.GetConnectionString("DefaultConnection")));
             services.AddDefaultIdentity<IdentityUser>()
-                .AddDefaultUI(UIFramework.Bootstrap4)
+                .AddDefaultUI()
                 .AddEntityFrameworkStores<ApplicationDbContext>();
 
             services.AddControllersWithViews();
diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
index d0928e6..e0e81e3 100644
--- a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
+++ b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>an ASP.NET Core viewcomponent for menus and breadcrumbs</Description>
     <Version>6.0.2</Version>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageTags>cloudscribe;asp.net core;mvcsitemapprovider;navigation;menus;breadcrumbs;bootstrap</PackageTags>
@@ -24,13 +24,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
index d08ccd9..c238e65 100644
--- a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
+++ b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>cloudscribe.Web.SiteMap.FromNavigation a library that implements ISiteMapNodeService using existing tree of nodes from cloudscribe.Web.Navigation.NavigationTreeBuilderService</Description>
     <Version>6.0.2</Version>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;mvc;sitemap</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
diff --git a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
index 196c5e1..763e46f 100644
--- a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
+++ b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>ASP.NET Core controller and models for generating an xml sitemap for search indexes http://www.sitemaps.org</Description>
     <Version>6.0.0</Version>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <Authors>Joe Audette</Authors>
     <AssemblyName>cloudscribe.Web.SiteMap</AssemblyName>
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj b/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj
index 1e9228a..e8d5a19 100644
--- a/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj
+++ b/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
    
   </PropertyGroup>
@@ -11,9 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector" Version="1.0.1" />
   </ItemGroup>
 

From 6ee1702d7edb367c72ea714df71c510c18f71c0c Mon Sep 17 00:00:00 2001
From: John Katsiotis <751955+jkatsiotis@users.noreply.github.com>
Date: Tue, 2 May 2023 09:17:55 +0300
Subject: [PATCH 2/2] Bumping cloudscribe vesions to 7.0

---
 .../cloudscribe.Web.Navigation.csproj                           | 2 +-
 .../cloudscribe.Web.SiteMap.FromNavigation.csproj               | 2 +-
 src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
index e0e81e3..bf35022 100644
--- a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
+++ b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>an ASP.NET Core viewcomponent for menus and breadcrumbs</Description>
-    <Version>6.0.2</Version>
+    <Version>7.0.0</Version>
     <TargetFramework>net7.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
index c238e65..e4ddaad 100644
--- a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
+++ b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>cloudscribe.Web.SiteMap.FromNavigation a library that implements ISiteMapNodeService using existing tree of nodes from cloudscribe.Web.Navigation.NavigationTreeBuilderService</Description>
-    <Version>6.0.2</Version>
+    <Version>7.0.0</Version>
     <TargetFramework>net7.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;mvc;sitemap</PackageTags>
diff --git a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
index 763e46f..0172327 100644
--- a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
+++ b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core controller and models for generating an xml sitemap for search indexes http://www.sitemaps.org</Description>
-    <Version>6.0.0</Version>
+    <Version>7.0.0</Version>
     <TargetFramework>net7.0</TargetFramework>
 
     <Authors>Joe Audette</Authors>