Update packages (#16732)

--------- Co-authored-by: Sebastien Ros <[email protected]>
OrchardCMS · Sep 16, 2024 · c417869 · c417869
1 parent d97912a
commit c417869
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 47 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,11 +12,11 @@
 
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.400.4" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.402.12" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />
-    <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
+    <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
     <PackageVersion Include="Azure.Identity" Version="1.12.0" />
     <PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
@@ -29,11 +29,11 @@
     <PackageVersion Include="GraphQL.DataLoader" Version="7.8.0" />
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="7.8.0" />
     <PackageVersion Include="GraphQL.SystemTextJson" Version="7.8.0" />
-    <PackageVersion Include="Jint" Version="4.0.1" />
+    <PackageVersion Include="Jint" Version="4.0.2" />
     <PackageVersion Include="JsonPath.Net" Version="1.1.4" />
     <PackageVersion Include="HtmlSanitizer" Version="8.2.871-beta" />
-    <PackageVersion Include="Irony" Version="1.5.1" />
-    <PackageVersion Include="libphonenumber-csharp" Version="8.13.43" />
+    <PackageVersion Include="Irony" Version="1.5.3" />
+    <PackageVersion Include="libphonenumber-csharp" Version="8.13.45" />
     <PackageVersion Include="Lorem.Universal.NET" Version="4.0.80" />
     <PackageVersion Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
@@ -42,9 +42,9 @@
     <PackageVersion Include="MailKit" Version="4.7.1.1" />
     <PackageVersion Include="Markdig" Version="0.37.0" />
     <PackageVersion Include="MessagePack" Version="2.2.60" />
-    <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="3.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="3.1.0" />
 
     <!--
       Important: the version of the Microsoft.IdentityModel.Protocols.OpenIdConnect package MUST
@@ -54,37 +54,35 @@
       See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
     -->
 
-    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0"/>
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="MimeKit" Version="4.7.1" />
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="ncrontab" Version="3.3.3" />
     <PackageVersion Include="NEST" Version="7.17.5" />
     <PackageVersion Include="NJsonSchema" Version="11.0.2" />
-    <PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
-    <PackageVersion Include="NodaTime" Version="3.1.11" />
-    <PackageVersion Include="OpenIddict.Core" Version="5.7.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.7.0" />
-    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.7.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.7.0" />
-    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.7.0" />
-    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.7.0" />
+    <PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.13" />
+    <PackageVersion Include="NodaTime" Version="3.1.12" />
+    <PackageVersion Include="OpenIddict.Core" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.8.0" />
+    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.8.0" />
     <PackageVersion Include="OrchardCore.Translations.All" Version="2.0.0" />
     <PackageVersion Include="PdfPig" Version="0.1.8" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
     <PackageVersion Include="Shortcodes" Version="1.3.4" />
     <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
     <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.3" />
     <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.AWS" Version="3.1.3" />
-    <PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
+    <PackageVersion Include="StackExchange.Redis" Version="2.8.16" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
     <PackageVersion Include="xunit" Version="2.9.0" />
-    <PackageVersion Include="xunit.analyzers" Version="1.15.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.16.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="YesSql" Version="5.1.1" />
     <PackageVersion Include="YesSql.Abstractions" Version="5.1.1" />
@@ -94,6 +92,11 @@
     <PackageVersion Include="ZString" Version="2.6.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <GlobalPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0"/>
+  </ItemGroup>
+
   <!-- These versions are used for tansitive dependency forced upgrades only. For instance when a package reference a vulnerable version. -->
   <!-- To list all vulnerable direct references run 'dotnet list package -vulnerable' -->
   <!-- To list all vulnerable transitive references run 'dotnet list package -vulnerable -include-transitive' -->

diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -38,21 +38,4 @@
     <Owners>Orchard Core Community and Contributors</Owners>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!--This is used for Source Link -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
-    <None Include="$(MSBuildThisFileDirectory)/nuget-icon.png">
-      <Pack>True</Pack>
-      <PackagePath>icon.png</PackagePath>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Templates/OrchardCore.ProjectTemplates/OrchardCore.ProjectTemplates.csproj b/src/Templates/OrchardCore.ProjectTemplates/OrchardCore.ProjectTemplates.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\OrchardCore.Build\OrchardCore.Commons.props" />
-  <ItemGroup>
-    <PackageReference Remove="Microsoft.SourceLink.GitHub" />
-    <PackageReference Remove="StyleCop.Analyzers" />
-  </ItemGroup>
   <PropertyGroup>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <IncludeBuildOutput>False</IncludeBuildOutput>

diff --git a/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs b/test/OrchardCore.Tests/Apis/GraphQL/Blog/BlogPostTests.cs
@@ -28,7 +28,7 @@ public async Task ShouldListAllBlogs()
             });
 
         Assert.Single(
-            result["data"]["blog"].AsArray().Where(node => node["contentItemId"].ToString() == context.BlogContentItemId));
+            result["data"]["blog"].AsArray(), node => node["contentItemId"].ToString() == context.BlogContentItemId);
     }
 
     [Fact]

diff --git a/test/OrchardCore.Tests/Stubs/TestShapeTableManager.cs b/test/OrchardCore.Tests/Stubs/TestShapeTableManager.cs
@@ -8,10 +8,10 @@ public class TestShapeTableManager(ShapeTable defaultShapeTable) : IShapeTableMa
 {
     private readonly ShapeTable _defaultShapeTable = defaultShapeTable;
 
-    public ShapeTable GetShapeTable(string themeId)
+    public ShapeTable GetShapeTable(string _)
         => _defaultShapeTable;
 
-    public Task<ShapeTable> GetShapeTableAsync(string themeId)
+    public Task<ShapeTable> GetShapeTableAsync(string _)
         => Task.FromResult(_defaultShapeTable);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ public async Task ShouldListAllBlogs() @@
                 });
             Assert.Single(
-                result["data"]["blog"].AsArray().Where(node => node["contentItemId"].ToString() == context.BlogContentItemId));
+                result["data"]["blog"].AsArray(), node => node["contentItemId"].ToString() == context.BlogContentItemId);
         }
         [Fact]
@@ Expand Down @@