Post merge fixes

This commit is contained in:
Bjarke Berg
2023-08-08 12:19:29 +02:00
parent 2839131033
commit d9f528f3ae
7 changed files with 9 additions and 9 deletions

View File

@@ -7,7 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.5.23280.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.6.*" />
</ItemGroup>

View File

@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.5.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.5.*" />
<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.*" />

View File

@@ -5,7 +5,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0-preview.5.23280.1" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0-preview.6.*" />
</ItemGroup>

View File

@@ -24,7 +24,7 @@
<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.5.*" />
<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.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

View File

@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.5.23280.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.6.*">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

View File

@@ -25,7 +25,9 @@
<AdditionalFiles Include="umbraco\UmbracoWebsite\Maintenance.cshtml" />
<AdditionalFiles Include="umbraco\UmbracoWebsite\NoNodes.cshtml" />
<AdditionalFiles Include="umbraco\UmbracoWebsite\NotFound.cshtml" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.5.*">
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.6.*">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

View File

@@ -10,8 +10,8 @@
<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.5.*" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.5.*" />
<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.*" />
</ItemGroup>