Merge remote-tracking branch 'refs/remotes/azure1/release-5.1.0'

Author: sergey-shandar

src/ResourceManager/DataFactories/Commands.DataFactoryV2/IntegrationRuntimes/UpdateAzureDataFactoryIntegrationRuntimeNodeCommand.cs

@@ -16,6 +16,7 @@
 using System.Globalization;
 using System.Management.Automation;
 using System.Security.Permissions;
+using Microsoft.Azure.Commands.DataFactoryV2.Models;
 using Microsoft.Azure.Commands.DataFactoryV2.Properties;
 using Microsoft.Azure.Management.DataFactory.Models;
 
@@ -26,7 +27,7 @@ namespace Microsoft.Azure.Commands.DataFactoryV2
         Constants.IntegrationRuntimeNode,
         DefaultParameterSetName = ParameterSetNames.ByIntegrationRuntimeName,
         SupportsShouldProcess = true),
-     OutputType(typeof (SelfHostedIntegrationRuntimeNode))]
+     OutputType(typeof(PSSelfHostedIntegrationRuntimeNode))]
     public class UpdateAzureDataFactoryIntegrationRuntimeNodeCommand : IntegrationRuntimeContextBaseCmdlet
     {
         [Parameter(
@@ -48,15 +49,23 @@ public override void ExecuteCmdlet()
 
             Action updateIntegrationRuntimeNode = () =>
             {
-                WriteObject(this.DataFactoryClient.UpdateIntegrationRuntimeNodesAsync(
+                var node = this.DataFactoryClient.UpdateIntegrationRuntimeNodesAsync(
                     ResourceGroupName,
                     DataFactoryName,
                     IntegrationRuntimeName,
                     Name,
                     new UpdateIntegrationRuntimeNodeRequest()
                     {
                         ConcurrentJobsLimit = ConcurrentJobsLimit
-                    }).ConfigureAwait(true).GetAwaiter().GetResult());
+                    }).ConfigureAwait(false).GetAwaiter().GetResult();
+
+                WriteObject(new PSSelfHostedIntegrationRuntimeNode(
+                    ResourceGroupName,
+                    DataFactoryName,
+                    IntegrationRuntimeName,
+                    Name,
+                    node,
+                    null));
             };
 
             ConfirmAction(

src/ResourceManager/DataFactories/Commands.DataFactoryV2/help/Update-AzureRmDataFactoryV2IntegrationRuntime.md

@@ -1,5 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.DataFactoryV2.dll-Help.xml
+Module Name: AzureRM.DataFactoryV2
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.datafactories/update-azurermdatafactoryv2integrationruntime
 schema: 2.0.0
 ---

src/ResourceManager/DataFactories/Commands.DataFactoryV2/help/Update-AzureRmDataFactoryV2IntegrationRuntimeNode.md

@@ -1,5 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.DataFactoryV2.dll-Help.xml
+Module Name: AzureRM.DataFactoryV2
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.datafactories/update-azurermdatafactoryv2integrationruntimenode
 schema: 2.0.0
 ---
@@ -212,7 +213,7 @@ Microsoft.Azure.Commands.DataFactoryV2.Models.PSIntegrationRuntime
 
 ## OUTPUTS
 
-### Microsoft.Azure.Management.DataFactory.Models.SelfHostedIntegrationRuntimeNode
+### Microsoft.Azure.Commands.DataFactoryV2.Models.PSSelfHostedIntegrationRuntimeNode
 
 ## NOTES
 Keywords: azure, azurerm, arm, resource, management, manager, data, factories, copy, activities, integration runtime

src/ResourceManager/Websites/Commands.Websites/help/New-AzureRmWebAppSSLBinding.md

@@ -61,21 +61,11 @@ If you upload a new certificate, keep in mind the following requirements for an
 
 ### Example 1: Bind a certificate to a Web App
 ```
-PS C:\>New-AzureRmWebAppSSLBinding -ResourceGroupName "ContosoResourceGroup" -WebAppName "ContosoWebApp" -Thumbprint "E3A38EBA60CAA1C162785A2E1C44A15AD450199C3" -Name "www.contoso.com" -CertificatePassword "p@ssw0rd"
+PS C:\>New-AzureRmWebAppSSLBinding -ResourceGroupName "ContosoResourceGroup" -WebAppName "ContosoWebApp" -Thumbprint "E3A38EBA60CAA1C162785A2E1C44A15AD450199C3" -Name "www.contoso.com"
 ```
 
 This command binds an existing Azure certificate (a certificate with the Thumbprint E3A38EBA60CAA1C162785A2E1C44A15AD450199C3) to the web app named ContosoWebApp.
 
-### Example 2: Upload a certificate and bind it to a Web App
-```
-PS C:\>New-AzureRmWebAppSSLBinding -ResourceGroupName "ContosoResourceGroup" -WebAppName "ContosoWebApp" -Thumbprint "E3A38EBA60CAA1C162785A2E1C44A15AD450199C3" -Name "www.contoso.com" -CertificatePassword "p@ssw0rd" -CertificateFilePath "C:\Certificates\ContosoWebSite.pfx"
-```
-
-Example 2 also binds the certificate E3A38EBA60CAA1C162785A2E1C44A15AD450199C3 to the Web App named ContosoWebApp.
-In this case, however, the certificate has not yet been uploaded to Azure.
-Because of that, the *CertificateFilePath* parameter is used to specify the local copy of the certificate .PFX file.
-This certificate will be uploaded to Azure and then the new SSL bindings will be created.
-
 ## PARAMETERS
 
 ### -CertificateFilePath

tools/PublishModules.ps1

@@ -110,25 +110,6 @@ function Get-TargetModules
     }
 }
 
-function Add-PSM1Dependency
-{
-  [CmdletBinding()]
-  param(
-  [string] $Path)
-
-  PROCESS 
-  {
-    $file = Get-Item -Path $Path
-    $manifestFile = $file.Name
-    $psm1file = $manifestFile -replace ".psd1", ".psm1"
-    if($isNetCore -eq "false") {
-      Update-ModuleManifest -Path $Path -RootModule $psm1file
-    }
-  }
-
-}
-
-
 function Remove-ModuleDependencies
 {
   [CmdletBinding()]
@@ -216,7 +197,6 @@ function Change-RMModule
           Write-Output "Expanding $zipPath"
           Expand-Archive $zipPath -DestinationPath $dirPath
           Write-Output "Adding PSM1 dependency to $unzippedManifest"
-          Add-PSM1Dependency -Path $unzippedManifest
           Write-Output "Removing module manifest dependencies for $unzippedManifest"
           Remove-ModuleDependencies -Path $unzippedManifest
           Remove-Item -Path $zipPath -Force

tools/UpdateModules.ps1

@@ -76,6 +76,24 @@ function Create-ModulePsm1
      Write-Host "Writing psm1 manifest to $templateOutputPath"
      $template | Out-File -FilePath $templateOutputPath -Force
      $file = Get-Item -Path $templateOutputPath
+
+     Add-PSM1Dependency -Path $manifestPath
+  }
+}
+
+function Add-PSM1Dependency
+{
+  [CmdletBinding()]
+  param(
+  [string] $Path)
+
+  PROCESS 
+  {
+    $file = Get-Item -Path $Path
+    $manifestFile = $file.Name
+    $psm1file = $manifestFile -replace ".psd1", ".psm1"
+    Write-Host "here" + $Path
+    Update-ModuleManifest -Path $Path -RootModule $psm1file
   }
 }