[ODS-6478] v6.2-patch1 Release (#1147)

Co-authored-by: Matthew Jackson <[email protected]> Co-authored-by: Axel Marquez <[email protected]> Co-authored-by: Jesus Flores <[email protected]> Co-authored-by: Vinaya Mayya <[email protected]> Co-authored-by: jonHickam <[email protected]>
Ed-Fi-Alliance-OSS · Sep 25, 2024 · c18da15 · c18da15
1 parent a33bddb
commit c18da15
Show file tree

Hide file tree

Showing 65 changed files with 531 additions and 7,553 deletions.
diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml
@@ -7,11 +7,9 @@ name: CodeQL Security Scan Pull request
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
   push:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
 
 env:
   INFORMATIONAL_VERSION: "6.2"

diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml
@@ -7,8 +7,7 @@ name: Dependency Review Pull request
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
 
 env:
   HEAD_REF:  ${{ GITHUB.HEAD_REF }}

diff --git a/.github/workflows/InitDev Implementation.yml b/.github/workflows/InitDev Implementation.yml
@@ -2,8 +2,7 @@ name: Trigger InitDev workflows in Implementation repo
 
 on:
   pull_request:
-    branches:
-      - main-6x
+   branches: [main-6x, 'b-v*-patch*','feature-*']
   workflow_dispatch:
 
 env:
@@ -54,7 +53,7 @@ jobs:
         echo "current_branch=$current_branch" >> $Env:GITHUB_ENV
     
     - name: Dispatch InitDev, Unit tests, Integration tests, Package
-      uses: codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
+      uses: Codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
       id: return_dispatch_initdev_unit_tests_integration_tests_package
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
@@ -64,7 +63,7 @@ jobs:
         workflow: InitDev, Unit tests, Integration tests, Package.yml
         workflow_timeout_seconds: 4800
     - name: Dispatch InitDev Postgres, Unit tests, Integration tests
-      uses: codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
+      uses: Codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
       id: return_dispatch_initdev_postgres_unit_tests_integration_tests
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
@@ -74,7 +73,7 @@ jobs:
         workflow: InitDev Postgres, Unit tests, Integration tests.yml
         workflow_timeout_seconds: 4800
     - name: Dispatch InitDev, Smoke Tests
-      uses: codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
+      uses: Codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
       id: return_dispatch_initdev_smoketests
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
@@ -84,7 +83,7 @@ jobs:
         workflow: InitDev, Smoke Tests.yml
         workflow_timeout_seconds: 4800
     - name: Dispatch InitDev Postgres, Smoke Tests
-      uses: codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
+      uses: Codex-/return-dispatch@03a7fcd260cce601805567f86c892bd06d2719e1 #v1.12.0
       id: return_dispatch_initdev_postgres_smoketests
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
@@ -94,7 +93,7 @@ jobs:
         workflow: InitDev Postgres, Smoke Tests.yml
         workflow_timeout_seconds: 4800
     - name: Await to complete the execution for InitDev, Unit tests, Integration tests, Package
-      uses: codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
+      uses: Codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
         repo: Ed-Fi-ODS-Implementation
@@ -103,7 +102,7 @@ jobs:
         run_timeout_seconds: 4800
         poll_interval_ms: 5000
     - name: Await to complete the execution for InitDev Postgres, Unit tests, Integration tests
-      uses: codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
+      uses: Codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
         repo: Ed-Fi-ODS-Implementation
@@ -112,7 +111,7 @@ jobs:
         run_timeout_seconds: 4800
         poll_interval_ms: 5000
     - name: Await to complete the execution for InitDev, Smoke Tests 
-      uses: codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
+      uses: Codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
         repo: Ed-Fi-ODS-Implementation
@@ -121,12 +120,11 @@ jobs:
         run_timeout_seconds: 4800
         poll_interval_ms: 5000
     - name: Await to complete the execution for InitDev Postgres, Smoke Tests
-      uses: codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
+      uses: Codex-/await-remote-run@d04eeb1e053a19a32037eb0b8ddee6ab4f19790a #v1.7.0
       with:
         token: ${{ env.EDFI_ODS_IMP_TOKEN }}
         repo: Ed-Fi-ODS-Implementation
         owner: ${{ github.repository_owner }}
         run_id: ${{ steps.return_dispatch_initdev_postgres_smoketests.outputs.run_id }}
         run_timeout_seconds: 4800
         poll_interval_ms: 5000
-
diff --git a/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml b/.github/workflows/Lib edFi.admin.dataaccess pullrequest.yml
@@ -3,8 +3,7 @@ name: Lib EdFi.Admin.DataAccess Pull request build and test
 on:
   workflow_dispatch:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Application/EdFi.Admin.DataAccess/**/*
       - tests/EdFi.Admin.DataAccess.UnitTests/**/*

diff --git a/.github/workflows/Lib edFi.admin.dataaccess.yml b/.github/workflows/Lib edFi.admin.dataaccess.yml
@@ -40,7 +40,7 @@ jobs:
       shell: pwsh
     - name: Upload EdFi.Suite3.Admin.DataAccess Artifacts
       if: success()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: ${{ github.workspace }}/NugetPackages/*.nupkg
diff --git a/.github/workflows/Lib edFi.common pullrequest.yml b/.github/workflows/Lib edFi.common pullrequest.yml
@@ -3,8 +3,7 @@ name: Lib EdFi.Common Pull request build and test
 on:
   workflow_dispatch:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Application/EdFi.Common/**/*
       - tests/EdFi.Common.UnitTests/**/*

diff --git a/.github/workflows/Lib edFi.loadtools pullrequest.yml b/.github/workflows/Lib edFi.loadtools pullrequest.yml
@@ -2,8 +2,7 @@ name: Lib EdFi.LoadTools Pull request build and test
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Utilities/DataLoading/**/*
 

diff --git a/.github/workflows/Lib edFi.ods.api pullrequest .yml b/.github/workflows/Lib edFi.ods.api pullrequest .yml
@@ -2,8 +2,7 @@ name: Lib EdFi.Ods.Api Pull request build and test
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Application/EdFi.Ods.Api/**/*
       - Application/EdFi.Ods.Common/**/*

diff --git a/.github/workflows/Lib edFi.ods.common pullrequest.yml b/.github/workflows/Lib edFi.ods.common pullrequest.yml
@@ -2,8 +2,7 @@ name: Lib EdFi.Ods.Common Pull request build and test
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Application/EdFi.Ods.Common/**/*
       - tests/EdFi.Common.UnitTests/**/*

diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml
@@ -7,13 +7,11 @@ name: Pkg EdFi.Database.Admin
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   push:
-    branches:
-      - main
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   workflow_dispatch:

diff --git a/.github/workflows/Pkg EdFi.Database.Security.yml b/.github/workflows/Pkg EdFi.Database.Security.yml
@@ -7,13 +7,11 @@ name: Pkg EdFi.Database.Security
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   push:
-    branches:
-      - main
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - '**.sql'
   workflow_dispatch:

diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen pullrequest.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen pullrequest.yml
@@ -7,8 +7,7 @@ name: Pkg EdFi.Ods.CodeGen Pull Request Build and Test
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Utilities/CodeGeneration/**/*
       - Application/EdFi.Common/**/*

diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml
@@ -2,11 +2,9 @@ name: Pkg EdFi.Ods.CodeGen
 
 on:
   pull_request:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
   push:
-    branches:
-      - main-6x
+    branches: [main-6x, 'b-v*-patch*','feature-*']
     paths:
       - Utilities/CodeGeneration/**/*
       - Application/EdFi.Common/**/*
@@ -88,7 +86,7 @@ jobs:
 
     - name: Upload EdFi.Ods.CodeGen NugetPackage
       if: success()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackage.Artifacts
         path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/*.nupkg
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.PostgreSQL.yml
@@ -111,7 +111,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Minimal.Template Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.PostgreSQL*.nupkg
diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml
@@ -119,7 +119,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Minimal.Template.TPDM.PostgreSQL Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: |

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.TPDM.yml
@@ -112,7 +112,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Minimal.Template.TPDM.Core Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: EdFi.Ods.Minimal.Template.TPDM.Core.Artifacts
         path: |

diff --git a/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml b/.github/workflows/Pkg EdFi.Ods.Minimal.Template.yml
@@ -109,7 +109,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Minimal.Template Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Minimal.Template.*.nupkg
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.PostgreSQL.yml
@@ -111,7 +111,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Populated.Template Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.PostgreSQL*.nupkg
diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml
@@ -116,7 +116,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Populated.Template.TPDM.PostgreSQL Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
         path: |

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.TPDM.yml
@@ -112,7 +112,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Populated.Template.TPDM.Core Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: EdFi.Ods.Populated.Template.TPDM.Core.Artifacts
         path: |

diff --git a/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml b/.github/workflows/Pkg EdFi.Ods.Populated.Template.yml
@@ -110,7 +110,7 @@ jobs:
       shell: powershell
     - name: Upload EdFi.Ods.Populated.Template Artifacts
       if: success() || failure()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
       with:
         name: NugetPackages.Artifacts
-        path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.*.nupkg
+        path: ${{ github.workspace }}/Ed-Fi-ODS/NugetPackages/EdFi.Suite3.Ods.Populated.Template.*.nupkg
diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.2.78" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.2.392" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />

diff --git a/Application/EdFi.Common/EdFi.Common.csproj b/Application/EdFi.Common/EdFi.Common.csproj
@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
-    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs b/Application/EdFi.Ods.Api/Controllers/DataManagementControllerBase.cs
@@ -196,7 +196,7 @@ public virtual async Task<IActionResult> GetAll(
             // Return multiple results
             if (queryParameters.TotalCount)
             {
-                Response.Headers.Add(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString());
+                Response.Headers.Append(HeaderConstants.TotalCount, result.ResultMetadata.TotalCount.ToString());
             }
 
             Response.GetTypedHeaders().ContentType = new MediaTypeHeaderValue(GetReadContentType());

diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
@@ -21,21 +21,18 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.0" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.2.81" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.2.78" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.2.61" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.2.403" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.2.392" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.2.607" />
     <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="NHibernate" Version="5.5.0" />
-    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="Polly" Version="8.3.0" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
-    <PackageReference Include="Remotion.Linq" Version="2.2.0" />
-    <PackageReference Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
     <PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
     <PackageReference Include="Standart.Hash.xxHash" Version="4.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />