Revert "Mitryakh/merge conflicts (#13929)"

This reverts commit a60e990.

.azure-pipelines/daily-build.yml

@@ -9,148 +9,20 @@ schedules:
 
 pr: none
 
-jobs:
-- job: DailyBuild
-  timeoutInMinutes: 180
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: PowerShell@2
-    displayName: 'Initialization'
-    inputs:
-      targetType: 'inline'
-      script: |
-        Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
-        # Avoid issue of filename too long
-        git config --global core.longpaths true
-        # Wipe any changes from a previous branch
-        git clean -xdf
-
-  - task: PowerShell@2
-    displayName: Prepare Powershell $(PSVersion) 
-    inputs:
-      filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
-      arguments: '-RequiredPsVersion $(PSVersion)'      
-
-  - task: PowerShell@2
-    displayName: 'Install platyPS'
-    inputs:
-      targetType: 'inline'
-      script: |
-        $command = "`$PSVersionTable `
-                    Install-Module platyPS -Force -Confirm:`$false -Scope CurrentUser `
-                    Exit"
-        dotnet tool run pwsh -c $command
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Build for Bumping Version'
-    inputs:
-      command: custom
-      custom: msbuild
-      arguments: 'build.proj /t:"Build" /p:"Configuration=Release"'
-
-  - task: PowerShell@2
-    displayName: 'Bump Version'
-    inputs:
-      targetType: 'inline'
-      script: |
-        $command = "`$PSVersionTable `
-        ./tools/RunVersionController.ps1  -MonthName $(MonthName) -Year $(Year) `
-        Exit"
-        dotnet tool run pwsh -c $command  
-
-  # - task: PowerShell@2
-  #   displayName: 'Push to Branch internal/dailybuild'
-  #   inputs:
-  #     targetType: 'inline'
-  #     script: |
-  #       git config user.email "[email protected]"
-  #       git config user.name "azuresdkci"
-  #       git remote set-url origin https://$(Token)@github.com/Azure/azure-powershell.git
-  #       git checkout -b internal/dailybuild
-  #       git add .
-  #       git commit -m "Bump Version"
-  #       git status
-  #       git push -u origin internal/dailybuild --force
-
-  - task: PowerShell@2
-    displayName: 'Clean artifacts folder'
-    inputs:
-      targetType: 'inline'
-      script: |
-        Remove-Item -Force -Recurse -Path artifacts
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Build after Version Bump up'
-    inputs:
-      command: custom
-      custom: msbuild
-      arguments: 'build.proj /t:Build /p:Configuration=Release'
-
-  - task: EsrpCodeSigning@1
-    inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
-      FolderPath: 'artifacts'
-      Pattern: |
-        Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
-        Release/**/Az.*.private.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
-        Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
-        !Release/**/Microsoft*Azure*PowerShell*Cmdlets*.Test.dll
-      UseMinimatch: true
-      signConfigType: 'inlineSignParams'
-      inlineOperation: |
-        [
-              {
-                "KeyCode": "CP-233863-SN",
-                "OperationCode": "StrongNameSign",
-                "Parameters": {},
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-              },
-              {
-                "KeyCode": "CP-233863-SN",
-                "OperationCode": "StrongNameVerify",
-                "Parameters": {},
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-              },
-              {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolSign",
-                "Parameters": {
-                  "OpusName": "Microsoft",
-                  "OpusInfo": "http://www.microsoft.com",
-                  "FileDigest": "/fd \"SHA256\"",
-                  "PageHash": "/NPH",
-                  "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                },
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-              },
-              {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolVerify",
-                "Parameters": {},
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-              }
-            ]
-      SessionTimeout: '60'
-      MaxConcurrency: '50'
-      MaxRetryAttempts: '5'
-
-  - task: DotNetCoreCLI@2
-    displayName: Publish
-    inputs:
-      command: custom
-      custom: msbuild
-      arguments: 'build.proj /t:Publish /p:Configuration=Release;NuGetKey=$(NuGetKey)'
-
-  - task: PublishPipelineArtifact@0
-    displayName: 'Save artifacts'
-    inputs:
-      artifactName: artifacts
-      targetPath: artifacts
-    condition: succeededOrFailed()
+pool:
+  vmImage: 'windows-2019'
+
+steps:
+- task: DotNetCoreCLI@2
+  displayName: Build for Version Bump
+  inputs:
+    command: 'custom'
+    custom: 'msbuild'
+    arguments: 'build.proj'
+
+- task: ComponentGovernanceComponentDetection@0
+  displayName: Component Detection
+  inputs:
+    scanType: 'Register'
+    verbosity: 'Normal'
+    alertWarningLevel: 'High'

.azure-pipelines/util/test-steps.yml

@@ -32,7 +32,7 @@ steps:
    Install-Module -Name Pester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck
    Install-Module -Name Az.Accounts -Scope CurrentUser -Force
    $env:PSModulePath = $env:PSModulePath + ";" + (pwd).Path
-   Get-ChildItem -File -Recurse -Depth 1 test-module.ps1 | ForEach-Object {. $_; if ($LastExitCode -ne 0) {throw "test fails when executing $_"}}
+   Get-ChildItem -Directory Az.* | ForEach-Object {if (Test-Path $_/test-module.ps1) {cd $_; ./test-module.ps1}}
   workingDirectory: 'artifacts/Debug'
   displayName: Test for AutoGen Modules With Windows PowerShell
   condition: and(succeeded(), ne('${{ parameters.testTarget }}', 'Test'))
@@ -42,7 +42,7 @@ steps:
    Install-Module -Name Az.Accounts -Scope CurrentUser -Force
    if ($IsWindows) { $sp = ";" } else { $sp = ":" }
    $env:PSModulePath = $env:PSModulePath + $sp + (pwd).Path
-   Get-ChildItem -File -Recurse -Depth 1 test-module.ps1 | ForEach-Object {. $_; if ($LastExitCode -ne 0) {throw "test fails when executing $_"}}
+   Get-ChildItem -Directory Az.* | ForEach-Object {if (Test-Path $_/test-module.ps1) {cd $_; ./test-module.ps1}}
   workingDirectory: 'artifacts/Debug'
   displayName: 'Test for AutoGen Modules With PowerShell Core'
   condition: and(succeeded(), eq('${{ parameters.testTarget }}', 'Test'))

.azure-pipelines/windows-powershell.yml

@@ -45,7 +45,7 @@ jobs:
     displayName: 'Download BinSkim'
     inputs:
       command: custom
-      arguments: 'install Microsoft.CodeAnalysis.BinSkim -OutputDirectory $(System.DefaultWorkingDirectory)/tools/SecurityTools -Version 1.7.0'
+      arguments: 'install Microsoft.CodeAnalysis.BinSkim -OutputDirectory $(System.DefaultWorkingDirectory)/tools/SecurityTools'
   - task: PowerShell@2
     displayName: 'Run BinSkim'
     inputs: