Merge branch 'develop' into feature/CSET-2552

cisagov · Feb 5, 2024 · 704f068 · 704f068
2 parents a28507f + 037754d
commit 704f068
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 55 deletions.
diff --git a/CSETWebApi/CSETWebCore.AutoResponderTests/CSETWebCore.AutoResponderTests.csproj b/CSETWebApi/CSETWebCore.AutoResponderTests/CSETWebCore.AutoResponderTests.csproj
@@ -28,8 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ApiTests/CSETWebCore.ApiTests.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.ApiTests/CSETWebCore.ApiTests.csproj
@@ -10,8 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/ImportManagerAwwa.cs
@@ -346,39 +346,37 @@ private string GetCellValue(SpreadsheetDocument doc, WorksheetPart wsp, string c
                 // the words TRUE or FALSE.
                 if (theCell.DataType != null)
                 {
-                    switch (theCell.DataType.Value)
+                    if (theCell.DataType.Value == CellValues.SharedString)
                     {
-                        case CellValues.SharedString:
-
-                            // For shared strings, look up the value in the
-                            // shared strings table.
-                            var stringTable =
-                                doc.WorkbookPart.GetPartsOfType<SharedStringTablePart>()
-                                .FirstOrDefault();
-
-                            // If the shared string table is missing, something 
-                            // is wrong. Return the index that is in
-                            // the cell. Otherwise, look up the correct text in 
-                            // the table.
-                            if (stringTable != null)
-                            {
-                                value =
-                                    stringTable.SharedStringTable
-                                    .ElementAt(int.Parse(value)).InnerText;
-                            }
-                            break;
+                        // For shared strings, look up the value in the
+                        // shared strings table.
+                        var stringTable =
+                            doc.WorkbookPart.GetPartsOfType<SharedStringTablePart>()
+                            .FirstOrDefault();
+
+                        // If the shared string table is missing, something 
+                        // is wrong. Return the index that is in
+                        // the cell. Otherwise, look up the correct text in 
+                        // the table.
+                        if (stringTable != null)
+                        {
+                            value =
+                                stringTable.SharedStringTable
+                                .ElementAt(int.Parse(value)).InnerText;
+                        }
+                    }
 
-                        case CellValues.Boolean:
-                            switch (value)
-                            {
-                                case "0":
-                                    value = "FALSE";
-                                    break;
-                                default:
-                                    value = "TRUE";
-                                    break;
-                            }
-                            break;
+                    if (theCell.DataType.Value == CellValues.Boolean)
+                    {
+                        switch (value)
+                        {
+                            case "0":
+                                value = "FALSE";
+                                break;
+                            default:
+                                value = "TRUE";
+                                break;
+                        }
                     }
                 }
             }
@@ -414,7 +412,7 @@ public static string GetValue(SpreadsheetDocument doc, Cell cell)
             string value = cell.CellValue?.InnerText;
             if (cell.DataType != null && cell.DataType.Value == CellValues.SharedString)
             {
-                return doc.WorkbookPart.SharedStringTablePart.SharedStringTable.ChildElements.GetItem(int.Parse(value)).InnerText;
+                return doc.WorkbookPart.SharedStringTablePart.SharedStringTable.ChildElements[int.Parse(value)].InnerText;
             }
             return value;
         }

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/CSETWebCore.Business.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/CSETWebCore.Business.csproj
@@ -105,7 +105,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper.Excel.Core" Version="27.2.1" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
     <PackageReference Include="DotNetZip" Version="1.16.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
@@ -114,7 +114,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NJsonSchema" Version="10.9.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
     <PackageReference Include="NSoupCore" Version="1.0.0" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
@@ -28,8 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/CSETWebCore.DatabaseManager.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.DatabaseManager/CSETWebCore.DatabaseManager.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MartinCostello.SqlLocalDb" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="MartinCostello.SqlLocalDb" Version="3.4.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />

diff --git a/...pi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/CSETWebCore.DatabaseManagerTests1.csproj b/...pi/CSETWeb_Api/CSETWebCore.DatabaseManagerTests1/CSETWebCore.DatabaseManagerTests1.csproj
@@ -28,8 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETWebCore.ExportCSV.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.ExportCSV/CSETWebCore.ExportCSV.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
     <PackageReference Include="FastMember" Version="1.5.0" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
   </ItemGroup>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore.Helpers.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/CSETWebCore.Helpers.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="NJsonSchema" Version="10.9.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
     <PackageReference Include="NSoupCore" Version="1.0.0" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CSETWebCore.HelpersTests.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.HelpersTests/CSETWebCore.HelpersTests.csproj
@@ -27,8 +27,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/CSETWebCore.Interfaces.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/CSETWebCore.Interfaces.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/AssessmentIO/StandardSchemaProcessor.cs
@@ -28,7 +28,7 @@ public class StandardSchemaProcessor
         /// <param name="context"></param>
         public void Process(SchemaProcessorContext context)
         {
-            if (context.Type == typeof(ExternalStandard))
+            if (context.ContextualType == typeof(ExternalStandard))
             {
                 var schema = context.Schema.Properties.Where(s => s.Key == PropertyHelpers.GetPropertyName(() => new ExternalStandard().category)).FirstOrDefault().Value;
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/CSETWebCore.Model.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/CSETWebCore.Model.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
-    <PackageReference Include="NJsonSchema" Version="10.9.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
     <PackageReference Include="Snickler.EFCore" Version="3.0.0" />
   </ItemGroup>

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.UpgradeLibrary/CSETWebCore.UpgradeLibrary.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Npoi.Mapper" Version="6.2.1" />
   </ItemGroup>
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/CSETWebCore.Api.csproj
@@ -10,12 +10,13 @@
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="NJsonSchema" Version="10.9.0" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0" />
     <PackageReference Include="NLog.Database" Version="5.2.8" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageReference Include="NodaTime" Version="3.1.10" />

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/SchemaController.cs
@@ -8,6 +8,7 @@
 using CSETWebCore.DataLayer.Model;
 using Microsoft.AspNetCore.Mvc;
 using System;
+using NJsonSchema.NewtonsoftJson.Generation;
 
 
 namespace CSETWebCore.Api.Controllers
@@ -32,7 +33,7 @@ public IActionResult Get()
         {
             try
             {
-                var settings = new NJsonSchema.Generation.JsonSchemaGeneratorSettings() { FlattenInheritanceHierarchy = true };
+                var settings = new NewtonsoftJsonSchemaGeneratorSettings() { FlattenInheritanceHierarchy = true };
 
                 StandardSchemaProcessor.dbContext = _context;
                 var schema = NJsonSchema.JsonSchema.FromType<ExternalStandard>(settings);