fix merge conflicts

.azure-pipelines/release-test.yml

@@ -0,0 +1,178 @@
+pr: none
+trigger: none
+
+strategy:
+  matrix:
+    Windows PS 5.1.14:
+      Image_Name: 'vs2017-win2016'
+      PSVersion: '5.1.14'
+
+    Windows PS 6.2.4:
+      Image_Name: 'vs2017-win2016'
+      PSVersion: '6.2.4'
+
+    Windows PS 7.0.3:
+      Image_Name: 'vs2017-win2016'
+      PSVersion: '7.0.3'
+
+    Linux PS 6.2.4:
+      Image_Name: 'ubuntu-18.04'
+      PSVersion: '6.2.4'
+
+    Linux PS 7.0.3:
+      Image_Name: 'ubuntu-18.04'
+      PSVersion: '7.0.3'
+
+    MacOS PS 6.2.4:
+      Image_Name: 'macOS-10.15'
+      PSVersion: '6.2.4'
+
+    MacOS PS 7.0.3:
+      Image_Name: 'macOS-10.15'
+      PSVersion: '7.0.3'
+
+pool:
+  vmImage: $(Image_Name)
+
+steps:
+- task: PowerShell@2
+  displayName: Prepare Powershell $(PSVersion) 
+  inputs:
+    filePath: 'tools/Test/SmokeTest/PrepareRequiredPowershell.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion)'      
+
+- task: DownloadPipelineArtifact@2
+  condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
+  displayName: Download Artifacts from Build Pipeline
+  inputs:
+    buildType: specific
+    project: $(ProjectToDownloadArtifacts)
+    definition: $(BuildPipelineName)
+    buildVersionToDownload: latestFromBranch
+    branchName: $(BranchName)
+    artifactName: $(ArtifactName)
+    targetPath: $(Pipeline.Workspace)
+
+- task: PowerShell@2
+  condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
+  displayName: Copy Artifacts to LocalRepo
+  inputs:
+    targetType: 'inline'
+    script: |
+     New-Item -Path "$(Pipeline.Workspace)" -Name "LocalRepo" -ItemType "directory"
+     Copy-Item -Path "$(Pipeline.Workspace)\\*.nupkg" -Destination "$(Pipeline.Workspace)\\LocalRepo\\"
+     Write-Host "List artifacts..."
+     Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
+
+- task: NuGetCommand@2
+  condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
+  displayName: 'Download Previous Release .nupkg Files'
+  inputs:
+    command: custom
+    arguments: 'install Az -directdownload -packagesavemode nupkg -source https://www.powershellgallery.com/api/v2 -OutputDirectory packages'
+
+- task: PowerShell@2
+  condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
+  displayName: 'Copy Previous Release .nupkg files to LocalRepo'
+  inputs:
+    targetType: 'inline'
+    script: |
+      Get-ChildItem $(System.DefaultWorkingDirectory)/packages -Recurse -Include *.nupkg | Copy-Item -Destination "$(Pipeline.Workspace)\\LocalRepo\\" -Force
+      Write-Host "List localRepo..."
+      Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
+
+- task: PowerShell@2
+  displayName: Install Az Modules from $(GalleryName)
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAzModules.ps1 -Gallery $(GalleryName) -LocalRepoLocation $(LocalRepoLocation)"'   
+
+- task: PowerShell@2
+  displayName: Connect AzAccount 
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/ConnectAzAccount.ps1 $(Password) $(ServicePrincipal) $(TenantId)"'
+
+- task: PowerShell@2
+  displayName: Run Smoke Test 
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1"'
+
+- task: PowerShell@2
+  displayName: 'Run Smoke Test Reversely'
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
+
+- task: PowerShell@2
+  displayName: Clean Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'  
+
+- task: PowerShell@2
+  displayName: Update Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/UpdateAzModules.ps1 -Gallery $(GalleryName)"'  
+
+- task: PowerShell@2
+  displayName: Run Smoke Test 
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1"'
+
+- task: PowerShell@2
+  displayName: 'Run Smoke Test Reversely'
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/RmCoreSmokeTests.ps1 -Reverse"'
+
+- task: PowerShell@2
+  displayName: Clean Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'  
+
+- task: PowerShell@2
+  displayName: Install an individual module
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAnIndividualModule.ps1 -Gallery $(GalleryName)"'  
+
+- task: PowerShell@2
+  displayName: Clean Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'  
+
+- task: PowerShell@2
+  displayName: Update an individual module
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/UpdateAnIndividualModule.ps1 -Gallery $(GalleryName)"'  
+
+- task: PowerShell@2
+  displayName: Clean Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'  
+
+- task: PowerShell@2
+  displayName: Install Az on top of an individual module
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAzOnTopOfAnIndividualModule.ps1 -Gallery $(GalleryName)"'  
+
+- task: PowerShell@2
+  displayName: Clean Az Modules
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/CleanAzModules.ps1"'  
+
+- task: PowerShell@2
+  displayName: Install an individual module on top of Az
+  inputs:
+    filePath: 'tools/Test/SmokeTest/ScriptsCaller.ps1'
+    arguments: '-RequiredPsVersion $(PSVersion) -Script "./tools/Test/SmokeTest/InstallAnIndividualModuleOnTopOfAz.ps1 -Gallery $(GalleryName)"'

.azure-pipelines/sign-tools.yml

@@ -0,0 +1,75 @@
+trigger: none
+pr: none
+
+pool:
+  vmImage: 'windows-2019'
+
+steps:
+- task: PowerShell@2
+  displayName: 'Install platyPS'
+  inputs:
+    targetType: inline
+    script: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
+
+- task: PowerShell@2
+  displayName: 'Install PowerShellGet [v2.1.3 has a Publish-Module bug]'
+  inputs:
+    targetType: inline
+    script: 'Install-Module PowerShellGet -Force -Confirm:$false -Scope CurrentUser -SkipPublisherCheck'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Build'
+  inputs:
+    command: custom
+    custom: msbuild
+    arguments: 'tools\Az.Tools.Installer\build.proj /t:Build'
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  displayName: 'Signing'
+  inputs:
+    ConnectedServiceName: $(signServiceConnection)
+    FolderPath: artifacts
+    Pattern: |
+     Tools/**/*.ps1
+     Tools/**/*.psd1
+     Tools/**/*.psm1
+     Tools/**/*.ps1xml
+    UseMinimatch: true
+    signConfigType: inlineSignParams
+    inlineOperation: |
+     [
+       {
+         "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"
+       }
+     ]
+
+- task: DotNetCoreCLI@2
+  displayName: Package
+  inputs:
+    command: custom
+    custom: msbuild
+    arguments: 'tools\Az.Tools.Installer\build.proj /t:Package'
+
+- task: PublishPipelineArtifact@0
+  displayName: 'Save artifacts'
+  inputs:
+    artifactName: artifacts
+    targetPath: artifacts
+  condition: succeededOrFailed()

.azure-pipelines/windows-powershell.yml

@@ -57,7 +57,7 @@ jobs:
   displayName: Test
   dependsOn: Build
   condition: succeeded()
-  timeoutInMinutes: 120
+  timeoutInMinutes: 180
   pool:
     vmImage: ${{ variables.WindowsImage }}
 

.github/CODEOWNERS

@@ -1,4 +1,3 @@
 # To make sure Network PRs go to the right branch, e.g. network-april
-/src/Network/    @number213
-
+/src/Network/    @MikhailTryakhov
 /src/Compute/    @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore