yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post merge fixes

Browse Source
This commit is contained in:
Bjarke Berg
2023-08-15 11:17:06 +02:00
parent 822d57135e
commit fb3ead87b8
7 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Cms.Api.Management/ManagementApiComposer.cs
View File

@@ -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);
}
}

7
src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
View File

@@ -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>

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -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>

2
src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj
View File

@@ -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>

1
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -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>

2
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -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 .

4
tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
View File

@@ -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>