Merge branch 'master' into updateac

Author: Maddie Clayton

src/EventGrid/EventGrid/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated the help text for endpoint to indicate that resources should be created before using the create/update event subscription cmdlets.
 
 ## Version 1.1.0
 * Updated to use the 2019-01-01 API version.

src/EventGrid/EventGrid/Utilities/EventGridConstants.cs

@@ -31,7 +31,8 @@ class EventGridConstants
         public const string LabelsHelp = "Labels for the event subscription.";
         public const string EndpointTypeHelp = "Endpoint Type. This can be webhook, eventhub, storagequeue, or hybridconnection. Default value is webhook.";
         public const string EndpointHelp = "Event subscription destination endpoint. This can be a webhook URL, or the Azure resource ID of an EventHub, storage queue or hybridconnection. For example, the resource ID for a hybrid connection " +
-                                           "takes the following form: /subscriptions/[Azure Subscription ID]/resourceGroups/[ResourceGroupName]/providers/Microsoft.Relay/namespaces/[NamespaceName]/hybridConnections/[HybridConnectionName].";
+                                           "takes the following form: /subscriptions/[Azure Subscription ID]/resourceGroups/[ResourceGroupName]/providers/Microsoft.Relay/namespaces/[NamespaceName]/hybridConnections/[HybridConnectionName]. It is expected that " +
+                                           "the destination endpoint to be created and available for use before executing any Event Grid cmdlets.";
         public const string ResourceGroupNameHelp = "The name of the resource group.";
         public const string TopicNameHelp = "EventGrid topic name.";
         public const string TopicTypeNameHelp = "EventGrid topic type name.";

src/EventGrid/EventGrid/help/New-AzEventGridSubscription.md

@@ -147,7 +147,8 @@ Accept wildcard characters: False
 
 ### -Endpoint
 Event subscription destination endpoint.
-This can be a webhook URL or the Azure resource ID of an EventHub.
+This can be a webhook URL, or the Azure resource ID of an EventHub, storage queue or hybridconnection. For example, the resource ID for a hybrid connection takes the following form: /subscriptions/[Azure Subscription ID]/resourceGroups/[ResourceGroupName]/providers/Microsoft.Relay/namespaces/[NamespaceName]/hybridConnections/[HybridConnectionName]. It is expected that the destination endpoint to be created and available for use before executing any Event Grid cmdlets.
+
 
 ```yaml
 Type: System.String
@@ -175,7 +176,8 @@ Accept wildcard characters: False
 
 ### -EndpointType
 Endpoint Type.
-This can be webhook or eventhub
+This can be webhook, eventhub, storagequeue, or hybridconnection. Default value is webhook.
+
 
 ```yaml
 Type: System.String

src/EventGrid/EventGrid/help/Update-AzEventGridSubscription.md

@@ -115,7 +115,8 @@ Accept wildcard characters: False
 
 ### -Endpoint
 Event subscription destination endpoint.
-This can be a webhook URL or the Azure resource ID of an EventHub.
+This can be a webhook URL, or the Azure resource ID of an EventHub, storage queue or hybridconnection. For example, the resource ID for a hybrid connection takes the following form: /subscriptions/[Azure Subscription ID]/resourceGroups/[ResourceGroupName]/providers/Microsoft.Relay/namespaces/[NamespaceName]/hybridConnections/[HybridConnectionName]. It is expected that the destination endpoint to be created and available for use before executing any Event Grid cmdlets.
+
 
 ```yaml
 Type: System.String
@@ -131,7 +132,7 @@ Accept wildcard characters: False
 
 ### -EndpointType
 Endpoint Type.
-This can be webhook or eventhub
+This can be webhook, eventhub, storagequeue, or hybridconnection. Default value is webhook.
 
 ```yaml
 Type: System.String

src/GuestConfiguration/GuestConfiguration/Az.GuestConfiguration.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.10.4'
+ModuleVersion = '0.10.5'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -107,7 +107,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fix cmdlets failure when an initiative definition in subscription does not have category set.'
+        ReleaseNotes = '- Fixed cmdlets failure when a subscription has an incorrect format initiative definition for GuestConfiguration category.'
 
         # Prerelease string of this module
         # Prerelease = ''

src/GuestConfiguration/GuestConfiguration/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+## Version 0.10.5
 - Fixed cmdlets failure when a subscription has an incorrect format initiative definition for GuestConfiguration category.
 
 ## Version 0.10.4

src/GuestConfiguration/GuestConfiguration/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d28548d3-2673-4508-a28b-a69e0470faf7")]
 
-[assembly: AssemblyVersion("0.10.4")]
-[assembly: AssemblyFileVersion("0.10.4")]
+[assembly: AssemblyVersion("0.10.5")]
+[assembly: AssemblyFileVersion("0.10.5")]