From fb3ead87b8d74fd87bbb975b437b23d31e260425 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 15 Aug 2023 11:17:06 +0200
Subject: [PATCH] Post merge fixes

---
 src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs    | 3 ---
 .../Umbraco.Cms.Persistence.EFCore.csproj                  | 7 +------
 src/Umbraco.Core/Umbraco.Core.csproj                       | 2 --
 src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj           | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                   | 1 -
 .../Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker | 2 +-
 .../Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj | 4 ----
 7 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs b/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
index 699c663db6..87fcdecd7b 100644
--- a/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
+++ b/src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
@@ -10,7 +10,6 @@ using Umbraco.Cms.Api.Management.Serialization;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.Configuration;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
-using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Management;
 
@@ -80,8 +79,6 @@ public class ManagementApiComposer : IComposer
         builder.AddUmbracoOptions<NewBackOfficeSettings>();
         // FIXME: remove this when NewBackOfficeSettings is moved to core
         services.AddSingleton<IValidateOptions<NewBackOfficeSettings>, NewBackOfficeSettingsValidator>();
-
-        BackOfficeAuthBuilderOpenIddictExtensions.AddUmbracoEFCoreDbContext(builder);
     }
 }
 
diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
index 5e87a27a0a..1a22396215 100644
--- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
+++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
@@ -5,14 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.6.*" />
+
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.7.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.*" />
     <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.5.0" />
   </ItemGroup>
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1014c445ff..1f79d50278 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -24,8 +24,6 @@
   <ItemGroup>
     <!-- Update implicit dependencies to fix security issues, even though we do not use them explicitly and they are taken from the shared framework instead of NuGet -->
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0-preview.6.*" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0-preview.7.*" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
index f43d2401cf..7a09062998 100644
--- a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
+++ b/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.6.*">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.*">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5a8894b918..a566097320 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -28,7 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.6.*">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.*">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
index bfbe277bc1..6a813e451b 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
+++ b/tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
@@ -2,7 +2,7 @@
 ## Build
 ############################################
 
-FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-preview.6-jammy AS build
+FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-preview.7-jammy AS build
 
 COPY nuget.config .
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
index 24ebae2e7d..b122293e40 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -10,10 +10,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="AngleSharp" Version="1.0.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.6.*" />
-    <PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.6.*" />
     <PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.7.*" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.7.*" />
   </ItemGroup>