Updated pip-requirements and .azurepipelines to be in sync with basecore

.azurepipelines/Ubuntu-GCC5.yml

@@ -32,6 +32,8 @@ jobs:
     arch_list: "IA32,X64,ARM,AARCH64"
     # MU_CHANGE
     extra_steps:
-    - script: sudo apt-get install mingw-w64
-      displayName: Install Windows Resource Compiler for Linux
+    - script: |
+              sudo apt-get install -y mingw-w64 lcov
+              pip install lcov_cobertura pycobertura
+      displayName: Install Windows Resource Compiler for Linux & Code Coverage Tools
 

.azurepipelines/Ubuntu-PatchCheck.yml

@@ -29,7 +29,7 @@ steps:
 
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '3.8.x'
+    versionSpec: '>=3.10.6'
     architecture: 'x64'
 
 - script: |

.azurepipelines/templates/markdownlint-check-prereq-steps.yml

@@ -13,6 +13,6 @@ parameters:
 
 steps:
 
-- script: npm install -g markdownlint-cli
+- script: npm install -g markdownlint-cli@0.31.1
   displayName: "Install markdown linter"
   condition: and(gt(variables.pkg_count, 0), succeeded())

.azurepipelines/templates/pr-gate-build-job.yml

@@ -13,6 +13,7 @@ parameters:
   vm_image: ''
   arch_list: ''
   extra_steps: []   # MU_CHANGE
+  build_args: ''    # MU_CHANGE - Allow environment level build args.
 
 # Build step
 jobs:
@@ -36,10 +37,11 @@ jobs:
     vmImage: ${{ parameters.vm_image }}
 
   steps:
-  - ${{ parameters.extra_steps }}   # MU_CHANGE
   - template: pr-gate-steps.yml
     parameters:
       tool_chain_tag: ${{ parameters.tool_chain_tag }}
       build_pkgs: $(Build.Pkgs)
       build_targets: $(Build.Targets)
       build_archs: ${{ parameters.arch_list }}
+      extra_steps: ${{ parameters.extra_steps }}   # MU_CHANGE
+      build_args: ${{ parameters.build_args }}     # MU_CHANGE

.azurepipelines/templates/pr-gate-steps.yml

@@ -12,6 +12,9 @@ parameters:
   build_pkgs: ''
   build_targets: ''
   build_archs: ''
+  has_ci_dependencies: false    # MU_CHANGE - Enable toggle for stuart_ci_build
+  extra_steps: []               # MU_CHANGE - needed for clang
+  build_args: '' # MU_CHANGE - add build arguments to support code coverage
 
 steps:
 - checkout: self
@@ -65,6 +68,13 @@ steps:
 # install markdownlint check prereqs
 - template: markdownlint-check-prereq-steps.yml
 
+
+# MU_CHANGE - [start] need support for extra steps for clang
+# Extra steps if needed
+- ${{ parameters.extra_steps }}
+# MU_CHANGE [end]
+
+
 # Build repo
 # MU_CHANGE - We use CI dependencies as well as submodules.
 - task: CmdLine@1
@@ -72,7 +82,7 @@ steps:
   inputs:
     filename: stuart_ci_setup
     arguments: -c .pytool/CISettings.py -p $(pkgs_to_build) --force-git -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}}
-  condition: and(gt(variables.pkg_count, 0), succeeded())
+  condition: and(gt(variables.pkg_count, 0), succeeded(), eq('${{ parameters.has_ci_dependencies }}', 'true'))
 
 - task: CmdLine@1
   displayName: Setup ${{ parameters.build_pkgs }} ${{ parameters.build_archs}}
@@ -101,7 +111,8 @@ steps:
   displayName: Build and Test ${{ parameters.build_pkgs }} ${{ parameters.build_archs}}
   inputs:
     filename: stuart_ci_build
-    arguments: -c .pytool/CISettings.py -p $(pkgs_to_build) -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}}
+    # MU_CHANGE - Add build arguments parameter
+    arguments: -c .pytool/CISettings.py -p $(pkgs_to_build) -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}} ${{ parameters.build_args}}
   condition: and(gt(variables.pkg_count, 0), succeeded())
 
 # Publish Test Results to Azure Pipelines/TFS
@@ -152,6 +163,8 @@ steps:
       TestSuites.xml
       **/BUILD_TOOLS_REPORT.html
       **/OVERRIDELOG.TXT
+      coverage.xml
+      coverage.html
     flattenFolders: true
   condition: succeededOrFailed()
 
@@ -163,3 +176,11 @@ steps:
     pathtoPublish: '$(Build.ArtifactStagingDirectory)'
     artifactName: 'Build Logs $(System.JobName)'
   condition: succeededOrFailed()
+
+# MU_CHANGE - Publish the LCOV coverage files.
+- task: PublishCodeCoverageResults@1
+  condition: and(succeededOrFailed(), and(gt(variables.pkg_count, 0), contains('${{ parameters.build_args }}', 'CODE_COVERAGE=TRUE')))
+  inputs:
+    codeCoverageTool: 'Cobertura'
+    summaryFileLocation: 'Build/coverage.xml'
+    pathToSources: '$(Build.SourcesDirectory)'

pip-requirements.txt

@@ -12,7 +12,8 @@
 # https://www.python.org/dev/peps/pep-0440/#version-specifiers
 ##
 
-edk2-pytool-library==0.11.2
-edk2-pytool-extensions~=0.17.0 # MU_CHANGE - update to 0.17.0 or later
+edk2-pytool-library==0.11.6
+edk2-pytool-extensions~=0.17.2 # MU_CHANGE
 edk2-basetools==0.1.24
 antlr4-python3-runtime==4.7.1
+regex