fix bunch of nu19xx issues (#1980)

dpvreony · Nov 19, 2024 · c82e928 · c82e928
1 parent 752337f
commit c82e928
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 4 deletions.
diff --git a/src/Whipstaff.AspNetCore/Whipstaff.AspNetCore.csproj b/src/Whipstaff.AspNetCore/Whipstaff.AspNetCore.csproj
@@ -16,9 +16,10 @@
     <PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
     -->
-    <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+    <!--<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />-->
     <PackageReference Include="Audit.NET" Version="27.1.1" />
     <PackageReference Include="Audit.WebApi.Core" Version="27.1.1" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
     <PackageReference Include="Ben.BlockingDetector" Version="0.0.4" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.1" />
     <PackageReference Include="DynamicData" Version="9.0.4" />
@@ -32,6 +33,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
     <PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.1" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.36.0" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
@@ -40,6 +42,9 @@
     <PackageReference Include="RimDev.ApplicationInsights.Filters" Version="1.1.62" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
     <!--<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.0.0" />-->
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.36.0" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.Couchbase/Whipstaff.Couchbase.csproj b/src/Whipstaff.Couchbase/Whipstaff.Couchbase.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,6 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Couchbase.Extensions.Locks" Version="2.0.0" />
     <PackageReference Include="Foundatio" Version="11.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.Example.WebMvcApp/Dhgms.AspNetCoreContrib.Example.WebMvcApp.csproj b/src/Whipstaff.Example.WebMvcApp/Dhgms.AspNetCoreContrib.Example.WebMvcApp.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
-    <PackageReference Include="RimDev.Stuntman" Version="3.0.0" />
+    <!--<PackageReference Include="RimDev.Stuntman" Version="3.0.0" />-->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.Example.WebMvcApp/Startup.cs b/src/Whipstaff.Example.WebMvcApp/Startup.cs
@@ -19,7 +19,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+#if stuntman
 using RimDev.Stuntman.Core;
+#endif
 using Whipstaff.AspNetCore;
 using Whipstaff.AspNetCore.Features.ApplicationStartup;
 using Whipstaff.EntityFramework.ModelCreation;
@@ -37,15 +39,19 @@ namespace Dhgms.AspNetCoreContrib.Example.WebMvcApp
     /// </summary>
     public sealed class Startup : BaseStartup
     {
+#if stuntman
         private readonly StuntmanOptions _stuntmanOptions;
+#endif
         private readonly DbConnection _dbConnection;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Startup"/> class.
         /// </summary>
         public Startup()
         {
+#if stuntman
             _stuntmanOptions = new StuntmanOptions();
+#endif
             _dbConnection = CreateInMemoryDatabase();
         }
 
@@ -61,7 +67,9 @@ protected override void OnConfigureServices(IServiceCollection serviceCollection
             _ = serviceCollection.AddSingleton<FakeAuditableQueryFactory>();
             _ = serviceCollection.AddSingleton<FakeCrudControllerLogMessageActions>();
 
+#if stuntman
             serviceCollection.AddStuntman(_stuntmanOptions);
+#endif
             _ = serviceCollection.AddTransient(_ => new DbContextOptionsBuilder<FakeDbContext>()
                 .UseSqlite(_dbConnection)
                 .AddInterceptors(new RowVersionSaveChangesInterceptor())
@@ -76,7 +84,9 @@ protected override void OnConfigure(
             IWebHostEnvironment env,
             ILoggerFactory loggerFactory)
         {
+#if stuntman
             app.UseStuntman(_stuntmanOptions);
+#endif
 
             _ = app.UseStaticFiles();
         }

diff --git a/src/Whipstaff.IntegrationTests/Whipstaff.IntegrationTests.csproj b/src/Whipstaff.IntegrationTests/Whipstaff.IntegrationTests.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.MediatR.Foundatio/Whipstaff.MediatR.Foundatio.csproj b/src/Whipstaff.MediatR.Foundatio/Whipstaff.MediatR.Foundatio.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.ReactiveUI/Whipstaff.ReactiveUI.csproj b/src/Whipstaff.ReactiveUI/Whipstaff.ReactiveUI.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="ReactiveUI" Version="20.1.63" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Whipstaff.Statiq/Whipstaff.Statiq.csproj b/src/Whipstaff.Statiq/Whipstaff.Statiq.csproj
@@ -18,6 +18,16 @@
 
   <ItemGroup>
     <PackageReference Include="Statiq.Web" Version="1.0.0-beta.60" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.36.0" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageReference Include="System.DirectoryServices.Protocols" Version="5.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.3" />
   </ItemGroup>