Resolved conflicts

.azure-pipelines/powershell-core.yml

@@ -9,6 +9,9 @@ variables:
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true
+  IsGenerateBased: $[eq(variables['system.pullRequest.targetBranch'], 'generation')]
+  BuildTimeoutInMinutes: 120
+  AnalysisTimeoutInMinutes: 120
 
 trigger: none
 
@@ -23,6 +26,7 @@ jobs:
 - job: Build
   displayName: Build
   condition: succeeded()
+  timeoutInMinutes: ${{ variables.BuildTimeoutInMinutes }}
   strategy:
     matrix:
       windows:
@@ -31,8 +35,8 @@ jobs:
       linux:
         OSName: ${{ variables.LinuxName }}
         ImageName: ${{ variables.LinuxImage }}
-      macOS:	
-        OSName: ${{ variables.MacOSName }}	
+      macOS:
+        OSName: ${{ variables.MacOSName }}
         ImageName: ${{ variables.MacOSImage }}
   pool:
     vmImage: $(ImageName)
@@ -48,7 +52,7 @@ jobs:
   displayName: Analyze
   dependsOn: Build
   condition: succeeded()
-  timeoutInMinutes: 90
+  timeoutInMinutes: ${{ variables.AnalysisTimeoutInMinutes }}
   strategy:
     matrix:
       windows:

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

@@ -6,6 +6,21 @@ steps:
 - template: download-build-steps.yml
   parameters:
     osName: ${{ parameters.osName }}
+- task: NodeTool@0
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Install autorest
+  inputs:
+    versionSpec: '14.17.1'
+    command: custom
+    verbose: false
+    customCommand: install autorest@latest
+- task: PowerShell@2
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Setup environment for autorest
+  inputs:
+    targetType: inline
+    script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
+    pwsh: true
 
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk'

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

@@ -4,6 +4,21 @@ parameters:
   configuration: ''
 
 steps:
+- task: NodeTool@0
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Install autorest
+  inputs:
+    versionSpec: '14.17.1'
+    command: custom
+    verbose: false
+    customCommand: install autorest@latest
+- task: PowerShell@2
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Setup environment for autorest
+  inputs:
+    targetType: inline
+    script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
+    pwsh: true
 - task: PowerShell@2
   displayName: 'Check Ingored File'
   inputs:

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

@@ -8,6 +8,21 @@ steps:
 - template: download-build-steps.yml
   parameters:
     osName: ${{ parameters.osName }}
+- task: NodeTool@0
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Install autorest
+  inputs:
+    versionSpec: '14.17.1'
+    command: custom
+    verbose: false
+    customCommand: install autorest@latest
+- task: PowerShell@2
+  condition: eq(variables.IsGenerateBased, true)
+  displayName: Setup environment for autorest
+  inputs:
+    targetType: inline
+    script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
+    pwsh: true
 
 - task: UseDotNet@2
   displayName: 'Use .NET Core sdk'

.azure-pipelines/windows-powershell.yml

@@ -5,6 +5,7 @@ variables:
   TestTarget: Test
   Configuration: Debug
   DebugLocalBuildTasks: true
+  IsGenerateBased: $[eq(variables['system.pullRequest.targetBranch'], 'generation')]
 
 trigger: none
 
@@ -18,7 +19,7 @@ pr:
 jobs:
 - job: Build
   displayName: Build
-  condition: succeeded()
+  condition: and(eq(variables.IsGenerateBased, false), succeeded())
   pool:
     vmImage: ${{ variables.WindowsImage }}
 
@@ -35,7 +36,7 @@ jobs:
 - job: Analyze
   displayName: Analyze
   dependsOn: Build
-  condition: succeeded()
+  condition: and(eq(variables.IsGenerateBased, false), succeeded())
   timeoutInMinutes: 90
   pool:
     vmImage: ${{ variables.WindowsImage }}
@@ -66,7 +67,7 @@ jobs:
 - job: Test
   displayName: Test
   dependsOn: Build
-  condition: succeeded()
+  condition: and(eq(variables.IsGenerateBased, false), succeeded())
   timeoutInMinutes: 180
   pool:
     vmImage: ${{ variables.WindowsImage }}

src/ApiManagement/ApiManagement/help/Set-AzApiManagement.md

@@ -36,7 +36,7 @@ This example gets an Api Management instance, scales it to five premium units an
 
 ### Example 2: Update deployment (external VNET)
 ```powershell
-PS C:\> $virtualNetwork = New-AzApiManagementVirtualNetwork -Location "East US" -SubnetResourceId "/subscriptions/a8ff56dc-3bc7-4174-a1e8-3726ab15d0e2/resourceGroups/Api-Default-WestUS/providers/Microsoft.Network/virtualNetworks/dfVirtualNetwork/subnets/backendSubnet"
+PS C:\> $virtualNetwork = New-AzApiManagementVirtualNetwork -SubnetResourceId "/subscriptions/a8ff56dc-3bc7-4174-a1e8-3726ab15d0e2/resourceGroups/Api-Default-WestUS/providers/Microsoft.Network/virtualNetworks/dfVirtualNetwork/subnets/backendSubnet"
 PS C:\> $apim = Get-AzApiManagement -ResourceGroupName "ContosoGroup" -Name "ContosoApi"
 PS C:\> $apim.VpnType = "External"
 PS C:\> $apim.VirtualNetwork = $virtualNetwork

src/Automation/Automation/help/New-AzAutomationSchedule.md

@@ -91,7 +91,7 @@ The final command creates a daily schedule named Schedule02 to begin at the time
 ```
 PS C:\> $StartTime = (Get-Date "13:00:00").AddDays(1)
 PS C:\> [System.DayOfWeek[]]$WeekDays = @([System.DayOfWeek]::Monday..[System.DayOfWeek]::Friday)
-PS C:\> New-AzAutomationSchedule -AutomationAccountName "Contoso17" -Name "Schedule03" -StartTime $StartTime - WeekInterval 1 -DaysOfWeek $WeekDays -ResourceGroupName "ResourceGroup01"
+PS C:\> New-AzAutomationSchedule -AutomationAccountName "Contoso17" -Name "Schedule03" -StartTime $StartTime -WeekInterval 1 -DaysOfWeek $WeekDays -ResourceGroupName "ResourceGroup01"
 ```
 
 The first command creates a date object by using the **Get-Date** cmdlet, and then stores the object in the $StartDate variable.

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>CognitiveServices</PsModuleName>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.4.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="8.0.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
   </ItemGroup>
 

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

@@ -42,13 +42,6 @@ public void TestNewAccount()
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccount");
         }
 
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestNewAccountWithInvalidName()
-        {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountInvalidName");
-        }
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestNewAccountWithCustomDomain()
@@ -63,13 +56,6 @@ public void TestNewAccountWithVnet()
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmCognitiveServicesAccountWithVnet");
         }
 
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestCreateAllKindsOfAccounts()
-        {
-            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-NewAzureRmAllKindsOfCognitiveServicesAccounts");
-        }
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRemoveAccount()
@@ -192,6 +178,13 @@ public void TestManagedIdentity()
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ManagedIdentity");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestUserAssignedIdentity()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-UserAssignedIdentity");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEncryption()
@@ -220,6 +213,20 @@ public void TestPublicNetworkAccess()
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-PublicNetworkAccess");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRestrictOutboundNetworkAccess()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-RestrictOutboundNetworkAccess");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDisableLocalAuth()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-DisableLocalAuth");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCapabilities()
@@ -233,5 +240,12 @@ public void TestApiProperties()
         {
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-ApiProperties");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSoftDelete()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-SoftDelete");
+        }
     }
 }