[ADMINAPI-983] Update Admin API 2 to .NET 8

.github/workflows/on-prerelease.yml

@@ -53,11 +53,6 @@ jobs:
           # SemVer
           "admin-api-semver=$($apiVersion -Replace $apiPrefix)" >> $env:GITHUB_OUTPUT
 
-      - name: Setup .NET
-        uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
-        with:
-          dotnet-version: 6.0.x
-
       - name: Publish .NET Assemblies
         run: |
           $apiVersion = "${{ steps.versions.outputs.admin-api-semver }}"

.github/workflows/on-pullrequest.yml

@@ -41,10 +41,6 @@ jobs:
     steps:
       - name: Checkout the Repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Setup .NET
-        uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
-        with:
-          dotnet-version: 6.0.x
 
       - name: Build
         run: ./build.ps1 -Command Build -Configuration Debug

Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj

@@ -1,38 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\EdFi.Ods.AdminApi\EdFi.Ods.AdminApi.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.1.21" />
-        <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.1.16" />
-
-        <PackageReference Include="EdFi.SecurityCompatiblity53.DataAccess" Version="5.3.43" />
-
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-        <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.11.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
-        <PackageReference Include="NuGet.Protocol" Version="6.6.1" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Respawn" Version="3.3.0" />
-        <PackageReference Include="Shouldly" Version="4.2.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Update="appsettings.json">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EdFi.Ods.AdminApi\EdFi.Ods.AdminApi.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.2.90" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.2.138" />
+    <PackageReference Include="EdFi.SecurityCompatiblity53.DataAccess" Version="5.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="170.11.0" />
+    <PackageReference Include="Moq" Version="4.17.2" />
+    <PackageReference Include="NuGet.Protocol" Version="6.6.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Respawn" Version="3.3.0" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj

@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <Copyright>Copyright © 2023 Ed-Fi Alliance</Copyright>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.1.21" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.1.16" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.2.90" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.2.138" />
     <PackageReference Include="FakeItEasy" Version="7.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
@@ -20,9 +18,7 @@
     </PackageReference>
     <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\EdFi.Ods.AdminApi\EdFi.Ods.AdminApi.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E 2.0 - Actions.postman_collection.json

@@ -26,9 +26,11 @@
 											"const response = pm.response.json();\r",
 											"\r",
 											"pm.test(\"GET Actions: Response matches success format\", function () {\r",
-											"    pm.expect(response[0]).to.have.property(\"id\");\r",
-											"    pm.expect(response[0]).to.have.property(\"name\");\r",
-											"    pm.expect(response[0]).to.have.property(\"uri\");\r",
+											"    if (response && response.length > 0) {\r",
+											"        pm.expect(response[0]).to.have.property(\"id\");\r",
+											"        pm.expect(response[0]).to.have.property(\"name\");\r",
+											"        pm.expect(response[0]).to.have.property(\"uri\");\r",
+											"    }\r",
 											"});\r",
 											"\r",
 											"const GetActionsSchema = {\r",

Application/EdFi.Ods.AdminApi/E2E Tests/Admin API E2E 2.0 - AuthStrategies.postman_collection.json

@@ -26,9 +26,11 @@
 											"const response = pm.response.json();\r",
 											"\r",
 											"pm.test(\"GET AuthorizationStrategies: Response matches success format\", function () {\r",
-											"    pm.expect(response[0]).to.have.property(\"id\");\r",
-											"    pm.expect(response[0]).to.have.property(\"name\");\r",
-											"    pm.expect(response[0]).to.have.property(\"displayName\");\r",
+											"    if (response && response.length > 0) {\r",
+											"        pm.expect(response[0]).to.have.property(\"id\");\r",
+											"        pm.expect(response[0]).to.have.property(\"name\");\r",
+											"        pm.expect(response[0]).to.have.property(\"displayName\");\r",
+											"    }\r",
 											"});\r",
 											"\r",
 											"const GetAuthStrategiesSchema = {\r",

Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>true</IsPackable>
@@ -13,15 +12,13 @@
     <DockerfileRunEnvironmentFiles>.env</DockerfileRunEnvironmentFiles>
     <DockerfileTag>adminapi-dev</DockerfileTag>
   </PropertyGroup>
-
   <ItemGroup>
     <Content Include="EdFi.Ods.AdminApi.nuspec" CopyToPublishDirectory="Always" CopyToOutputDirectory="Never" />
     <Content Include="Artifacts\**" CopyToPublishDirectory="Always" CopyToOutputDirectory="Never" />
     <Content Include="Schema\Ed-Fi-ODS-API-Profile.xsd" CopyToPublishDirectory="Always" CopyToOutputDirectory="Always" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.0.6" />
+    <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
     <PackageReference Include="Asp.Versioning.Http" Version="6.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
@@ -30,24 +27,23 @@
     <PackageReference Include="dbup-core" Version="5.0.10" />
     <PackageReference Include="dbup-postgresql" Version="5.0.8" />
     <PackageReference Include="dbup-sqlserver" Version="5.0.8" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.1.21" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.1.16" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.2.90" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.2.138" />
     <PackageReference Include="FluentValidation" Version="11.5.2" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NJsonSchema" Version="10.9.0" />
-    <PackageReference Include="Npgsql" Version="7.0.6" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+    <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
     <PackageReference Include="OpenIddict.AspNetCore" Version="4.4.0" />
     <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
-</Project>
+</Project>

Application/EdFi.Ods.AdminApi/Features/ClaimSets/ResourceClaims/EditAuthStrategy.cs

@@ -109,7 +109,7 @@ public OverrideAuthStategyOnClaimSetValidator(IGetResourcesByClaimSetIdQuery get
                 var authStrategies = getAllAuthorizationStrategiesQuery.Execute();
                 foreach (var authStrategyName in overrideAuthStategyOnClaimSetRequest.AuthorizationStrategies!)
                 {
-                    var validAuthStrategyName = authStrategies
+                    var validAuthStrategyName = authStrategies.AsEnumerable()
                       .FirstOrDefault(a => a.AuthStrategyName!.ToLower() == authStrategyName!.ToLower());
 
                     if (validAuthStrategyName == null)