Update with latest from release branch and version

cormacpayne · cormacpayne · commit e2a0bd2e2887 · 2018-10-03T16:52:04.000-07:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -12,6 +12,9 @@
 * Added an example of the 'SimpleParameterSet' to New-AzureRmVmss cmdlet help.
 * Fixed a typo in the Azure Disk Encryption progress message
 
+#### AzureRM.DataFactoryV2
+* Updated the ADF .Net SDK version to 2.3.0.
+
 #### AzureRM.Network
 * Added NetworkProfile functionality. new cmdlets added
     - Get-AzureRMNetworkProfile
@@ -29,6 +32,7 @@
 
 #### AzureRM.Resources
 * Add missing -Mode parameter to Set-AzureRmPolicyDefinition
+* Fix Get-AzureRmProviderOperation commandlet bug for operations with Origin containing User
 
 #### AzureRM.Sql
 * Fixed issue where some backup cmdlets would not recognize the current azure subscription
@@ -48,14 +52,14 @@
 #### AzureRM.Profile
 * Minor changes to the storage common code
 * Updated help files to include full parameter types.
-- Changed -ServicePrincipal to non-mandatory in the ServicePrincipalCertificateWithSubscriptionId parameter set 
+- Changed -ServicePrincipal to non-mandatory in the ServicePrincipalCertificateWithSubscriptionId parameter set
 
 #### Azure.Storage
-* Support create Storage Context with OAuth. 
+* Support create Storage Context with OAuth.
 	- New-AzureStorageContext
 
 #### AzureRM.Cdn
-* Added Standard_Microsoft in Cdn pricing sku. 
+* Added Standard_Microsoft in Cdn pricing sku.
 
 #### AzureRM.Compute
 * Move dependencies on Keyvault and Storage to the common dependencies
@@ -166,7 +170,7 @@
 * Add version field to the PSSignalRResource object and connection string to the PSSignalRKeys object.
 
 #### AzureRM.Storage
-* Support Immutability Policy in AzureRm.Storage 
+* Support Immutability Policy in AzureRm.Storage
     - Remove-AzureRmStorageAccountNetworkRule
     - Get-AzureRmStorageContainer
     - Update-AzureRmStorageContainer
@@ -194,7 +198,7 @@
 * Fixed issue https://github.com/Azure/azure-powershell/issues/6603
     - Import-AzureRmApiManagementApi and *-AzureRmApiManagementCertificate cmdlets now handle relative Paths
 * Fixed issue https://github.com/Azure/azure-powershell/issues/6879
-    - The CertificateInformation is a settable property allowing for Set-AzureRmApiManagement cmdlet to work property. Fixed by upgrading to 
+    - The CertificateInformation is a settable property allowing for Set-AzureRmApiManagement cmdlet to work property. Fixed by upgrading to
 	4.0.4-preview nuget
 * Fixed issue https://github.com/Azure/azure-powershell/issues/6853
     - Fixed the Odata filter for Search by Name on Product
@@ -360,7 +364,7 @@
 * Update example for New-AzureRmDisk
 * Add example for 'New-AzureRmVM'
 * Update description for Set-AzureRmVMOSDisk
-* Update Example 1 for Set-AzureRmVMBginfoExtension to correct spelling and prefix. 
+* Update Example 1 for Set-AzureRmVMBginfoExtension to correct spelling and prefix.
 
 #### AzureRM.DataFactoryV2
 * Updated the ADF .Net SDK version to 1.1.0.
diff --git a/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/AzureRM.DataFactoryV2.psd1 b/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/AzureRM.DataFactoryV2.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 8/28/2018
+# Generated on: 10/3/2018
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.5.10'
+ModuleVersion = '0.5.11'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -146,8 +146,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed issue with default resource groups not being set.
-* Updated common runtime assemblies'
+        ReleaseNotes = '* Updated the ADF .Net SDK version to 2.3.0.'
 
         # Prerelease string of this module
         # Prerelease = ''
@@ -159,7 +158,7 @@ PrivateData = @{
         # ExternalModuleDependencies = @()
 
     } # End of PSData hashtable
-    
+
  } # End of PrivateData hashtable
 
 # HelpInfo URI of this module
diff --git a/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Changelog.md b/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Changelog.md
@@ -19,6 +19,8 @@
 -->
 
 ## Current Release
+
+## Version 0.5.11
 * Updated the ADF .Net SDK version to 2.3.0.
 
 ## Version 0.5.10
diff --git a/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Properties/AssemblyInfo.cs b/src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("5d024af0-81c9-44f0-b3b0-7080f103fb4d")]
-[assembly: AssemblyVersion("0.5.10")]
-[assembly: AssemblyFileVersion("0.5.10")]
+[assembly: AssemblyVersion("0.5.11")]
+[assembly: AssemblyFileVersion("0.5.11")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.DataFactoryV2.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureRM.Resources.psd1
@@ -54,8 +54,8 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.6.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll', 
-               '.\Microsoft.Azure.Management.Authorization.dll', 
+RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll',
+               '.\Microsoft.Azure.Management.Authorization.dll',
                '.\Microsoft.Azure.Management.ManagementGroups.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
@@ -65,83 +65,83 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll',
 TypesToProcess = 'Microsoft.Azure.Commands.ResourceManager.Cmdlets.Types.ps1xml'
 
 # Format files (.ps1xml) to be loaded when importing this module
-FormatsToProcess = 
-               '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.generated.format.ps1xml', 
-               '.\Microsoft.Azure.Commands.Resources.format.ps1xml', 
+FormatsToProcess =
+               '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.generated.format.ps1xml',
+               '.\Microsoft.Azure.Commands.Resources.format.ps1xml',
                '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-NestedModules = @('.\Microsoft.Azure.Commands.Resources.dll', 
+NestedModules = @('.\Microsoft.Azure.Commands.Resources.dll',
                '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll')
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmProviderOperation', 'Remove-AzureRmRoleAssignment', 
-               'Get-AzureRmRoleAssignment', 'New-AzureRmRoleAssignment', 
-               'Get-AzureRmRoleDefinition', 'New-AzureRmRoleDefinition', 
-               'Set-AzureRmRoleDefinition', 'Remove-AzureRmRoleDefinition', 
-               'Get-AzureRmADAppCredential', 'Get-AzureRmADApplication', 
-               'Add-AzureRmADGroupMember', 'Get-AzureRmADGroupMember', 
-               'Remove-AzureRmADGroupMember', 'Get-AzureRmADGroup', 
-               'New-AzureRmADGroup', 'Remove-AzureRmADGroup', 
-               'Get-AzureRmADServicePrincipal', 'Get-AzureRmADSpCredential', 
-               'Get-AzureRmADUser', 'New-AzureRmADAppCredential', 
-               'New-AzureRmADSpCredential', 'New-AzureRmADUser', 
-               'Remove-AzureRmADAppCredential', 'Remove-AzureRmADApplication', 
-               'New-AzureRmADApplication', 'Remove-AzureRmADServicePrincipal', 
-               'New-AzureRmADServicePrincipal', 'Remove-AzureRmADSpCredential', 
-               'Remove-AzureRmADUser', 'Update-AzureRmADApplication', 
-               'Update-AzureRmADServicePrincipal', 'Update-AzureRmADUser', 
-               'Remove-AzureRmResourceGroup', 'Get-AzureRmProviderFeature', 
-               'Register-AzureRmProviderFeature', 'Get-AzureRmLocation', 
-               'Export-AzureRmResourceGroup', 'Get-AzureRmResourceProvider', 
-               'Register-AzureRmResourceProvider', 
-               'Unregister-AzureRmResourceProvider', 
-               'Get-AzureRmResourceGroupDeployment', 
-               'New-AzureRmResourceGroupDeployment', 
-               'Remove-AzureRmResourceGroupDeployment', 
-               'Stop-AzureRmResourceGroupDeployment', 
-               'Test-AzureRmResourceGroupDeployment', 'Set-AzureRmResourceGroup', 
-               'New-AzureRmResourceGroup', 'Get-AzureRmResourceGroup', 
-               'Save-AzureRmResourceGroupDeploymentTemplate', 
-               'Get-AzureRmResourceGroupDeploymentOperation', 
-               'Get-AzureRmResourceLock', 'Invoke-AzureRmResourceAction', 
-               'Move-AzureRmResource', 'New-AzureRmResourceLock', 
-               'Get-AzureRmPolicyAssignment', 'Get-AzureRmPolicyDefinition', 
-               'Get-AzureRmPolicySetDefinition', 'New-AzureRmPolicyAssignment', 
-               'New-AzureRmPolicyDefinition', 'New-AzureRmPolicySetDefinition', 
-               'Remove-AzureRmPolicyAssignment', 'Remove-AzureRmPolicyDefinition', 
-               'Remove-AzureRmPolicySetDefinition', 'Set-AzureRmPolicyAssignment', 
-               'Set-AzureRmPolicyDefinition', 'Set-AzureRmPolicySetDefinition', 
-               'Remove-AzureRmResource', 'Remove-AzureRmResourceLock', 
-               'Set-AzureRmResource', 'New-AzureRmResource', 
-               'Set-AzureRmResourceLock', 'Get-AzureRmResource', 
-               'Get-AzureRmManagedApplicationDefinition', 
-               'New-AzureRmManagedApplicationDefinition', 
-               'Set-AzureRmManagedApplicationDefinition', 
-               'Remove-AzureRmManagedApplicationDefinition', 
-               'Get-AzureRmManagedApplication', 'New-AzureRmManagedApplication', 
-               'Set-AzureRmManagedApplication', 'Remove-AzureRmManagedApplication', 
-               'Get-AzureRmManagementGroup', 'New-AzureRmManagementGroup', 
-               'Update-AzureRmManagementGroup', 'Remove-AzureRmManagementGroup', 
-               'New-AzureRmManagementGroupSubscription', 
-               'Remove-AzureRmManagementGroupSubscription', 
-               'New-AzureRmDeployment', 'Get-AzureRmDeployment', 
-               'Test-AzureRmDeployment', 'Remove-AzureRmDeployment', 
-               'Stop-AzureRmDeployment', 'Save-AzureRmDeploymentTemplate', 
+CmdletsToExport = 'Get-AzureRmProviderOperation', 'Remove-AzureRmRoleAssignment',
+               'Get-AzureRmRoleAssignment', 'New-AzureRmRoleAssignment',
+               'Get-AzureRmRoleDefinition', 'New-AzureRmRoleDefinition',
+               'Set-AzureRmRoleDefinition', 'Remove-AzureRmRoleDefinition',
+               'Get-AzureRmADAppCredential', 'Get-AzureRmADApplication',
+               'Add-AzureRmADGroupMember', 'Get-AzureRmADGroupMember',
+               'Remove-AzureRmADGroupMember', 'Get-AzureRmADGroup',
+               'New-AzureRmADGroup', 'Remove-AzureRmADGroup',
+               'Get-AzureRmADServicePrincipal', 'Get-AzureRmADSpCredential',
+               'Get-AzureRmADUser', 'New-AzureRmADAppCredential',
+               'New-AzureRmADSpCredential', 'New-AzureRmADUser',
+               'Remove-AzureRmADAppCredential', 'Remove-AzureRmADApplication',
+               'New-AzureRmADApplication', 'Remove-AzureRmADServicePrincipal',
+               'New-AzureRmADServicePrincipal', 'Remove-AzureRmADSpCredential',
+               'Remove-AzureRmADUser', 'Update-AzureRmADApplication',
+               'Update-AzureRmADServicePrincipal', 'Update-AzureRmADUser',
+               'Remove-AzureRmResourceGroup', 'Get-AzureRmProviderFeature',
+               'Register-AzureRmProviderFeature', 'Get-AzureRmLocation',
+               'Export-AzureRmResourceGroup', 'Get-AzureRmResourceProvider',
+               'Register-AzureRmResourceProvider',
+               'Unregister-AzureRmResourceProvider',
+               'Get-AzureRmResourceGroupDeployment',
+               'New-AzureRmResourceGroupDeployment',
+               'Remove-AzureRmResourceGroupDeployment',
+               'Stop-AzureRmResourceGroupDeployment',
+               'Test-AzureRmResourceGroupDeployment', 'Set-AzureRmResourceGroup',
+               'New-AzureRmResourceGroup', 'Get-AzureRmResourceGroup',
+               'Save-AzureRmResourceGroupDeploymentTemplate',
+               'Get-AzureRmResourceGroupDeploymentOperation',
+               'Get-AzureRmResourceLock', 'Invoke-AzureRmResourceAction',
+               'Move-AzureRmResource', 'New-AzureRmResourceLock',
+               'Get-AzureRmPolicyAssignment', 'Get-AzureRmPolicyDefinition',
+               'Get-AzureRmPolicySetDefinition', 'New-AzureRmPolicyAssignment',
+               'New-AzureRmPolicyDefinition', 'New-AzureRmPolicySetDefinition',
+               'Remove-AzureRmPolicyAssignment', 'Remove-AzureRmPolicyDefinition',
+               'Remove-AzureRmPolicySetDefinition', 'Set-AzureRmPolicyAssignment',
+               'Set-AzureRmPolicyDefinition', 'Set-AzureRmPolicySetDefinition',
+               'Remove-AzureRmResource', 'Remove-AzureRmResourceLock',
+               'Set-AzureRmResource', 'New-AzureRmResource',
+               'Set-AzureRmResourceLock', 'Get-AzureRmResource',
+               'Get-AzureRmManagedApplicationDefinition',
+               'New-AzureRmManagedApplicationDefinition',
+               'Set-AzureRmManagedApplicationDefinition',
+               'Remove-AzureRmManagedApplicationDefinition',
+               'Get-AzureRmManagedApplication', 'New-AzureRmManagedApplication',
+               'Set-AzureRmManagedApplication', 'Remove-AzureRmManagedApplication',
+               'Get-AzureRmManagementGroup', 'New-AzureRmManagementGroup',
+               'Update-AzureRmManagementGroup', 'Remove-AzureRmManagementGroup',
+               'New-AzureRmManagementGroupSubscription',
+               'Remove-AzureRmManagementGroupSubscription',
+               'New-AzureRmDeployment', 'Get-AzureRmDeployment',
+               'Test-AzureRmDeployment', 'Remove-AzureRmDeployment',
+               'Stop-AzureRmDeployment', 'Save-AzureRmDeploymentTemplate',
                'Get-AzureRmDeploymentOperation', 'Get-AzureRmPolicyAlias'
 
 # Variables to export from this module
 # VariablesToExport = @()
 
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
-AliasesToExport = 'Get-AzureRmResourceProviderAction', 
-               'Get-AzureRmADServicePrincipalCredential', 
-               'New-AzureRmADServicePrincipalCredential', 
-               'Remove-AzureRmADServicePrincipalCredential', 
-               'Set-AzureRmADApplication', 'Set-AzureRmADServicePrincipal', 
+AliasesToExport = 'Get-AzureRmResourceProviderAction',
+               'Get-AzureRmADServicePrincipalCredential',
+               'New-AzureRmADServicePrincipalCredential',
+               'Remove-AzureRmADServicePrincipalCredential',
+               'Set-AzureRmADApplication', 'Set-AzureRmADServicePrincipal',
                'Set-AzureRmADUser'
 
 # DSC resources to export from this module
@@ -171,7 +171,8 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add missing -Mode parameter to Set-AzureRmPolicyDefinition'
+        ReleaseNotes = '* Add missing -Mode parameter to Set-AzureRmPolicyDefinition
+* Fix Get-AzureRmProviderOperation commandlet bug for operations with Origin containing User'
 
         # Prerelease string of this module
         # Prerelease = ''
diff --git a/tools/AzureRM/AzureRM.psd1 b/tools/AzureRM/AzureRM.psd1
diff --git a/tools/Tools.Common/SerializedCmdlets/Microsoft.Azure.Commands.DataFactoryV2.dll.json b/tools/Tools.Common/SerializedCmdlets/Microsoft.Azure.Commands.DataFactoryV2.dll.json
