Ed-Fi-Alliance-OSS · vimayya · Jan 25, 2024 · Jan 24, 2024 · Jan 24, 2024 · Jan 24, 2024
diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml
@@ -8,10 +8,10 @@ name: CodeQL Security Scan Pull request
 on:
   pull_request:
     branches:
-      - main
+      [main, b-v*-patch*]
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml
@@ -7,7 +7,7 @@ name: Dependency Review Pull request
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   HEAD_REF:  ${{ GITHUB.HEAD_REF }}
@@ -17,7 +17,7 @@ env:
 jobs:
   scan-actions:
     name: Scan Actions
-    uses: ed-fi-alliance-oss/ed-fi-actions/.github/workflows/repository-scanner.yml@latest
+    uses: ed-fi-alliance-oss/ed-fi-actions/.github/workflows/repository-scanner.yml@main
 
   analyze-code:
     name: Analyze Code Dependencies
@@ -27,9 +27,6 @@ jobs:
       contents: read
       security-events: write
 
-    strategy:
-      fail-fast: false
-
     steps:
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b  # v3.0.2

diff --git a/.github/workflows/InitDev Implementation.yml b/.github/workflows/InitDev Implementation.yml
@@ -2,7 +2,7 @@ name: Trigger InitDev workflows in Implementation repo
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
   workflow_dispatch:
 
 env:

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

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

diff --git a/.github/workflows/Packages - EdFi.Ods.CodeGen.yml b/.github/workflows/Packages - EdFi.Ods.CodeGen.yml
@@ -2,10 +2,10 @@ name: Packages - EdFi.Ods.CodeGen
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/Packages - EdFi.Ods.Minimal.Template.PostgreSQL.yml b/.github/workflows/Packages - EdFi.Ods.Minimal.Template.PostgreSQL.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Minimal.Template.PostgreSQL
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml b/.github/workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Minimal.Template.TPDM.PostgreSQL
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.yml b/.github/workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Minimal.Template.TPDM
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Minimal.Template.yml b/.github/workflows/Packages - EdFi.Ods.Minimal.Template.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Minimal.Template
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Populated.Template.PostgreSQL.yml b/.github/workflows/Packages - EdFi.Ods.Populated.Template.PostgreSQL.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Populated.Template.PostgreSQL
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml b/.github/workflows/Packages - EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Populated.Template.TPDM.PostgreSQL
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
 
   workflow_dispatch:
   repository_dispatch:

diff --git a/.github/workflows/Packages - EdFi.Ods.Populated.Template.TPDM.yml b/.github/workflows/Packages - EdFi.Ods.Populated.Template.TPDM.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Populated.Template.TPDM
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo ,triggered-from-tpdmartifacts-repo]

diff --git a/.github/workflows/Packages - EdFi.Ods.Populated.Template.yml b/.github/workflows/Packages - EdFi.Ods.Populated.Template.yml
@@ -8,7 +8,7 @@ name: Packages - EdFi.Ods.Populated.Template
 on:
   push:
     branches:
-      - main
+      [main, b-v*-patch*]
   workflow_dispatch:
   repository_dispatch:
     types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo]

diff --git a/.github/workflows/edFi.admin.dataaccess manual.yml b/.github/workflows/edFi.admin.dataaccess manual.yml
@@ -2,6 +2,8 @@ name: EdFi.Admin.DataAccess Manually triggered build
 
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [main, b-v*-patch*]  
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.admin.dataaccess pullrequest.yml b/.github/workflows/edFi.admin.dataaccess pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.Admin.DataAccess Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.common manual.yml b/.github/workflows/edFi.common manual.yml
@@ -2,7 +2,8 @@ name: EdFi.Common Manually triggered build
 
 on:
   workflow_dispatch:
-
+  pull_request:
+    branches: [main, b-v*-patch*]
 env:
   INFORMATIONAL_VERSION: "6.1"
   BUILD_INCREMENTER: "1"

diff --git a/.github/workflows/edFi.common pullrequest.yml b/.github/workflows/edFi.common pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.Common Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.loadtools pullrequest.yml b/.github/workflows/edFi.loadtools pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.LoadTools Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.ods.api pullrequest .yml b/.github/workflows/edFi.ods.api pullrequest .yml
@@ -2,7 +2,7 @@ name: EdFi.Ods.Api Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.ods.common pullrequest.yml b/.github/workflows/edFi.ods.common pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.Ods.Common Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

diff --git a/.github/workflows/edFi.security.dataaccess manual.yml b/.github/workflows/edFi.security.dataaccess manual.yml
@@ -2,7 +2,8 @@ name: EdFi.Security.DataAccess Manually triggered build
 
 on:
   workflow_dispatch:
-
+  pull_request:
+    branches: [main, b-v*-patch*] 
 env:
   INFORMATIONAL_VERSION: "6.1"
   BUILD_INCREMENTER: "1"

diff --git a/.github/workflows/edFi.security.dataaccess pullrequest.yml b/.github/workflows/edFi.security.dataaccess pullrequest.yml
@@ -2,7 +2,7 @@ name: EdFi.Security.DataAccess Pull request build and test
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, b-v*-patch*]
 
 env:
   INFORMATIONAL_VERSION: "6.1"

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.1.19" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
     <PackageReference Include="log4net" Version="2.0.13" />

diff --git a/Application/EdFi.Common/EdFi.Common.csproj b/Application/EdFi.Common/EdFi.Common.csproj
@@ -16,6 +16,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Npgsql" Version="6.0.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 </Project>
diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
@@ -21,9 +21,9 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.1" />
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
-    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.1.26" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
+    <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="6.1.29" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="FluentValidation" Version="10.4.0" />
     <PackageReference Include="Iesi.Collections" Version="4.0.4" />

diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="FluentValidation" Version="10.4.0" />
     <PackageReference Include="log4net" Version="2.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -27,7 +27,7 @@
     <PackageReference Include="Sandwych.QuickGraph.Core" Version="1.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />

diff --git a/...tion/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/...tion/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <AssemlbyName>EdFi.Ods.Repositories.NHibernate.Tests</AssemlbyName>
+    <AssemblyName>EdFi.Ods.Repositories.NHibernate.Tests</AssemblyName>
     <RootNamespace>EdFi.Ods.Repositories.NHibernate.Tests</RootNamespace>
     <Copyright>Copyright © 2019 Ed-Fi Alliance, LLC and Contributors</Copyright>
     <TreatErrorsAsWarning>true</TreatErrorsAsWarning>
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="Autofac" Version="6.3.0" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="FakeItEasy" Version="7.3.0" />

diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj
@@ -13,8 +13,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
     <PackageReference Include="Dapper" Version="2.0.123" />

diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
@@ -17,12 +17,12 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.35" />
+    <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="6.1.38" />
     <PackageReference Include="NHibernate" Version="5.3.11" />
     <PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
     <PackageReference Include="AutoMapper" Version="11.0.1" />
     <PackageReference Include="CompareNETObjects" Version="4.76.0" />
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.19" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="EntityFrameworkTesting.FakeItEasy" Version="1.3.0" />
     <PackageReference Include="FakeItEasy" Version="7.3.0" />

diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj
@@ -15,7 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.16" />
+    <PackageReference Include="EdFi.Suite3.Common" Version="6.1.22" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="EntityFramework6.Npgsql" Version="6.4.3" />
     <PackageReference Include="Npgsql" Version="6.0.3" />