Merge branch 'master' into patch-7

Author: cormacpayne

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,5 +14,5 @@
 - [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
-    - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
+    - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
     - [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

CONTRIBUTING.md

@@ -71,7 +71,7 @@ The following guidelines must be followed in **EVERY** pull request that is open
 - There are a [small number of commits](documentation/development-docs/cleaning-up-commits.md) that each have an informative message
 - All files shipped with a module should contain a proper Microsoft license header
 - For public API changes to cmdlets:
-    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr)
+    - a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
     - the markdown help files have been regenerated using the commands listed [here](documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
 
 #### Testing guidelines

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

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
 </Project>

src/Compute/Compute.Test/Compute.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="27.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 -->
 ## Upcoming Release
 * Fixed miscellaneous typos across module
+* Update example in `Invoke-AzVMRunCommand` documentation to use correct parameter name
 * Update `-VolumeType` description in `Set-AzVMDiskEncryptionExtension` and `Set-AzVmssDiskEncryptionExtension` reference documentation
 
 ## Version 2.4.1

src/Compute/Compute/help/Invoke-AzVMRunCommand.md

@@ -40,7 +40,7 @@ Invoke a run command on the VM.
 
 ### Example 1
 ```
-PS C:\> Invoke-AzVMRunCommand -ResourceGroupName 'rgname' -Name 'vmname' -CommandId 'RunPowerShellScript' -ScriptPath 'sample.ps1' -Parameter @{param1 = "var1"; param2 = "var2"}
+PS C:\> Invoke-AzVMRunCommand -ResourceGroupName 'rgname' -VMName 'vmname' -CommandId 'RunPowerShellScript' -ScriptPath 'sample.ps1' -Parameter @{param1 = "var1"; param2 = "var2"}
 ```
 
 Invoke a run command of RunPowerShellScript with overriding the script 'sample.ps1' and the parameters on the VM of 'vmname' in resource group 'rgname'.

src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
   </ItemGroup>
 

src/DataFactory/DataFactoryV2/Changelog.md

@@ -21,8 +21,9 @@
 ## Upcoming Release
 * Fix typo to capitalize "Windows" in 'New-AzDataFactoryEncryptValue" documentation
 * Fixed miscellaneous typos across module
-* Updated ADF .Net SDK version to 4.1.1 
+* Updated ADF .Net SDK version to 4.1.2 
 * Add parameter "DataProxyIntegrationRuntimeName", "DataProxyStagingLinkedServiceName" and "DataProxyStagingPath" for "Set-AzureRmDataFactoryV2IntegrationRuntime" cmd to enable set up Self-Hosted Integration Runtime as a proxy for SSIS Integration Runtime
+* Updated PSTriggerRun to show the triggered pipelines, message and properties, and PSActivityRun to show the activity type
 
 ## Version 1.1.3
 * Updated ADF .Net SDK version to 4.1.0

src/DataFactory/DataFactoryV2/DataFactoryV2.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.1" />
+    <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.2" />
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
   </ItemGroup>
 

src/DataFactory/DataFactoryV2/Models/PSActivityRun.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using Microsoft.Azure.Management.DataFactory.Models;
 
 namespace Microsoft.Azure.Commands.DataFactoryV2.Models
@@ -58,6 +59,14 @@ public string ActivityName
             }
         }
 
+        public string ActivityType
+        {
+            get
+            {
+                return this.activityRun.ActivityType;
+            }
+        }
+
         public string PipelineRunId
         {
             get
@@ -137,5 +146,13 @@ public object Error
                 return this.activityRun.Error;
             }
         }
+
+        public IDictionary<string, object> AdditionalProperties
+        {
+            get
+            {
+                return this.activityRun.AdditionalProperties;
+            }
+        }
     }
 }