Merge pull request #1838 from qdraw/feature/202411_nuget_update2

nuget updates
qdraw · Nov 29, 2024 · 2494f77 · 2494f77
2 parents 308cd5d + b827cf0
commit 2494f77
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 45 deletions.
diff --git a/starsky/build/_build.csproj b/starsky/build/_build.csproj
@@ -16,7 +16,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0"/>
-        <PackageReference Include="Nuke.Common" Version="8.1.4" />
+        <PackageReference Include="Nuke.Common" Version="9.0.1" />
         <PackageReference Include="ReportGenerator.Core" Version="5.2.5" />
         <PackageReference Include="SimpleExec" Version="12.0.0"/>
     </ItemGroup>

diff --git a/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs b/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs
@@ -143,18 +143,17 @@ public static void BuildNetCoreCommand(Solution solution, Configuration
 			.DisableRunCodeAnalysis()
 			.EnableSelfContained()
 			.SetConfiguration(configuration)
-			.SetProcessArgumentConfigurator(args =>
-				args
-					// OverwriteRuntimeIdentifier is done via Directory.Build.props
-					// Building a solution with a specific RuntimeIdentifier is not supported
-					// Don't use SetRuntime
-					.Add($"/p:OverwriteRuntimeIdentifier={runtime}")
-					// Warnings are disabled because in Generic build they are already checked
-					.Add("-v q")
-					.Add("/p:WarningLevel=0")
-					// SonarQube analysis is done in the generic build
-					.Add("/p:noSonar=true")
-					.Add(readyToRunArgument)
+			.AddProcessAdditionalArguments(
+				// OverwriteRuntimeIdentifier is done via Directory.Build.props
+				// Building a solution with a specific RuntimeIdentifier is not supported
+				// Don't use SetRuntime here
+				$"/p:OverwriteRuntimeIdentifier={runtime}",
+				// Warnings are disabled because in Generic build they are already checked
+				"-v q",
+				"/p:WarningLevel=0",
+				// SonarQube analysis is done in the generic build
+				"/p:noSonar=true",
+				readyToRunArgument
 			));
 	}
 
@@ -198,11 +197,9 @@ public static void PublishNetCoreGenericCommand(Configuration configuration,
 				.SetProject(publishProjectFullPath)
 				.SetRuntime(runtime)
 				.EnableNoLogo()
-				.SetProcessArgumentConfigurator(args =>
-					args.Add("/p:noSonar=true")
-						.Add($"/p:OverwriteRuntimeIdentifier={runtime}")
-						.Add(readyToRunArgument)
-				)
+				.AddProcessAdditionalArguments("/p:noSonar=true",
+					$"/p:OverwriteRuntimeIdentifier={runtime}",
+					readyToRunArgument)
 			);
 		}
 	}

diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json
@@ -1,7 +1,7 @@
 [
   "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.11",
   "Microsoft.Extensions.Hosting.WindowsServices 8.0.1",
-  "Swashbuckle.AspNetCore 6.9.0",
+  "Swashbuckle.AspNetCore 7.1.0",
   "Microsoft.Extensions.Caching.Abstractions 8.0.0",
   "Microsoft.Extensions.Caching.Memory 8.0.1",
   "Microsoft.Extensions.Hosting.Abstractions 8.0.1",
@@ -13,7 +13,7 @@
   "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.11",
   "MedallionShell 1.6.2",
   "RazorLight 2.3.1",
-  "SixLabors.ImageSharp 3.1.5",
+  "SixLabors.ImageSharp 3.1.6",
   "SixLabors.ImageSharp.Drawing 2.1.4",
   "Microsoft.AspNetCore.Authorization 8.0.11",
   "Microsoft.EntityFrameworkCore.Analyzers 8.0.11",
@@ -33,8 +33,8 @@
   "Microsoft.Extensions.Configuration.EnvironmentVariables 8.0.0",
   "Microsoft.Extensions.Configuration.Json 8.0.1",
   "Microsoft.Extensions.Logging.Abstractions 8.0.2",
-  "System.Buffers 4.5.1",
-  "System.Threading.Tasks.Dataflow 8.0.1",
+  "System.Buffers 4.6.0",
+  "System.Threading.Tasks.Dataflow 9.0.0",
   "TimeZoneConverter 6.1.0",
   "GeoTimeZone 5.3.0",
   "XmpCore 6.1.10.1",
@@ -48,13 +48,13 @@
   "OpenTelemetry.Instrumentation.AspNetCore 1.9.0",
   "OpenTelemetry.Instrumentation.EntityFrameworkCore 1.0.0-beta.11",
   "OpenTelemetry.Instrumentation.Runtime 1.9.0",
-  "System.Diagnostics.DiagnosticSource 8.0.1",
-  "System.Text.Json 8.0.5",
+  "System.Diagnostics.DiagnosticSource 9.0.0",
+  "System.Text.Json 9.0.0",
   "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.11",
   "Microsoft.Extensions.Hosting 8.0.1",
-  "Microsoft.NET.Test.Sdk 17.11.1",
-  "MSTest.TestAdapter 3.6.2",
-  "MSTest.TestFramework 3.6.2",
+  "Microsoft.NET.Test.Sdk 17.12.0",
+  "MSTest.TestAdapter 3.6.3",
+  "MSTest.TestFramework 3.6.3",
   "coverlet.collector 6.0.2",
   "Microsoft.AspNetCore.Mvc.Formatters.Json 2.2.0",
   "Microsoft.AspNetCore.Identity 2.2.0"

diff --git a/starsky/starsky.feature.thumbnail/Services/PeriodicThumbnailScanHostedService.cs b/starsky/starsky.feature.thumbnail/Services/PeriodicThumbnailScanHostedService.cs
@@ -79,13 +79,9 @@ await timer.WaitForNextTickAsync(cancellationToken) )
 				await RunJob(cancellationToken);
 			}
 		}
-		catch ( OperationCanceledException exception )
+		catch ( OperationCanceledException )
 		{
-			_logger.LogError(
-				$"[StartBackgroundAsync] catch-ed OperationCanceledException " +
-				$"Src:{exception.Source} Mes:{exception.Message} SaTtr:{exception.StackTrace}" +
-				$" Inner:{exception.InnerException?.StackTrace} HRes:{exception.HResult}",
-				exception);
+			// Expected when the host is shutting down
 		}
 
 		return null;

diff --git a/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj b/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj
@@ -20,7 +20,7 @@
 
     <ItemGroup>
         <PackageReference Include="RazorLight" Version="2.3.1"/>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
     </ItemGroup>
 

diff --git a/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj b/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj
@@ -23,9 +23,9 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-        <PackageReference Include="System.Buffers" Version="4.5.1"/>
+        <PackageReference Include="System.Buffers" Version="4.6.0" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0"/>
-        <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
+        <PackageReference Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
         <PackageReference Include="TimeZoneConverter" Version="6.1.0"/>
     </ItemGroup>
 

diff --git a/starsky/starsky.foundation.storage/starsky.foundation.storage.csproj b/starsky/starsky.foundation.storage/starsky.foundation.storage.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Buffers" Version="4.5.1" />
+      <PackageReference Include="System.Buffers" Version="4.6.0" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(noSonar)' == 'true' ">

diff --git a/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj b/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
         <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
     </ItemGroup>
 

diff --git a/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj b/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="MetadataExtractor" Version="2.8.1"/>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(noSonar)' == 'true' ">

diff --git a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj
@@ -32,8 +32,8 @@
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
         <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
-        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
-        <PackageReference Include="System.Text.Json" Version="8.0.5" />
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(noSonar)' == 'true' ">

diff --git a/starsky/starsky/starsky.csproj b/starsky/starsky/starsky.csproj
@@ -61,7 +61,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
         <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
     </ItemGroup>
     <!-- generate xml file for swagger -->
     <PropertyGroup>

diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj
@@ -25,9 +25,9 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.2"/>
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
         <PackageReference Include="coverlet.collector" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>