From 3e4aec84e435e48672b366f7e57d2ae93acb2c08 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 14:46:19 -0600 Subject: [PATCH 01/22] System.Data.SqlClient upgrade --- Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj | 1 + Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 1 + .../EdFi.Ods.Repositories.NHibernate.Tests.csproj | 3 ++- Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 1 + Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 1 + Application/Test.Common/Test.Common.csproj | 1 + .../EdFi.Admin.DataAccess.IntegrationTests.csproj | 1 + tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index df6d31a2cb..c4209e780a 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -21,6 +21,7 @@ + diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 5cf66db77e..ddd3592a09 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -48,6 +48,7 @@ + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index 14b6c3f676..1de171d4b4 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -1,7 +1,7 @@  net6.0 - EdFi.Ods.Repositories.NHibernate.Tests + EdFi.Ods.Repositories.NHibernate.Tests EdFi.Ods.Repositories.NHibernate.Tests Copyright © 2019 Ed-Fi Alliance, LLC and Contributors true @@ -17,6 +17,7 @@ true + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 27c0dea286..dfd9e363f0 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -27,6 +27,7 @@ + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 48dd683a2c..fb35a97f1d 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -43,6 +43,7 @@ + diff --git a/Application/Test.Common/Test.Common.csproj b/Application/Test.Common/Test.Common.csproj index 5cfe9dcbec..bb5ca0e935 100644 --- a/Application/Test.Common/Test.Common.csproj +++ b/Application/Test.Common/Test.Common.csproj @@ -14,6 +14,7 @@ true + diff --git a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj index 7d2f1da304..b2ff5c7b02 100644 --- a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj @@ -29,6 +29,7 @@ + diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index 97a97437c9..b3444f6b24 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -28,6 +28,7 @@ + From f522ae21b1bf53d12d9b3309acd45654a29c23ef Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 14:57:19 -0600 Subject: [PATCH 02/22] System.Data.SqlClient upgrade latest version --- Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj | 2 +- Application/EdFi.Common/EdFi.Common.csproj | 2 +- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj | 2 +- .../EdFi.Ods.Repositories.NHibernate.Tests.csproj | 2 +- Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 2 +- Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 2 +- Application/Test.Common/Test.Common.csproj | 2 +- .../CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj | 2 +- .../GenerateSecurityGraphs/GenerateSecurityGraphs.csproj | 2 +- .../EdFi.Admin.DataAccess.IntegrationTests.csproj | 2 +- tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj | 2 +- .../EdFi.Ods.Api.IntegrationTests.csproj | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index c4209e780a..461157d4ba 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -21,7 +21,7 @@ - + diff --git a/Application/EdFi.Common/EdFi.Common.csproj b/Application/EdFi.Common/EdFi.Common.csproj index 427268da6f..6c5cc1e092 100644 --- a/Application/EdFi.Common/EdFi.Common.csproj +++ b/Application/EdFi.Common/EdFi.Common.csproj @@ -16,6 +16,6 @@ - + diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index ddd3592a09..44284f778a 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -48,7 +48,7 @@ - + diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index f22439ac31..e86e8a8ccb 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -27,7 +27,7 @@ - + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index 1de171d4b4..54d24f581b 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -17,7 +17,7 @@ true - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index dfd9e363f0..dfd2120541 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -27,7 +27,7 @@ - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index fb35a97f1d..f7bc44219d 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -43,7 +43,7 @@ - + diff --git a/Application/Test.Common/Test.Common.csproj b/Application/Test.Common/Test.Common.csproj index bb5ca0e935..25943febdc 100644 --- a/Application/Test.Common/Test.Common.csproj +++ b/Application/Test.Common/Test.Common.csproj @@ -14,7 +14,7 @@ true - + diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj index 5350374d3c..2f5151bf5d 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/EdFi.Ods.CodeGen.csproj @@ -41,7 +41,7 @@ - + diff --git a/Utilities/GenerateSecurityGraphs/GenerateSecurityGraphs/GenerateSecurityGraphs.csproj b/Utilities/GenerateSecurityGraphs/GenerateSecurityGraphs/GenerateSecurityGraphs.csproj index f4befe9d3f..c78b6d1d48 100644 --- a/Utilities/GenerateSecurityGraphs/GenerateSecurityGraphs/GenerateSecurityGraphs.csproj +++ b/Utilities/GenerateSecurityGraphs/GenerateSecurityGraphs/GenerateSecurityGraphs.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj index b2ff5c7b02..34d098ea9b 100644 --- a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj @@ -29,7 +29,7 @@ - + diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index b3444f6b24..8ffeb412e5 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -28,7 +28,7 @@ - + diff --git a/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj b/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj index 9397d344c4..30ab0a352c 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj +++ b/tests/EdFi.Ods.Api.IntegrationTests/EdFi.Ods.Api.IntegrationTests.csproj @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + From 90dc9f0172eb9e568955a98b67049ccc3cb1a860 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 15:05:03 -0600 Subject: [PATCH 03/22] pull_request &push updated with branches: [main, 'ODS-*',b-v*-patch*] --- .github/workflows/CodeQL Security Scan.yml | 4 ++-- .github/workflows/Dependencies Security Scan.yml | 2 +- .github/workflows/InitDev Implementation.yml | 2 +- .github/workflows/Packages - EdFi.Database.Admin.yml | 4 ++-- .github/workflows/Packages - EdFi.Database.Security.yml | 4 ++-- .github/workflows/Packages - EdFi.Ods.CodeGen.yml | 4 ++-- .../Packages - EdFi.Ods.Minimal.Template.PostgreSQL.yml | 2 +- .../Packages - EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml | 2 +- .../workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.yml | 2 +- .github/workflows/Packages - EdFi.Ods.Minimal.Template.yml | 2 +- .../Packages - EdFi.Ods.Populated.Template.PostgreSQL.yml | 2 +- ...Packages - EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml | 2 +- .../workflows/Packages - EdFi.Ods.Populated.Template.TPDM.yml | 2 +- .github/workflows/Packages - EdFi.Ods.Populated.Template.yml | 2 +- .github/workflows/edFi.admin.dataaccess pullrequest.yml | 2 +- .github/workflows/edFi.common pullrequest.yml | 2 +- .github/workflows/edFi.loadtools pullrequest.yml | 2 +- .github/workflows/edFi.ods.api pullrequest .yml | 2 +- .github/workflows/edFi.ods.common pullrequest.yml | 2 +- .github/workflows/edFi.security.dataaccess pullrequest.yml | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml index a15b20e9b2..ff6c33e250 100644 --- 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, 'ODS-*',b-v*-patch*] push: branches: - - main + [main, 'ODS-*',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 index c348e88c98..85b63b3a95 100644 --- 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, 'ODS-*',b-v*-patch*] env: HEAD_REF: ${{ GITHUB.HEAD_REF }} diff --git a/.github/workflows/InitDev Implementation.yml b/.github/workflows/InitDev Implementation.yml index a9afd7faa1..dbdd30f435 100644 --- 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, 'ODS-*',b-v*-patch*] workflow_dispatch: env: diff --git a/.github/workflows/Packages - EdFi.Database.Admin.yml b/.github/workflows/Packages - EdFi.Database.Admin.yml index f11b64bc18..0aee8e7632 100644 --- 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, 'ODS-*',b-v*-patch*] paths: - '**.sql' push: branches: - - main + [main, 'ODS-*',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 index d0d86b8508..f9ab60ab5a 100644 --- 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, 'ODS-*',b-v*-patch*] paths: - '**.sql' push: branches: - - main + [main, 'ODS-*',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 index 80413066ae..41f50355b6 100644 --- 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, 'ODS-*',b-v*-patch*] push: branches: - - main + [main, 'ODS-*',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 index 86031fbdeb..3f1ad5953d 100644 --- 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, 'ODS-*',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 index a3befa88c5..2aa24e8b92 100644 --- 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, 'ODS-*',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 index 4ae5086da2..bb74a503c2 100644 --- 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, 'ODS-*',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 index a7270aee18..f01afe4443 100644 --- 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, 'ODS-*',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 index 5fdc380106..c88d50f2c0 100644 --- 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, 'ODS-*',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 index 13e259fe1f..24865dc1ee 100644 --- 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, 'ODS-*',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 index 64dfa9da8c..16302ee0b6 100644 --- 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, 'ODS-*',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 index ab71208fd4..a213d39aba 100644 --- 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, 'ODS-*',b-v*-patch*] workflow_dispatch: repository_dispatch: types: [triggered-from-implementation-repo ,triggered-from-datastandard-repo] diff --git a/.github/workflows/edFi.admin.dataaccess pullrequest.yml b/.github/workflows/edFi.admin.dataaccess pullrequest.yml index 80a0706253..9b34428f02 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" diff --git a/.github/workflows/edFi.common pullrequest.yml b/.github/workflows/edFi.common pullrequest.yml index 3760d5e77c..2488f9a790 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" diff --git a/.github/workflows/edFi.loadtools pullrequest.yml b/.github/workflows/edFi.loadtools pullrequest.yml index a05aa5e891..a9f0b346f5 100644 --- 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, 'ODS-*',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 index 689fde0b26..c8b467c0e6 100644 --- 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, 'ODS-*',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 index 1accd38370..e408a06116 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" diff --git a/.github/workflows/edFi.security.dataaccess pullrequest.yml b/.github/workflows/edFi.security.dataaccess pullrequest.yml index 3d44dc9377..0f9c942905 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" From 2a2e3f544f6c6e22d1e165474e6ed5d2c00e7e78 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 15:06:53 -0600 Subject: [PATCH 04/22] pull_request added to trigger EdFi.Ods.Common Manually triggered build --- .github/workflows/edFi.ods.common manual.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/edFi.ods.common manual.yml b/.github/workflows/edFi.ods.common manual.yml index 0f16bddae3..dbdea7c752 100644 --- a/.github/workflows/edFi.ods.common manual.yml +++ b/.github/workflows/edFi.ods.common manual.yml @@ -2,7 +2,8 @@ name: EdFi.Ods.Common Manually triggered build on: workflow_dispatch: - + pull_request: + branches: [main, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" BUILD_INCREMENTER: "1" From d0ed179aa9f117fc4580c341d0c9df4c6d219180 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 15:30:23 -0600 Subject: [PATCH 05/22] EdFi.Common Manually triggered build updated with pull_request trigger --- .github/workflows/edFi.common manual.yml | 3 ++- .github/workflows/edFi.ods.common manual.yml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/edFi.common manual.yml b/.github/workflows/edFi.common manual.yml index e0b0b05cbb..91d52730c6 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" BUILD_INCREMENTER: "1" diff --git a/.github/workflows/edFi.ods.common manual.yml b/.github/workflows/edFi.ods.common manual.yml index dbdea7c752..0f16bddae3 100644 --- a/.github/workflows/edFi.ods.common manual.yml +++ b/.github/workflows/edFi.ods.common manual.yml @@ -2,8 +2,7 @@ name: EdFi.Ods.Common Manually triggered build on: workflow_dispatch: - pull_request: - branches: [main, 'ODS-*',b-v*-patch*] + env: INFORMATIONAL_VERSION: "6.1" BUILD_INCREMENTER: "1" From df7755e7e72ee8c25e46e5d01e2321f156a2aa94 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 15:48:02 -0600 Subject: [PATCH 06/22] EdFi.Suite3.Common upgrade --- Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj | 2 +- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj | 2 +- .../EdFi.Ods.Repositories.NHibernate.Tests.csproj | 2 +- Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 2 +- Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 2 +- .../EdFi.Admin.DataAccess.UnitTests.csproj | 2 +- .../EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj | 2 +- .../EdFi.Ods.WebApi.IntegrationTests.csproj | 2 +- .../EdFi.Security.DataAccess.UnitTests.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index 461157d4ba..d2c894f402 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -16,7 +16,7 @@ true - + diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 44284f778a..051c7b2fb2 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -22,7 +22,7 @@ - + diff --git a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj index e86e8a8ccb..facb137c83 100644 --- a/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj +++ b/Application/EdFi.Ods.Common/EdFi.Ods.Common.csproj @@ -17,7 +17,7 @@ - + diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index 54d24f581b..f919ead9d6 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index dfd2120541..2d86ba149b 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -14,7 +14,7 @@ - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index f7bc44219d..25a7274250 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj index 85827e8f73..a16fd7e2eb 100644 --- a/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Admin.DataAccess.UnitTests/EdFi.Admin.DataAccess.UnitTests.csproj @@ -16,7 +16,7 @@ true - + diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj index 19bed59dc1..8cfb2e6652 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -29,7 +29,7 @@ - + diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj index c137b14bb9..ebfc93c335 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -19,7 +19,7 @@ - + diff --git a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj index c9ded5b19e..f4ff3262a8 100644 --- a/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj +++ b/tests/EdFi.Security.DataAccess.UnitTests/EdFi.Security.DataAccess.UnitTests.csproj @@ -16,7 +16,7 @@ true - + From 09f8c542abb83a436e07f289c35475b933fbe847 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 15:53:33 -0600 Subject: [PATCH 07/22] EdFi.Admin.DataAccess Manually triggered build - pull_request trigger updated --- .github/workflows/edFi.admin.dataaccess manual.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/edFi.admin.dataaccess manual.yml b/.github/workflows/edFi.admin.dataaccess manual.yml index e0508c1e50..f1eaa1d079 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" From daae19ef3c30fb4068a16e1b654ee3b8f3eea611 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 16:10:51 -0600 Subject: [PATCH 08/22] EdFi.Suite3.Admin.DataAccess Upgrade --- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 2 +- Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 2 +- .../EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj | 2 +- .../EdFi.Ods.WebApi.IntegrationTests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 051c7b2fb2..0d32e45e33 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -21,7 +21,7 @@ - + diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 2d86ba149b..6bc5955e93 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -13,7 +13,7 @@ true - + diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 25a7274250..62a350aab1 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -17,7 +17,7 @@ true - + diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj index 8cfb2e6652..8f4868ca78 100644 --- a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj +++ b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj @@ -24,7 +24,7 @@ - + diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj index ebfc93c335..55c66758b8 100644 --- a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj +++ b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj @@ -13,7 +13,7 @@ - + From ef8260eab6b2d282a5d2a6395e8d7bd9e722cab7 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 16:15:14 -0600 Subject: [PATCH 09/22] EdFi.Suite3.Common Upgrade --- .../EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj | 2 +- .../EdFi.BulkLoadClient.Console.csproj | 2 +- .../DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj | 2 +- Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj | 2 +- .../EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj | 2 +- .../EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj index 5d6bfe5a46..0c6a9b180b 100644 --- a/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj +++ b/Application/EdFi.Security.DataAccess/EdFi.Security.DataAccess.csproj @@ -15,7 +15,7 @@ true - + diff --git a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj index 236ec2f4b6..e12c0b5bdf 100644 --- a/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj +++ b/Utilities/DataLoading/EdFi.BulkLoadClient.Console/EdFi.BulkLoadClient.Console.csproj @@ -38,7 +38,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj index 80e9608478..bcba13818d 100644 --- a/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools.Test/EdFi.LoadTools.Test.csproj @@ -21,7 +21,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj index 424a9920b3..4db5fe2154 100644 --- a/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj +++ b/Utilities/DataLoading/EdFi.LoadTools/EdFi.LoadTools.csproj @@ -23,7 +23,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj index a9f1caf509..c1b967390b 100644 --- a/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj +++ b/Utilities/DataLoading/EdFi.SmokeTest.Console/EdFi.SmokeTest.Console.csproj @@ -40,7 +40,7 @@ - + diff --git a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj index 58a2b2b461..0cec65e724 100644 --- a/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj +++ b/Utilities/DataLoading/EdFi.XmlLookup.Console/EdFi.XmlLookup.Console.csproj @@ -29,7 +29,7 @@ - + From 2bfd4a9904af9452956ea08ff2487253eab16a4f Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 16:17:03 -0600 Subject: [PATCH 10/22] EdFi.Security.DataAccess Manually triggered build Trigger updated --- .github/workflows/edFi.security.dataaccess manual.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/edFi.security.dataaccess manual.yml b/.github/workflows/edFi.security.dataaccess manual.yml index 7777cbd9af..568c74c6f2 100644 --- 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, 'ODS-*',b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" BUILD_INCREMENTER: "1" From 87ce3ac170e6425c3b1449d4276fc11f29b60417 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 16:35:44 -0600 Subject: [PATCH 11/22] EdFi.Suite3.Security.DataAccess upgrade --- Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index 0d32e45e33..ddabe4d14d 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -23,7 +23,7 @@ - + From 10e32b86ede29b8b6ed6ddc16587656c7f33299b Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 17:05:04 -0600 Subject: [PATCH 12/22] IProfileMetadataProvider Codefix --- .../Providers/Impl/ValidatingProfileMetadataProvider.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs index 4e7e428643..fc33cb06d3 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs @@ -71,6 +71,8 @@ public bool HasProfileData => ProfileXDocument.Nodes() .Any(); + public IReadOnlyDictionary ProfileDefinitionsByName => throw new NotImplementedException(); + /// /// Gets the specified Profile definition by name. /// From 01ac43487770694c00b9a49d803d507ab9e81ba8 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 17:48:05 -0600 Subject: [PATCH 13/22] CodeGen ApprovalTest CodeFix --- ...trollers_Controllers.generated.approved.cs | 63 +++ ...ateOrUpdatePipelines.generated.approved.cs | 4 + ...st_Requests_Requests.generated.approved.cs | 41 ++ ..._Resources_Resources.generated.approved.cs | 405 ++++++++++++++++++ 4 files changed, 513 insertions(+) diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Controllers_Controllers.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Controllers_Controllers.generated.approved.cs index 9c405a1526..dfb2177bdb 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Controllers_Controllers.generated.approved.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Controllers_Controllers.generated.approved.cs @@ -16,6 +16,69 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +namespace EdFi.Ods.Api.Services.Controllers.AcademicWeeks.EdFi.Academic_Week_Readable_Excludes_Optional_References +{ + [ExcludeFromCodeCoverage] + public class AcademicWeeksNullWriteRequest : NullRequestBase { } + + [ApiExplorerSettings(IgnoreApi = true)] + [ExcludeFromCodeCoverage] + [ApiController] + [Authorize] + [ProfileContentType("application/vnd.ed-fi.academicweek.academic-week-readable-excludes-optional-references")] + [Route("ed-fi/academicWeeks")] + public partial class AcademicWeeksController : DataManagementControllerBase< + Api.Common.Models.Resources.AcademicWeek.EdFi.Academic_Week_Readable_Excludes_Optional_References_Readable.AcademicWeek, + AcademicWeeksNullWriteRequest, + Entities.Common.EdFi.IAcademicWeek, + Entities.NHibernate.AcademicWeekAggregate.EdFi.AcademicWeek, + AcademicWeeksNullWriteRequest, + AcademicWeeksNullWriteRequest, + Api.Common.Models.Requests.AcademicWeeks.EdFi.Academic_Week_Readable_Excludes_Optional_References.AcademicWeekDelete, + Api.Common.Models.Requests.AcademicWeeks.EdFi.Academic_Week_Readable_Excludes_Optional_References.AcademicWeekGetByExample> + { + public AcademicWeeksController(IPipelineFactory pipelineFactory, ISchoolYearContextProvider schoolYearContextProvider, IRESTErrorProvider restErrorProvider, IDefaultPageSizeLimitProvider defaultPageSizeLimitProvider, ApiSettings apiSettings) + : base(pipelineFactory, schoolYearContextProvider, restErrorProvider, defaultPageSizeLimitProvider, apiSettings) + { + } + + protected override void MapAll(Api.Common.Models.Requests.AcademicWeeks.EdFi.Academic_Week_Readable_Excludes_Optional_References.AcademicWeekGetByExample request, Entities.Common.EdFi.IAcademicWeek specification) + { + // Copy all existing values + specification.SuspendReferenceAssignmentCheck(); + specification.BeginDate = request.BeginDate; + specification.EndDate = request.EndDate; + specification.Id = request.Id; + specification.SchoolId = request.SchoolId; + specification.TotalInstructionalDays = request.TotalInstructionalDays; + specification.WeekIdentifier = request.WeekIdentifier; + } + + protected override string GetReadContentType() + { + return "application/vnd.ed-fi.academicweek.academic-week-readable-excludes-optional-references.readable+json"; + } + + [ProducesResponseType(StatusCodes.Status405MethodNotAllowed)] + public override Task Post(AcademicWeeksNullWriteRequest request) + { + return Task.FromResult( + StatusCode(StatusCodes.Status405MethodNotAllowed, + ErrorTranslator + .GetErrorMessage("The allowed methods for this resource with the 'Academic-Week-Readable-Excludes-Optional-References' profile are GET, DELETE and OPTIONS."))); + } + + [ProducesResponseType(StatusCodes.Status405MethodNotAllowed)] + public override Task Put(AcademicWeeksNullWriteRequest request, Guid id) + { + return Task.FromResult( + StatusCode(StatusCodes.Status405MethodNotAllowed, + ErrorTranslator + .GetErrorMessage("The allowed methods for this resource with the 'Academic-Week-Readable-Excludes-Optional-References' profile are GET, DELETE and OPTIONS."))); + } + } +} + namespace EdFi.Ods.Api.Services.Controllers.Assessments.EdFi.Assessment_Readable_Excludes_Embedded_Object { [ExcludeFromCodeCoverage] diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Pipelines_CreateOrUpdatePipelines.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Pipelines_CreateOrUpdatePipelines.generated.approved.cs index 19b8a91bd5..dd4739a0fe 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Pipelines_CreateOrUpdatePipelines.generated.approved.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Pipelines_CreateOrUpdatePipelines.generated.approved.cs @@ -323,3 +323,7 @@ namespace EdFi.Ods.Api.Pipelines.Test_Profile_Some_References_With_Unified_Keys_ namespace EdFi.Ods.Api.Pipelines.Profile_Validation_Regression_References { } + +namespace EdFi.Ods.Api.Pipelines.Academic_Week_Readable_Excludes_Optional_References +{ +} diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Requests_Requests.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Requests_Requests.generated.approved.cs index 3ebdf741d9..e03f515f21 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Requests_Requests.generated.approved.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Requests_Requests.generated.approved.cs @@ -2262,3 +2262,44 @@ public StudentCTEProgramAssociationDelete(Guid id) } } +namespace EdFi.Ods.Api.Common.Models.Requests.AcademicWeeks.EdFi.Academic_Week_Readable_Excludes_Optional_References +{ + + [ExcludeFromCodeCoverage] + public class AcademicWeekGetByExample + { + public DateTime BeginDate { get; set; } + public DateTime EndDate { get; set; } + public Guid Id { get; set; } + public int SchoolId { get; set; } + public int TotalInstructionalDays { get; set; } + public string WeekIdentifier { get; set; } + } + + [ExcludeFromCodeCoverage] + public class AcademicWeekGetByIds : IHasIdentifiers + { + public AcademicWeekGetByIds() { } + + public AcademicWeekGetByIds(params Guid[] ids) + { + Ids = new List(ids); + } + + public List Ids { get; set; } + } + + [ExcludeFromCodeCoverage] + public class AcademicWeekDelete : IHasIdentifier + { + public AcademicWeekDelete() { } + + public AcademicWeekDelete(Guid id) + { + Id = id; + } + + public Guid Id { get; set; } + } +} + diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Resources_Resources.generated.approved.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Resources_Resources.generated.approved.cs index d8c6d0749f..7a45fe7319 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Resources_Resources.generated.approved.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen.Tests/Approval/ApprovalTests.Verify_All.ForScenario.Profiles.Test_Resources_Resources.generated.approved.cs @@ -164483,3 +164483,408 @@ protected override bool PreValidate(FluentValidation.ValidationContext + /// Represents a reference to the AcademicWeek resource. + /// + [DataContract] + [ExcludeFromCodeCoverage] + public class AcademicWeekReference + { + [DataMember(Name="schoolId"), NaturalKeyMember] + public int SchoolId { get; set; } + + [DataMember(Name="weekIdentifier"), NaturalKeyMember] + public string WeekIdentifier { get; set; } + + /// + /// Gets or sets the resource identifier of the referenced resource. + /// + public Guid ResourceId { get; set; } + + /// + /// Gets or sets the discriminator value which identifies the concrete sub-type of the referenced resource + /// when the referenced resource has been derived; otherwise null. + /// + public string Discriminator { get; set; } + + + private Link _link; + + [DataMember(Name="link")] + public Link Link + { + get + { + if (_link == null) + { + // Only generate links when all values are present + if (IsReferenceFullyDefined()) + _link = CreateLink(); + } + + return _link; + } + } + + /// + /// Indicates whether the reference has been fully defined (all key values are currently assigned non-default values). + /// + /// true if the reference's properties are all set to non-default values; otherwise false. + public bool IsReferenceFullyDefined() + { + return SchoolId != default(int) && WeekIdentifier != default(string); + } + + private Link CreateLink() + { + var link = new Link + { + Rel = "AcademicWeek", + Href = $"/ed-fi/academicWeeks/{ResourceId:n}" + }; + + if (string.IsNullOrEmpty(Discriminator)) + return link; + + string[] linkParts = Discriminator.Split('.'); + + if (linkParts.Length < 2) + return link; + + var resource = GeneratedArtifactStaticDependencies.ResourceModelProvider.GetResourceModel() + .GetResourceByFullName(new FullName(linkParts[0], linkParts[1])); + + // return the default link if the relationship is already correct, and/or if the resource is not found. + if (resource == null || link.Rel == resource.Name) + return link; + + return new Link + { + Rel = resource.Name, + Href = $"/{resource.SchemaUriSegment()}/{resource.PluralName.ToCamelCase()}/{ResourceId:n}" + }; + } + } // Aggregate reference + + /// + /// A class which represents the edfi.AcademicWeek table of the AcademicWeek aggregate in the ODS Database. + /// + [Serializable, DataContract] + [ExcludeFromCodeCoverage] + public class AcademicWeek : Entities.Common.EdFi.IAcademicWeek, IHasETag, IDateVersionedEntity, Entities.Common.EdFi.IAcademicWeekSynchronizationSourceSupport + { +#pragma warning disable 414 + private bool _SuspendReferenceAssignmentCheck = false; + public void SuspendReferenceAssignmentCheck() { _SuspendReferenceAssignmentCheck = true; } +#pragma warning restore 414 + + // ============================================================= + // Constructor + // ------------------------------------------------------------- + + // ------------------------------------------------------------ + + // ============================================================ + // Unique Identifier + // ------------------------------------------------------------ + + /// + /// The unique identifier for the AcademicWeek resource. + /// + [DataMember(Name="id")] + [JsonConverter(typeof(GuidConverter))] + public Guid Id { get; set; } + // ------------------------------------------------------------ + + // ============================================================= + // References + // ------------------------------------------------------------- + + private bool _schoolReferenceExplicitlyAssigned; + private School.EdFi.SchoolReference _schoolReference; + private School.EdFi.SchoolReference ImplicitSchoolReference + { + get + { + // if the Reference is null, it is instantiated unless it has been explicitly assigned to null + if (_schoolReference == null && !_schoolReferenceExplicitlyAssigned) + _schoolReference = new School.EdFi.SchoolReference(); + + return _schoolReference; + } + } + + [DataMember(Name="schoolReference")][NaturalKeyMember] + public School.EdFi.SchoolReference SchoolReference + { + get + { + // Only return the reference if it's non-null, and all its properties have non-default values assigned + if (ImplicitSchoolReference != null + && (_schoolReferenceExplicitlyAssigned || _SuspendReferenceAssignmentCheck || ImplicitSchoolReference.IsReferenceFullyDefined())) + return ImplicitSchoolReference; + + return null; + } + set + { + _schoolReferenceExplicitlyAssigned = true; + _schoolReference = value; + } + } + // ------------------------------------------------------------- + + //============================================================== + // Primary Key + // ------------------------------------------------------------- + + /// + /// The identifier assigned to a school. + /// + // IS in a reference, NOT a lookup column + int Entities.Common.EdFi.IAcademicWeek.SchoolId + { + get + { + if (ImplicitSchoolReference != null + && (_SuspendReferenceAssignmentCheck || ImplicitSchoolReference.IsReferenceFullyDefined())) + return ImplicitSchoolReference.SchoolId; + + return default(int); + } + set + { + // When a property is assigned, Reference should not be null even if it has been explicitly assigned to null. + // All ExplicitlyAssigned are reset to false in advanced + + // School + _schoolReferenceExplicitlyAssigned = false; + ImplicitSchoolReference.SchoolId = value; + } + } + + /// + /// The school label for the week. + /// + // NOT in a reference, NOT a lookup column + [DataMember(Name="weekIdentifier"), NaturalKeyMember] + public string WeekIdentifier { get; set; } + // ------------------------------------------------------------- + + // ============================================================= + // Equality + // ------------------------------------------------------------- + + /// + /// Determines equality based on the natural key properties of the resource. + /// + /// + /// A boolean value indicating equality result of the compared resources. + /// + public override bool Equals(object obj) + { + var compareTo = obj as Entities.Common.EdFi.IAcademicWeek; + + if (ReferenceEquals(this, compareTo)) + return true; + + if (compareTo == null) + return false; + + + // Referenced Property + if (!(this as Entities.Common.EdFi.IAcademicWeek).SchoolId.Equals(compareTo.SchoolId)) + return false; + + + // Standard Property + if ((this as Entities.Common.EdFi.IAcademicWeek).WeekIdentifier.Equals(compareTo.WeekIdentifier)) + return false; + + + return true; + } + + /// + /// Builds the hash code based on the unique identifying values. + /// + /// + /// A hash code for the resource. + /// + public override int GetHashCode() + { + var hash = new HashCode(); + + //Referenced Property + hash.Add((this as Entities.Common.EdFi.IAcademicWeek).SchoolId); + + // Standard Property + hash.Add((this as Entities.Common.EdFi.IAcademicWeek).WeekIdentifier); + + return hash.ToHashCode(); + } + // ------------------------------------------------------------- + + // ============================================================= + // Inherited Properties + // ------------------------------------------------------------- + // ------------------------------------------------------------- + + // ============================================================= + // Properties + // ------------------------------------------------------------- + + // NOT a lookup column, Not supported by this model, so there's "null object pattern" style implementation + DateTime Entities.Common.EdFi.IAcademicWeek.BeginDate + { + get { return default(DateTime); } + set { } + } + + /// + /// The end date for the academic week. + /// + // NOT in a reference, NOT a lookup column + [DataMember(Name="endDate")][JsonConverter(typeof(Iso8601UtcDateOnlyConverter))] + public DateTime EndDate { get; set; } + + // NOT a lookup column, Not supported by this model, so there's "null object pattern" style implementation + int Entities.Common.EdFi.IAcademicWeek.TotalInstructionalDays + { + get { return default(int); } + set { } + } + // ------------------------------------------------------------- + + // ============================================================= + // One-to-one relationships + // ------------------------------------------------------------- + // ------------------------------------------------------------- + + // ============================================================= + // Inherited One-to-one relationships + // ------------------------------------------------------------- + // ------------------------------------------------------------- + + // ============================================================= + // Inherited Collections + // ------------------------------------------------------------- + // ------------------------------------------------------------- + + // ============================================================= + // Extensions + // ------------------------------------------------------------- + [JsonProperty("_ext")] + [JsonConverter(typeof(ExtensionsConverter), "AcademicWeek", "AcademicWeek")] + public System.Collections.IDictionary Extensions { get; set; } + // ------------------------------------------------------------- + + // ============================================================= + // Collections + // ------------------------------------------------------------- + // ------------------------------------------------------------- + + // ============================================================= + // Versioning + // ------------------------------------------------------------- + + [DataMember(Name="_etag")] + public virtual string ETag { get; set; } + + [DataMember(Name="_lastModifiedDate")] + public virtual DateTime LastModifiedDate { get; set; } + + // ------------------------------------------------------------- + + // ------------------------------------------------------------- + // OnDeserialize + // ------------------------------------------------------------- + // ------------------------------------------------------------ + + // ============================================================ + // Data Synchronization + // ------------------------------------------------------------ + bool ISynchronizable.Synchronize(object target) + { + return Entities.Common.EdFi.AcademicWeekMapper.SynchronizeTo(this, (Entities.Common.EdFi.IAcademicWeek)target); + } + + void IMappable.Map(object target) + { + Entities.Common.EdFi.AcademicWeekMapper.MapTo(this, (Entities.Common.EdFi.IAcademicWeek)target, null); + } + // ------------------------------------------------------------- + + // ============================================================= + // Synchronization Source Support + // ------------------------------------------------------------- + bool Entities.Common.EdFi.IAcademicWeekSynchronizationSourceSupport.IsBeginDateSupported { get { return false; } set { } } + bool Entities.Common.EdFi.IAcademicWeekSynchronizationSourceSupport.IsEndDateSupported { get { return true; } set { } } + bool Entities.Common.EdFi.IAcademicWeekSynchronizationSourceSupport.IsTotalInstructionalDaysSupported { get { return false; } set { } } + // ------------------------------------------------------------- + + bool IExtensionsSynchronizationSourceSupport.IsExtensionSupported(string name) { return false; } + void IExtensionsSynchronizationSourceSupport.SetExtensionSupported(string name, bool isSupported) { } + bool IExtensionsSynchronizationSourceSupport.IsExtensionAvailable(string name) { return true; } + void IExtensionsSynchronizationSourceSupport.SetExtensionAvailable(string name, bool isSupported) { } + + + // ================================================================= + // Resource Reference Data + // ----------------------------------------------------------------- + Guid? Entities.Common.EdFi.IAcademicWeek.SchoolResourceId + { + get { return null; } + set { ImplicitSchoolReference.ResourceId = value ?? default(Guid); } + } + + + // ----------------------------------------------------------------- + } + + // ================================================================= + // Validators + // ----------------------------------------------------------------- + + [ExcludeFromCodeCoverage] + public class AcademicWeekPutPostRequestValidator : FluentValidation.AbstractValidator + { + protected override bool PreValidate(FluentValidation.ValidationContext context, FluentValidation.Results.ValidationResult result) + { + if (context.InstanceToValidate == null) + { + result.Errors.Add(new ValidationFailure("", "Please ensure a model was supplied.")); + + return false; + } + + var instance = context.InstanceToValidate; + + var failures = new List(); + + // ----------------------- + // Validate unified keys + // ----------------------- + + // Recursively invoke the child collection item validators + + if (failures.Any()) + { + foreach (var failure in failures) + { + result.Errors.Add(failure); + } + + return false; + } + + return true; + } + } + // ----------------------------------------------------------------- + +} From cc1cb6abb5c74d6a8a7201c5e3677d9e37c7b2ea Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 18:20:20 -0600 Subject: [PATCH 14/22] Empty-Commit From 1a34d49ebd17151fc8b610c3ba29b1169d6f3757 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 18:54:51 -0600 Subject: [PATCH 15/22] Empty-Commit From 14938c2182075897b815d89e43d8624d25eb990e Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 21:13:01 -0600 Subject: [PATCH 16/22] Encrypt=False Added in ConnectionString --- tests/EdFi.Ods.Api.IntegrationTests/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/EdFi.Ods.Api.IntegrationTests/appsettings.json b/tests/EdFi.Ods.Api.IntegrationTests/appsettings.json index 06a14e9fb0..2247f0bd88 100644 --- a/tests/EdFi.Ods.Api.IntegrationTests/appsettings.json +++ b/tests/EdFi.Ods.Api.IntegrationTests/appsettings.json @@ -5,7 +5,7 @@ "Engine": "SQLServer" }, "ConnectionStrings": { - "EdFi_Ods": "Server=(local); Database=EdFi_Ods_Populated_Template_Test; Trusted_Connection=True; Application Name=EdFi.Ods.Api.IntegrationTests;", - "EdFi_Master": "Server=(local); Database=master; Trusted_Connection=True; Application Name=EdFi.Ods.Api.IntegrationTests;" + "EdFi_Ods": "Server=(local); Database=EdFi_Ods_Populated_Template_Test; Trusted_Connection=True; Application Name=EdFi.Ods.Api.IntegrationTests;;Encrypt=False", + "EdFi_Master": "Server=(local); Database=master; Trusted_Connection=True; Application Name=EdFi.Ods.Api.IntegrationTests;;Encrypt=False" } } \ No newline at end of file From 8656431503f242811f0c4aa16341f0381b8c51fe Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 22:03:38 -0600 Subject: [PATCH 17/22] Empty-Commit From ee6950cb09eba541ee4c9457f40ff5d2f8747f1d Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 24 Jan 2024 23:06:55 -0600 Subject: [PATCH 18/22] Empty-Commit From 13804586721978ea8d3d06bde9d1eb45e69a973e Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Thu, 25 Jan 2024 08:04:54 -0600 Subject: [PATCH 19/22] Dependency Review Pull request CodeFix --- .github/workflows/Dependencies Security Scan.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/Dependencies Security Scan.yml b/.github/workflows/Dependencies Security Scan.yml index 85b63b3a95..581283d5ef 100644 --- a/.github/workflows/Dependencies Security Scan.yml +++ b/.github/workflows/Dependencies Security Scan.yml @@ -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 From 7815de0eb5310039bebdf0b175b54eb0be820b7e Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Thu, 25 Jan 2024 11:05:47 -0600 Subject: [PATCH 20/22] IProfileMetadataProvider Code fix --- .../Providers/Impl/ValidatingProfileMetadataProvider.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs index fc33cb06d3..0f1f624122 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Providers/Impl/ValidatingProfileMetadataProvider.cs @@ -20,7 +20,7 @@ namespace EdFi.Ods.CodeGen.Providers.Impl public class ValidatingProfileMetadataProvider : IProfileMetadataProvider, IProfileResourceNamesProvider { private readonly Lazy _codeGenProfiles; - private readonly Lazy> _profileDefinitionByName; + private readonly Lazy> _profileDefinitionByName; private readonly Lazy> _profileResources; private readonly Lazy _profileXDoc; private readonly ResourceModel _resourceModel; @@ -43,7 +43,7 @@ public ValidatingProfileMetadataProvider(string profilePath, IResourceModelProvi } _resourceModel = resourceModelProvider.GetResourceModel(); - _profileDefinitionByName = new Lazy>(LazyInitializeProfileDefinitions); + _profileDefinitionByName = new Lazy>(LazyInitializeProfileDefinitions); _profileXDoc = new Lazy(() => MetadataHelper.GetProfilesXDocument(profilePath)); _profileResources = new Lazy>(LazyInitializeProfileResources); @@ -71,7 +71,7 @@ public bool HasProfileData => ProfileXDocument.Nodes() .Any(); - public IReadOnlyDictionary ProfileDefinitionsByName => throw new NotImplementedException(); + public IReadOnlyDictionary ProfileDefinitionsByName { get => _profileDefinitionByName.Value; } /// /// Gets the specified Profile definition by name. @@ -90,7 +90,7 @@ public XElement GetProfileDefinition(string profileName) List IProfileResourceNamesProvider.GetProfileResourceNames() => _profileResources.Value; - private IDictionary LazyInitializeProfileDefinitions() + private Dictionary LazyInitializeProfileDefinitions() { if (!HasProfileData) { From 34ad7d3eb28db222a3baa4891fddf82caa01bd68 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Thu, 25 Jan 2024 11:07:30 -0600 Subject: [PATCH 21/22] pull_request Branches Updated --- .github/workflows/CodeQL Security Scan.yml | 4 ++-- .github/workflows/Dependencies Security Scan.yml | 2 +- .github/workflows/InitDev Implementation.yml | 2 +- .github/workflows/Packages - EdFi.Database.Admin.yml | 4 ++-- .github/workflows/Packages - EdFi.Database.Security.yml | 4 ++-- .github/workflows/Packages - EdFi.Ods.CodeGen.yml | 4 ++-- .../Packages - EdFi.Ods.Minimal.Template.PostgreSQL.yml | 2 +- .../Packages - EdFi.Ods.Minimal.Template.TPDM.PostgreSQL.yml | 2 +- .../workflows/Packages - EdFi.Ods.Minimal.Template.TPDM.yml | 2 +- .github/workflows/Packages - EdFi.Ods.Minimal.Template.yml | 2 +- .../Packages - EdFi.Ods.Populated.Template.PostgreSQL.yml | 2 +- ...Packages - EdFi.Ods.Populated.Template.TPDM.PostgreSQL.yml | 2 +- .../workflows/Packages - EdFi.Ods.Populated.Template.TPDM.yml | 2 +- .github/workflows/Packages - EdFi.Ods.Populated.Template.yml | 2 +- .github/workflows/edFi.admin.dataaccess manual.yml | 2 +- .github/workflows/edFi.admin.dataaccess pullrequest.yml | 2 +- .github/workflows/edFi.common manual.yml | 2 +- .github/workflows/edFi.common pullrequest.yml | 2 +- .github/workflows/edFi.loadtools pullrequest.yml | 2 +- .github/workflows/edFi.ods.api pullrequest .yml | 2 +- .github/workflows/edFi.ods.common pullrequest.yml | 2 +- .github/workflows/edFi.security.dataaccess manual.yml | 2 +- .github/workflows/edFi.security.dataaccess pullrequest.yml | 2 +- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml index ff6c33e250..04d9ea926e 100644 --- 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, 'ODS-*',b-v*-patch*] + [main, b-v*-patch*] push: branches: - [main, 'ODS-*',b-v*-patch*] + [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 index 581283d5ef..8fb391e38e 100644 --- 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, 'ODS-*',b-v*-patch*] + branches: [main, b-v*-patch*] env: HEAD_REF: ${{ GITHUB.HEAD_REF }} diff --git a/.github/workflows/InitDev Implementation.yml b/.github/workflows/InitDev Implementation.yml index dbdd30f435..3bff8f0ea8 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index 0aee8e7632..6a03f3db46 100644 --- 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, 'ODS-*',b-v*-patch*] + branches: [main, b-v*-patch*] paths: - '**.sql' push: branches: - [main, 'ODS-*',b-v*-patch*] + [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 index f9ab60ab5a..8b82898831 100644 --- 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, 'ODS-*',b-v*-patch*] + branches: [main, b-v*-patch*] paths: - '**.sql' push: branches: - [main, 'ODS-*',b-v*-patch*] + [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 index 41f50355b6..20f9405ffa 100644 --- 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, 'ODS-*',b-v*-patch*] + branches: [main, b-v*-patch*] push: branches: - [main, 'ODS-*',b-v*-patch*] + [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 index 3f1ad5953d..d04663e1f1 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index 2aa24e8b92..d872f650b0 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index bb74a503c2..1618622437 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index f01afe4443..e70d1be800 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index c88d50f2c0..aa66839690 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index 24865dc1ee..6d9be708d4 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index 16302ee0b6..39a48c254b 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index a213d39aba..f2f5ce57b8 100644 --- 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, 'ODS-*',b-v*-patch*] + [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 index f1eaa1d079..ca46464f8a 100644 --- a/.github/workflows/edFi.admin.dataaccess manual.yml +++ b/.github/workflows/edFi.admin.dataaccess manual.yml @@ -3,7 +3,7 @@ name: EdFi.Admin.DataAccess Manually triggered build on: workflow_dispatch: pull_request: - branches: [main, 'ODS-*',b-v*-patch*] + 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 index 9b34428f02..1516d272d2 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index 91d52730c6..8e1addb79c 100644 --- a/.github/workflows/edFi.common manual.yml +++ b/.github/workflows/edFi.common manual.yml @@ -3,7 +3,7 @@ name: EdFi.Common Manually triggered build on: workflow_dispatch: pull_request: - branches: [main, 'ODS-*',b-v*-patch*] + 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 index 2488f9a790..31b2a8479e 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index a9f0b346f5..81edf8a344 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index c8b467c0e6..ef31d65e8e 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index e408a06116..a12459ba4a 100644 --- 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, 'ODS-*',b-v*-patch*] + 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 index 568c74c6f2..14890d4bdf 100644 --- a/.github/workflows/edFi.security.dataaccess manual.yml +++ b/.github/workflows/edFi.security.dataaccess manual.yml @@ -3,7 +3,7 @@ name: EdFi.Security.DataAccess Manually triggered build on: workflow_dispatch: pull_request: - branches: [main, 'ODS-*',b-v*-patch*] + 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 index 0f9c942905..375d8a8c7f 100644 --- 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, 'ODS-*',b-v*-patch*] + branches: [main, b-v*-patch*] env: INFORMATIONAL_VERSION: "6.1" From 8ed50e69c996ec78efd45359b42a90f977ae2a4b Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Thu, 25 Jan 2024 13:37:06 -0600 Subject: [PATCH 22/22] System.Data.SqlClient unwanted reference Removed --- Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj | 1 - Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj | 1 - .../EdFi.Ods.Repositories.NHibernate.Tests.csproj | 1 - Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj | 1 - Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj | 1 - Application/Test.Common/Test.Common.csproj | 1 - .../EdFi.Admin.DataAccess.IntegrationTests.csproj | 1 - tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj | 1 - 8 files changed, 8 deletions(-) diff --git a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj index d2c894f402..6faf2705fb 100644 --- a/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj +++ b/Application/EdFi.Admin.DataAccess/EdFi.Admin.DataAccess.csproj @@ -21,7 +21,6 @@ - diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj index ddabe4d14d..c36bed4fa9 100644 --- a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj +++ b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj @@ -48,7 +48,6 @@ - diff --git a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj index f919ead9d6..7839bd279c 100644 --- a/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj +++ b/Application/EdFi.Ods.Repositories.NHibernate.Tests/EdFi.Ods.Repositories.NHibernate.Tests.csproj @@ -17,7 +17,6 @@ true - diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj index 6bc5955e93..ed1a4c08b2 100644 --- a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj +++ b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj @@ -27,7 +27,6 @@ - diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj index 62a350aab1..dee9c5cc34 100644 --- a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj +++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj @@ -43,7 +43,6 @@ - diff --git a/Application/Test.Common/Test.Common.csproj b/Application/Test.Common/Test.Common.csproj index 25943febdc..5cfe9dcbec 100644 --- a/Application/Test.Common/Test.Common.csproj +++ b/Application/Test.Common/Test.Common.csproj @@ -14,7 +14,6 @@ true - diff --git a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj index 34d098ea9b..7d2f1da304 100644 --- a/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj +++ b/tests/EdFi.Admin.DataAccess.IntegrationTests/EdFi.Admin.DataAccess.IntegrationTests.csproj @@ -29,7 +29,6 @@ - diff --git a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj index 8ffeb412e5..97a97437c9 100644 --- a/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj +++ b/tests/EdFi.Common.UnitTests/EdFi.Common.UnitTests.csproj @@ -28,7 +28,6 @@ -