Updated NuGet packages to latest versions of .NET 6

gordon-matt · Nov 18, 2022 · de3dafe · de3dafe
1 parent 3b5cd34
commit de3dafe
Show file tree

Hide file tree

Showing 20 changed files with 72 additions and 50 deletions.
diff --git a/Demos/Demo.AspNetCore.Mvc.OData/Demo.Extenso.AspNetCore.Mvc.OData.csproj b/Demos/Demo.AspNetCore.Mvc.OData/Demo.Extenso.AspNetCore.Mvc.OData.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="6.3.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5" PrivateAssets="all">
+    <PackageReference Include="Autofac" Version="6.5.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.5" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Demos/Demo.Data.InfoSchema/Demo.Data.InfoSchema.csproj b/Demos/Demo.Data.InfoSchema/Demo.Data.InfoSchema.csproj
@@ -18,10 +18,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.326103">
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Extenso.Core\Extenso.Core.csproj" />

diff --git a/Demos/Demo.Extenso.AspNetCore.Blazor.OData/Demo.Extenso.AspNetCore.Blazor.OData.csproj b/Demos/Demo.Extenso.AspNetCore.Blazor.OData/Demo.Extenso.AspNetCore.Blazor.OData.csproj
@@ -6,21 +6,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Autofac" Version="6.3.0" />
-	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-	  <PackageReference Include="Blazorise.Bootstrap" Version="1.0.4" />
-	  <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
-	  <PackageReference Include="EPPlus" Version="6.0.4" />
-	  <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.5" />
-	  <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.5" />
-	  <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.5" />
-	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+	  <PackageReference Include="Autofac" Version="6.5.0" />
+	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+	  <PackageReference Include="Blazorise.Bootstrap" Version="1.1.3.1" />
+	  <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.3.1" />
+	  <PackageReference Include="EPPlus" Version="6.1.0" />
+	  <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Include="Radzen.Blazor" Version="3.18.10" />
+	  <PackageReference Include="Radzen.Blazor" Version="4.3.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...so.AspNetCore.Mvc.ExtensoUI.Foundation/Extenso.AspNetCore.Mvc.ExtensoUI.Foundation.csproj b/...so.AspNetCore.Mvc.ExtensoUI.Foundation/Extenso.AspNetCore.Mvc.ExtensoUI.Foundation.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.Mvc.ExtensoUI.Foundation.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.Mvc.ExtensoUI.Foundation.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI/Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI.csproj b/Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI/Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.Mvc.ExtensoUI.JQueryUI.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI/Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI.csproj b/Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI/Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.Mvc.ExtensoUI.KendoUI.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.AspNetCore.Mvc.ExtensoUI/Extenso.AspNetCore.Mvc.ExtensoUI.csproj b/Extenso.AspNetCore.Mvc.ExtensoUI/Extenso.AspNetCore.Mvc.ExtensoUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.Mvc.ExtensoUI.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.Mvc.ExtensoUI.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.AspNetCore.Mvc/Extenso.AspNetCore.Mvc.csproj b/Extenso.AspNetCore.Mvc/Extenso.AspNetCore.Mvc.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.Mvc.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.Mvc.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.AspNetCore.OData/Extenso.AspNetCore.OData.csproj b/Extenso.AspNetCore.OData/Extenso.AspNetCore.OData.csproj
@@ -15,11 +15,11 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.AspNetCore.OData.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.AspNetCore.OData.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Extenso.Core/Collections/EnumerableExtensions.cs b/Extenso.Core/Collections/EnumerableExtensions.cs
@@ -107,6 +107,32 @@ public static IEnumerable<TSource> DistinctBy<TSource, TKey>(
             }
         }
 
+        public static IEnumerable<T> Flatten<T>(this IEnumerable<T> source, Func<T, IEnumerable<T>> selector)
+        {
+            var queue = new Queue<T>();
+            foreach (var item in source)
+            {
+                queue.Enqueue(item);
+            }
+
+            while (queue.Count > 0)
+            {
+                var current = queue.Dequeue();
+                yield return current;
+
+                var children = selector(current);
+                if (children == null)
+                {
+                    continue;
+                }
+
+                foreach (var child in children)
+                {
+                    queue.Enqueue(child);
+                }
+            }
+        }
+
         /// <summary>
         /// Performs the specified action on each element of the System.Collections.Generic.IEnumerable`1.
         /// </summary>

diff --git a/Extenso.Core/Extenso.Core.csproj b/Extenso.Core/Extenso.Core.csproj
@@ -12,12 +12,8 @@
     <Version>6.0.0</Version>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile></DocumentationFile>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Core.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Core.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.Entity/Extenso.Data.Entity.csproj b/Extenso.Data.Entity/Extenso.Data.Entity.csproj
@@ -12,13 +12,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.Entity.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.Entity.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.13.20" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.17.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.MySql/Extenso.Data.MySql.csproj b/Extenso.Data.MySql/Extenso.Data.MySql.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="8.0.29" />
+    <PackageReference Include="MySql.Data" Version="8.0.31" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.Npgsql/Extenso.Data.Npgsql.csproj b/Extenso.Data.Npgsql/Extenso.Data.Npgsql.csproj
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.Npgsql.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.Npgsql.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.QueryBuilder.MySql/Extenso.Data.QueryBuilder.MySql.csproj b/Extenso.Data.QueryBuilder.MySql/Extenso.Data.QueryBuilder.MySql.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.QueryBuilder.MySql.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.QueryBuilder.MySql.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.QueryBuilder.Npgsql/Extenso.Data.QueryBuilder.Npgsql.csproj b/Extenso.Data.QueryBuilder.Npgsql/Extenso.Data.QueryBuilder.Npgsql.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.QueryBuilder.Npgsql.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.QueryBuilder.Npgsql.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data.QueryBuilder/Extenso.Data.QueryBuilder.csproj b/Extenso.Data.QueryBuilder/Extenso.Data.QueryBuilder.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.QueryBuilder.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.QueryBuilder.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Extenso.Data/Extenso.Data.csproj b/Extenso.Data/Extenso.Data.csproj
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Data.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Data.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Extenso.Drawing/Extenso.Drawing.csproj b/Extenso.Drawing/Extenso.Drawing.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.1\Extenso.Drawing.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Extenso.Drawing.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Tests/Extenso.Core.Tests/Extenso.Core.Tests.csproj b/Tests/Extenso.Core.Tests/Extenso.Core.Tests.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>