Merge branch 'dev' into po/modulesUpdate

Author: peombwa

src/Authentication/Authentication/Microsoft.Graph.Authentication.csproj

@@ -21,10 +21,14 @@
     <PreLoadAssemblies Include="$(RepoTools)lib\System.Security.Cryptography.ProtectedData.dll" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.3" />
-    <PackageReference Include="Microsoft.Graph.Core" Version="1.19.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.8.0" />
+    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
+    <PackageReference Include="Microsoft.Graph.Core" Version="1.20.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.8.2" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="5.6.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="5.6.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.6.0" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
   </ItemGroup>

src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec

@@ -20,11 +20,17 @@
     <file src="Microsoft.Graph.Authentication.format.ps1xml" />
     <file src="Microsoft.Graph.Authentication.psm1" />
     <!-- https://github.com/NuGet/Home/issues/3584 -->
+    
     <file src="bin/Microsoft.Graph.Authentication.dll" target="bin" />
     <file src="bin/Microsoft.Graph.Authentication.deps.json" target="bin" />
     <file src="bin/Microsoft.Graph.Auth.dll" target="bin" />
     <file src="bin/Microsoft.Graph.Core.dll" target="bin" />
     <file src="bin/Microsoft.Identity.Client.dll" target="bin" />
+    <file src="bin/System.IdentityModel.Tokens.Jwt.dll" target="bin" />
+    <file src="bin/Newtonsoft.Json.dll" target="bin" />
+    <file src="bin/Microsoft.IdentityModel.JsonWebTokens.dll" target="bin" />
+    <file src="bin/Microsoft.IdentityModel.Tokens.dll" target="bin" />
+    <file src="bin/Microsoft.IdentityModel.Logging.dll" target="bin" />
     <file src="bin/PreloadAssemblies/System.Security.Cryptography.ProtectedData.dll" target="bin/PreloadAssemblies" />
   </files>
 </package>

src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft
 #
-# Generated on: 2/10/2020
+# Generated on: 3/4/2020
 #
 
 @{
@@ -45,7 +45,7 @@ PowerShellVersion = '5.1'
 DotNetFrameworkVersion = '4.7.2'
 
 # Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# CLRVersion = ''
+# ClrVersion = ''
 
 # Processor architecture (None, X86, Amd64) required by this module
 # ProcessorArchitecture = ''

src/readme.graph.md

@@ -27,6 +27,7 @@ prefix: Mg
 module-name: Microsoft.Graph.$(service-name)
 subject-prefix: $(service-name)
 namespace: Microsoft.Graph.PowerShell
+sanitize-names: false
 ```
 
 > Folders
@@ -51,7 +52,9 @@ directive:
     - microsoft.graph.post
     - microsoft.graph.sectionGroup
     - microsoft.graph.team
-  # Formart cmdlet response.
+    - microsoft.graph.recipient
+
+  # Format cmdlet response.
   - where:
       model-name: MicrosoftGraphUser
     set:
@@ -289,4 +292,41 @@ directive:
     set:
       verb: Get
       subject: $2$1
+# Add AfterToJson
+  - from: source-file-csharp
+    where: $
+    transform: >
+      if (!$documentPath.match(/generated%5Capi%5CModels%5CMicrosoftGraph\w*.json.cs/gm))
+      {
+        return $;
+      } else {
+        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');
+        return $;
+      }
+  - from: source-file-csharp
+    where: $
+    transform: >
+      if (!$documentPath.match(/generated%5Capi%5CModels%5CMicrosoftGraph\w*.cs/gm))
+      {
+        return $;
+      } else {
+        let regexPattern = /^\s*public\s*partial\s*class\s*MicrosoftGraph(?<EntityName>.*):$/gm;
+        let regexArray;
+        while ((regexArray = regexPattern.exec($)) !== null) {
+          if (regexArray['groups'] != null)
+          {
+            let EntityName = regexArray['groups'].EntityName.trim();
+            let newEntityId = EntityName + 'Id';
+            let newEntityIdPropRegex = new RegExp("^\\s*public\\s*string\\s*"+newEntityId+"\\.*","gm");
+            let existingIdPropRegex = /(^\s*)(public\s*string\s*Id\s.*)/gm;
+            if ((!$.match(newEntityIdPropRegex)) && $.match(existingIdPropRegex) && (newEntityId != "EntityId") && (newEntityId != "BaseItemId")) {
+              $ = $.replace(existingIdPropRegex, '$1$2\n\n$1partial void AfterToJson(ref Microsoft.Graph.PowerShell.Runtime.Json.JsonObject container, Microsoft.Graph.PowerShell.Runtime.SerializationMode serializationMode)\n$1{\n$1\tif (serializationMode == Microsoft.Graph.PowerShell.Runtime.SerializationMode.IncludeAll) {\n$1\t\tAddIf(null != this.Id ? (Microsoft.Graph.PowerShell.Runtime.Json.JsonNode)new Microsoft.Graph.PowerShell.Runtime.Json.JsonString(this.Id) : null, "'+ EntityName.toLowerCase() +'-id", container.Add);\n$1\t}\n$1}');
+            }
+          }
+        }
+        return $;
+      }
 ```

tools/GenerateModules.ps1

@@ -128,6 +128,10 @@ $ModuleMapping.Keys | ForEach-Object {
                 else {
                     & $BuildModulePS1 -Module $ModuleName -ModulePrefix $ModulePrefix -GraphVersion $GraphVersion -ModuleVersion $ModuleVersion -ModulePreviewNumber $ModulePreviewNumber -RequiredModules $AuthenticationModule -ReleaseNotes $ModuleReleaseNotes
                 }
+
+                if ($LASTEXITCODE) {
+                    Write-Error "Failed to build '$ModuleName' module."
+                }
             }
 
             if ($Pack) {