Revert "[CI] Create the initial stage to start running APIScan. (#19828…

…)" (#20056)

This reverts commit b7f4bef.

tools/devops/automation/scripts/MaciosCI.psd1

@@ -71,7 +71,6 @@ ScriptsToProcess = @(
 NestedModules = @(
                'Artifacts.psm1', 
                'GitHub.psm1', 
-               'Governance.psm1',
                'MLaunch.psm1', 
                'RemoteMac.psm1', 
                'StaticPages.psm1', 

tools/devops/automation/templates/common/configure.yml

@@ -80,22 +80,11 @@ steps:
     $testMatrix = $testMatrix | ConvertFrom-Json | ConvertTo-Json -Compress
     Write-Host "##vso[task.setvariable variable=TEST_MATRIX;isOutput=true]$testMatrix"
   name: test_matrix
-  displayName: 'Create tests strategy matrix'
+  displayName: 'Create strategy matrix'
   env:
     TEST_CONFIGURATIONS: ${{ convertToJson(parameters.testConfigurations) }}
     SUPPORTED_PLATFORMS: ${{ convertToJson(parameters.supportedPlatforms) }}
 
-- pwsh: |
-    Import-Module $Env:SYSTEM_DEFAULTWORKINGDIRECTORY/xamarin-macios/tools/devops/automation/scripts/MaciosCI.psd1
-    gci env: | sort | format-table -autosize -wrap
-    $apiScanMatrix = Get-APIScanConfiguration -EnabledPlatforms "$Env:CONFIGURE_PLATFORMS_DOTNET_PLATFORMS"
-    # compress the json to remove any newlines, because we can't set the variable below if the json has any newlines
-    Write-Host "$apiScanMatrix"
-    $apiScanMatrix = $apiScanMatrix | ConvertFrom-Json | ConvertTo-Json -Compress
-    Write-Host "##vso[task.setvariable variable=APISCAN_MATRIX;isOutput=true]$apiScanMatrix"
-  name: apiscan_matrix
-  displayName: 'Create APIScan matrix'
-
 # upload config to be consumed later
 - ${{ if eq(parameters.uploadArtifacts, true) }}:
   - task: PublishPipelineArtifact@1

tools/devops/automation/templates/governance/general.yml → tools/devops/automation/templates/governance-checks.yml

@@ -17,7 +17,7 @@ parameters:
 
 steps:
 
-- template: ../common/checkout.yml
+- template: ./common/checkout.yml
   parameters:
     isPR: ${{ parameters.isPR }}
     repositoryAlias: ${{ parameters.repositoryAlias }}
@@ -31,6 +31,7 @@ steps:
     Dir $(System.DefaultWorkingDirectory)
   displayName: Show directories
 
+
 - powershell: |
     Get-ChildItem -Recurse -Path $(Build.SourcesDirectory)/maccore
   displayName: Show maccore content 

tools/devops/automation/templates/main-stage.yml

@@ -277,12 +277,23 @@ parameters:
 stages:
 
 - ${{ if eq(parameters.runGovernanceTests, true) }}:
-  - template: ./governance/stage.yml
-    parameters:
-      isPR: ${{ parameters.isPR }}
-      repositoryAlias: ${{ parameters.repositoryAlias }}
-      commit: ${{ parameters.commit }}
-      stageDisplayNamePrefix: ${{ parameters.stageDisplayNamePrefix }}
+  - stage: governance_checks
+    displayName: '${{ parameters.stageDisplayNamePrefix }}Governance Checks'
+    dependsOn: build_packages
+    ${{ if and(ne(parameters.dependsOn, ''), ne(parameters.dependsOnResult, '')) }}:
+      condition: eq(dependencies.${{ parameters.dependsOn }}.result, '${{ parameters.dependsOnResult }}')
+    jobs:
+    - job: governance
+      displayName: 'Governance Checks'
+      pool:
+        vmImage: windows-latest
+      steps:
+      - template: governance-checks.yml
+        parameters:
+          isPR: ${{ parameters.isPR }}
+          repositoryAlias: ${{ parameters.repositoryAlias }}
+          commit: ${{ parameters.commit }}
+
 
 - ${{ if parameters.isPR }}:
   - stage: clean