V10 version

patrickdemooij9 · May 31, 2022 · b53c054 · b53c054
1 parent fcfcc1b
commit b53c054
Show file tree

Hide file tree

Showing 2,496 changed files with 3,849 additions and 255,109 deletions.
diff --git a/source/SimpleRedirects.Core/Components/DatabaseUpgradeComponent.cs b/source/SimpleRedirects.Core/Components/DatabaseUpgradeComponent.cs
@@ -3,10 +3,10 @@
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Migrations;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
+using Umbraco.Cms.Infrastructure.Scoping;
 
 namespace SimpleRedirects.Core.Components
 {

diff --git a/source/SimpleRedirects.Core/RedirectRepository.cs b/source/SimpleRedirects.Core/RedirectRepository.cs
@@ -7,7 +7,7 @@
 using SimpleRedirects.Core.Extensions;
 using SimpleRedirects.Core.Models;
 using SimpleRedirects.Core.Utilities.Caching;
-using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Extensions;
 
 namespace SimpleRedirects.Core

diff --git a/source/SimpleRedirects.Core/RedirectUserComposer.cs b/source/SimpleRedirects.Core/RedirectUserComposer.cs
@@ -21,8 +21,8 @@ public void Compose(IUmbracoBuilder builder)
             builder.Dashboards().Add<RedirectDashboard>();
             builder.Components().Append<DatabaseUpgradeComponent>();
 
-            builder.Services.AddUnique<RedirectRepository>();
-            builder.Services.AddUnique<ICacheManager, CacheManager>();
+            builder.Services.AddSingleton<RedirectRepository>();
+            builder.Services.AddSingleton<ICacheManager, CacheManager>();
 
             builder.Services.Configure<SimpleRedirectsOptions>(builder.Config.GetSection(
                 SimpleRedirectsOptions.Position));

diff --git a/source/SimpleRedirects.Core/SimpleRedirects.Core.csproj b/source/SimpleRedirects.Core/SimpleRedirects.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ContentTargetFolders>.</ContentTargetFolders>
     <Product>SimpleRedirects.Core</Product>
     <PackageId>SimpleRedirects.Core</PackageId>
@@ -13,7 +13,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SimpleRedirects/v9/main/package/simpleRedirectsLogo.png</PackageIconUrl>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Umbraco.Cms.Web.Website" Version="9.0.0" />
-    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.0" />
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0-rc4" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0-rc4" />
   </ItemGroup>
 </Project>
diff --git a/...lugins/SimpleRedirects/assets/lang/en.xml → ...e/App_Plugins/SimpleRedirects/Lang/en.xml b/...lugins/SimpleRedirects/assets/lang/en.xml → ...e/App_Plugins/SimpleRedirects/Lang/en.xml
diff --git a/source/SimpleRedirects.Site/SimpleRedirects.Site.csproj b/source/SimpleRedirects.Site/SimpleRedirects.Site.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="9.0.0" />
-        <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0" />
-        <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
+        <PackageReference Include="Umbraco.Cms" Version="10.0.0-rc4" />
     </ItemGroup>
 
     <Import Project="..\SimpleRedirects\build\SimpleRedirects.targets" />