Merge pull request #342 from microsoftgraph/po/0.9.1BugFixes

0.9.1 bug fixes

Author: peombwa

src/Financials/Financials/readme.md

@@ -32,9 +32,32 @@ title: $(service-name)
 subject-prefix: ''
 
 ```
+
+### Directives
+
+> see https://github.com/Azure/autorest/blob/master/docs/powershell/directives.md
+
+``` yaml
+directive:
+# Modify generated .dictionary.cs model classes in Financials module.
+  - from: source-file-csharp
+    where: $
+    transform: >
+      if (!$documentPath.match(/generated%5Capi%5CModels%5CMicrosoftGraph\w*\d*.dictionary.cs/gm))
+      {
+        return $;
+      } else {
+        // Rename additionalProperties indexer name in Financials module from Item to EntityItem to avoid property name conflict. salesOrderLine has a property named item.
+        // See https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/indexers/using-indexers
+        let indexerRegex = /(^\s*)(public\s*global::System.Object this\[global::System.String index\]\s*{\W.*}$)/gm
+        $ = $.replace(indexerRegex, '$1[System.Runtime.CompilerServices.IndexerName("EntityItem")]\n$1$2');
+        return $;
+      }
+```
+
 ### Versioning
 
 ``` yaml
-module-version: 0.9.0
+module-version: 0.9.2
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```

src/Identity.Organization/Identity.Organization/readme.md

@@ -44,6 +44,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 0.9.0
+module-version: 0.9.2
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```

src/Teams.Team/Teams.Team/readme.md

@@ -45,6 +45,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 0.9.0
+module-version: 0.9.2
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```

src/readme.graph.md

@@ -361,20 +361,26 @@ directive:
       subject: (Application|ServicePrincipal)SynchronizationJobCredentials
       variant: Validate1|ValidateExpanded1|ValidateViaIdentity1|ValidateViaIdentityExpanded1
     remove: true
-# Add AfterToJson
+# Modify generated .json.cs model classes.
   - from: source-file-csharp
     where: $
     transform: >
       if (!$documentPath.match(/generated%5Capi%5CModels%5CMicrosoftGraph\w*\d*.json.cs/gm))
       {
         return $;
       } else {
+        // Add AfterToJson
         let afterJsonDeclarationRegex = /(^\s*)(partial\s*void\s*AfterFromJson\s*\(Microsoft.Graph.PowerShell.Runtime.Json.JsonObject\s*json\s*\);$)/gm
         $ = $.replace(afterJsonDeclarationRegex, '$1$2\n$1partial void AfterToJson(ref Microsoft.Graph.PowerShell.Runtime.Json.JsonObject container, Microsoft.Graph.PowerShell.Runtime.SerializationMode serializationMode);\n');
         let afterJsonRegex = /(^\s*)(AfterToJson\(ref\s*container\s*\);$)/gm
         $ = $.replace(afterJsonRegex, '$1$2\n$1AfterToJson(ref container, serializationMode);\n');
+
+        // Pass exclusion properties to base classes during serialization.
+        let baseClassInitializerRegex = /(new\s*Microsoft.Graph.PowerShell.Models.MicrosoftGraph\w*\(\s*json\s*,\s*new\s*global::System.Collections.Generic.HashSet<string>\()(\){\W.*}\);)/gm
+        $ = $.replace(baseClassInitializerRegex, '$1(exclusions ?? new System.Collections.Generic.HashSet<string>())$2');
         return $;
       }
+# Modify generated .cs model classes.
   - from: source-file-csharp
     where: $
     transform: >
@@ -388,6 +394,24 @@ directive:
           $ = $.replace(valuesPropertiesRegex, '$1$2 new $3');
         }
 
+        // Add new modifier to 'additionalProperties' properties of classes that derive from an IAssociativeArray. See example https://regex101.com/r/hnX7xO/2.
+        let additionalPropertiesRegex = /(SerializedName\s*=\s*@"additionalProperties".*\s*.*)(\s*)(.*AdditionalProperties\s*{\s*get;\s*set;\s*})/gmi
+        if($.match(additionalPropertiesRegex)) {
+          $ = $.replace(additionalPropertiesRegex, '$1$2 new $3');
+        }
+
+        // Add new modifier to 'keys' properties of classes that derive from an IAssociativeArray. See example https://regex101.com/r/hnX7xO/2.
+        let keysRegex = /(SerializedName\s*=\s*@"keys".*\s*.*)(\s*)(.*Keys\s*{\s*get;\s*set;\s*})/gmi
+        if($.match(keysRegex)) {
+          $ = $.replace(keysRegex, '$1$2 new $3');
+        }
+
+        // Add new modifier to 'count' properties of classes that derive from an IAssociativeArray. See example https://regex101.com/r/hnX7xO/2.
+        let countRegex = /(SerializedName\s*=\s*@"count".*\s*.*)(\s*)(.*Count\s*{\s*get;\s*set;\s*})/gmi
+        if($.match(countRegex)) {
+          $ = $.replace(countRegex, '$1$2 new $3');
+        }
+
         let regexPattern = /^\s*public\s*partial\s*class\s*MicrosoftGraph(?<EntityName>.*):$/gm;
         let regexArray;
         while ((regexArray = regexPattern.exec($)) !== null) {
@@ -404,29 +428,36 @@ directive:
         }
         return $;
       }
-# Override OnDefault to handle all success, 2xx responses, as success and not error.
+# Modify generated .cs cmdlets.
   - from: source-file-csharp
     where: $
     transform: >
       if (!$documentPath.match(/generated%2Fcmdlets%2F\w*\d*.cs/gm))
       {
         return $;
       } else {
+        // Initialize AdditionalProperties prop to a new Hashtable by default.
+        let additionalPropertiesPropRegex = /System.Collections.Hashtable\s*AdditionalProperties\s*{\s*get;\s*set;\s*}$/gmi
+        let newAdditionalPropertiesProp = "System.Collections.Hashtable AdditionalProperties { get; set; } = new System.Collections.Hashtable();"
+        $ = $.replace(additionalPropertiesPropRegex, newAdditionalPropertiesProp);
+
+        // Override OnDefault to handle all success, 2xx responses, as success and not error.
         let overrideOnDefaultRegex = /(\s*)(partial\s*void\s*overrideOnDefault)/gmi
         let overrideOnDefaultImplementation = "$1partial void overrideOnDefault(global::System.Net.Http.HttpResponseMessage responseMessage, global::System.Threading.Tasks.Task<Microsoft.Graph.PowerShell.Models.IOdataError> response, ref global::System.Threading.Tasks.Task<bool> returnNow) => this.OverrideOnDefault(responseMessage,ref returnNow);$1$2"
         $ = $.replace(overrideOnDefaultRegex, overrideOnDefaultImplementation);
 
         return $;
       }
 
-# Add custom -PageSize parameter to *_List cmdlets that support Odata next link.
+# Modify generated .cs list cmdlets.
   - from: source-file-csharp
     where: $
     transform: >
       if (!$documentPath.match(/generated%2Fcmdlets%2FGet\w*_List\d*.cs/gm))
       {
         return $;
       } else {
+        // Add custom -PageSize parameter to *_List cmdlets that support Odata next link.
         let odataNextLinkRegex = /(^\s*)(if\s*\(\s*result.OdataNextLink\s*!=\s*null\s*\))/gmi
         if($.match(odataNextLinkRegex)) {
           $ = $.replace(odataNextLinkRegex, '$1if (result.OdataNextLink != null && this.ShouldIteratePages(this.InvocationInformation.BoundParameters, result.Value.Length))\n$1');
@@ -442,4 +473,21 @@ directive:
         }
         return $;
       }
+
+# Modify generated runtime TypeConverterExtensions class.
+  - from: source-file-csharp
+    where: $
+    transform: >
+      if (!$documentPath.match(/generated%5Cruntime%5CTypeConverterExtensions.cs/gm))
+      {
+        return $;
+      } else {
+        // Use a case-insensitive contains search.
+        let keyValueContainsRegex = /(exclusions|inclusions)(\?.Contains\(key\?.ToString\(\))(\)\))/gm
+        $ = $.replace(keyValueContainsRegex, '$1$2, System.StringComparer.OrdinalIgnoreCase$3');
+
+        let propertyContainsRegex = /(exclusions|inclusions)(\?.Contains\(property.Name)(\)\))/gm
+        $ = $.replace(propertyContainsRegex, '$1$2, System.StringComparer.OrdinalIgnoreCase$3');
+        return $;
+      }
 ```

tools/Custom/ListCmdlet.cs

@@ -98,9 +98,12 @@ public void InitializePaging(ref global::System.Management.Automation.Invocation
             {
                 currentPageSize = limit;
             }
-            // Explicitly set `-Top` parameter to currentPageSize in order for the generated cmdlets to construct a URL with a `$top` query parameter.
-            invocationInfo.BoundParameters["Top"] = currentPageSize;
-            top = currentPageSize;
+
+            if (invocationInfo.BoundParameters.ContainsKey("PageSize") || invocationInfo.BoundParameters.ContainsKey("Top") || invocationInfo.BoundParameters.ContainsKey("All")){
+                // Explicitly set `-Top` parameter to currentPageSize in order for the generated cmdlets to construct a URL with a `$top` query parameter.
+                invocationInfo.BoundParameters["Top"] = currentPageSize;
+                top = currentPageSize;
+            }
 
             if (limit != default)
             {

tools/Custom/Module.cs

@@ -56,19 +56,25 @@ partial void CustomInit()
         /// </returns>
         public async Task EventHandler(string id, CancellationToken cancellationToken, Func<EventArgs> getEventData, Func<string, CancellationToken, Func<EventArgs>, Task> signal, InvocationInfo invocationInfo, string parameterSetName, System.Exception exception)
         {
-            switch (id)
+            if (invocationInfo.BoundParameters.ContainsKey("Debug"))
             {
-                case Events.Finally:
-                    await Finally(id, cancellationToken, getEventData, signal);
-                    break;
-                default:
-                    getEventData.Print(signal, cancellationToken, Events.Information, id);
-                    break;
+                switch (id)
+                {
+                    case Events.BeforeCall:
+                        await BeforeCall(id, cancellationToken, getEventData, signal);
+                        break;
+                    case Events.Finally:
+                        await Finally(id, cancellationToken, getEventData, signal);
+                        break;
+                    default:
+                        getEventData.Print(signal, cancellationToken, Events.Information, id);
+                        break;
+                }
             }
         }
 
         /// <summary>
-        /// Handles the Finally event, which is called just before Request and Response are disposed.
+        /// Handles the Finally event, which is called just after a response is received.
         /// </summary>
         /// <param name="id">The ID of the event</param>
         /// <param name="cancellationToken">The cancellation token for the event</param>
@@ -82,15 +88,35 @@ private async Task Finally(string id, CancellationToken cancellationToken, Func<
             using (Extensions.NoSynchronizationContext)
             {
                 var eventData = EventDataConverter.ConvertFrom(getEventData());
-                using (var requestFormatter = new HttpMessageFormatter(eventData.RequestMessage as HttpRequestMessage))
                 using (var responseFormatter = new HttpMessageFormatter(eventData.ResponseMessage as HttpResponseMessage))
                 {
-                    var requestString = await requestFormatter.ReadAsStringAsync();
                     var responseString = await responseFormatter.ReadAsStringAsync();
-                    await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(requestString));
                     await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(responseString));
                 }
             }
         }
+
+        /// <summary>
+        /// Handles the BeforeCall event, which is called just before Request is sent.
+        /// </summary>
+        /// <param name="id">The ID of the event</param>
+        /// <param name="cancellationToken">The cancellation token for the event</param>
+        /// <param name="getEventData">A delegate to get the detailed event data</param>
+        /// <param name="signal">The callback for the event dispatcher</param>
+        /// <returns>
+        /// A <see cref="global::System.Threading.Tasks.Task" /> that will be complete when handling of the event is completed.
+        /// </returns>
+        private async Task BeforeCall(string id, CancellationToken cancellationToken, Func<EventArgs> getEventData, Func<string, CancellationToken, Func<EventArgs>, Task> signal)
+        {
+            using (Extensions.NoSynchronizationContext)
+            {
+                var eventData = EventDataConverter.ConvertFrom(getEventData());
+                using (var requestFormatter = new HttpMessageFormatter(eventData.RequestMessage as HttpRequestMessage))
+                {
+                    var requestString = await requestFormatter.ReadAsStringAsync();
+                    await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(requestString));
+                }
+            }
+        }
     }
 }

tools/GenerateModules.ps1

@@ -136,6 +136,15 @@ $ModuleMapping.Keys | ForEach-Object -Begin { $RequestCount = 0 } -End { Write-H
                     }
                 } | Set-Content $ModulePsm1
 
+                # Address AutoREST bug where it looks for exports in the wrong directory.
+                $InternalModulePsm1 = Join-Path $ModuleProjectDir "/internal/$ModulePrefix.$ModuleName.internal.psm1"
+                (Get-Content -Path $InternalModulePsm1) | ForEach-Object{
+                    $_
+                    if ($_ -match '\$exportsPath = \$PSScriptRoot') {
+                        '  $exportsPath = Join-Path $PSScriptRoot "../exports"'
+                    }
+                } | Set-Content $InternalModulePsm1
+                
                 if ($LASTEXITCODE) {
                     Write-Error "Failed to build '$ModuleName' module."
                 }