From 18c886ee3f96efab5c74af0e1f098cd507f51626 Mon Sep 17 00:00:00 2001 From: "m.semalaiappan" Date: Wed, 28 Feb 2024 13:18:58 -0600 Subject: [PATCH] Allow Multiple EDfi ODS in path --- .github/workflows/CodeQL Security Scan.yml | 2 +- .../EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CodeQL Security Scan.yml b/.github/workflows/CodeQL Security Scan.yml index bb21b77a85..ce8d93fdd3 100644 --- a/.github/workflows/CodeQL Security Scan.yml +++ b/.github/workflows/CodeQL Security Scan.yml @@ -73,7 +73,7 @@ jobs: $ErrorActionPreference = 'Stop' $PSVersionTable . $env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/Initialize-PowershellForDevelopment.ps1 - Invoke-CodeGen -Engine SQLServer -RepositoryRoot $env:GITHUB_WORKSPACE/Ed-Fi-ODS/ + Invoke-CodeGen -Engine SQLServer -RepositoryRoot $env:GITHUB_WORKSPACE - name: build shell: pwsh diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs index f7b98ca856..93b669a218 100644 --- a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs +++ b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Helpers/CodeRepositoryHelper.cs @@ -32,6 +32,16 @@ public CodeRepositoryHelper(string codeRepositoryPath) Path.DirectorySeparatorChar, dirList.TakeWhile(x => !x.EqualsIgnoreCase(CodeRepositoryConventions.EdFiOdsFolderName))); + if (Directory.Exists(codeRepositoryPath)) + { + bool IsEdFiOdsFolderExist = Directory.GetDirectories(codeRepositoryPath).Where(s => s.Equals(codeRepositoryPath + CodeRepositoryConventions.EdFiOdsFolderName)).Any(); + + if (IsEdFiOdsFolderExist) + { + root = codeRepositoryPath; + } + } + _repositoryByName.Add(CodeRepositoryConventions.Root, root); _repositoryByName.Add(CodeRepositoryConventions.Ods, Path.Combine(root, CodeRepositoryConventions.EdFiOdsFolderName));