Updated CISettings.py to use the edk2toolext codeql heleprs

microsoft · Jan 22, 2024 · 2dd3ce8 · 2dd3ce8
1 parent 8108fae
commit 2dd3ce8
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
@@ -18,14 +18,7 @@
 from edk2toollib.utility_functions import GetHostInfo
 from pathlib import Path
 
-try:
-    # May not be present until submodules are populated
-    root = Path(__file__).parent.parent.resolve()
-    sys.path.append(str(root/'MU_BASECORE'/'.pytool'/'Plugin'/'CodeQL'/'integration'))
-    import stuart_codeql as codeql_helpers
-except ImportError:
-    pass
-
+from edk2toolext import codeql as codeql_helpers
 
 class Settings(CiSetupSettingsManager, CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManager, PrEvalSettingsManager):
 
@@ -221,17 +214,17 @@ def GetDependencies(self):
             {
                 "Path": "Common/MU_TIANO",
                 "Url": "https://github.com/microsoft/mu_tiano_plus.git",
-                "Branch": "release/202311"
+                "Branch": "release/202302"
             },
             {
                 "Path": "MU_BASECORE",
                 "Url": "https://github.com/microsoft/mu_basecore.git",
-                "Branch": "release/202311"
+                "Branch": "release/202302"
             },
             {
                 "Path": "Silicon/Intel/MU_TIANO",
                 "Url": "https://github.com/microsoft/mu_silicon_intel_tiano.git",
-                "Branch": "release/202311"
+                "Branch": "release/202302"
             }
         ]