Fix parameter set issue with -ODataQuery in Get-AzResource

Author: cormacpayne

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs

@@ -78,6 +78,7 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
         /// </summary>
         [Parameter(ParameterSetName = ByTagObjectParameterSet, Mandatory = false)]
         [Parameter(ParameterSetName = ByTagNameValueParameterSet, Mandatory = false)]
+        [Parameter(ParameterSetName = ByResourceIdParameterSet, Mandatory = false)]
         [ValidateNotNullOrEmpty]
         public string ODataQuery { get; set; }
 

src/ResourceManager/Resources/Commands.Resources/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix parameter set issue when providing `-ODataQuery` and `-ResourceId` parameters for `Get-AzResource`
+    - More information here: https://github.com/Azure/azure-powershell/issues/7875
 
 ## Version 1.0.0
 * General availability of `Az.Resources` module

src/ResourceManager/Resources/Commands.Resources/help/Get-AzResource.md

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.ResourceManager.dll-Help.xml
 Module Name: Az.Resources
 ms.assetid: C2C608E5-3351-4D01-8533-9668B2E9F1D1
@@ -23,7 +23,7 @@ Get-AzResource [-Name <String>] [-ResourceType <String>] [-ODataQuery <String>]
 
 ### ByResourceId
 ```
-Get-AzResource -ResourceId <String> [-ExpandProperties] [-ApiVersion <String>] [-Pre]
+Get-AzResource -ResourceId <String> [-ODataQuery <String>] [-ExpandProperties] [-ApiVersion <String>] [-Pre]
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
@@ -211,7 +211,7 @@ Accept wildcard characters: False
 
 ```yaml
 Type: System.String
-Parameter Sets: ByTagNameValueParameterSet, ByTagObjectParameterSet
+Parameter Sets: (All)
 Aliases:
 
 Required: False