Merge pull request #536 from microsoftgraph/dev

peombwa · web-flow · commit 4c564678989e · 2021-01-29T15:54:44.000-08:00
Sync master with dev
diff --git a/.azure-pipelines/generate-modules-template.yml b/.azure-pipelines/generate-modules-template.yml
@@ -46,6 +46,7 @@ jobs:
   - task: PowerShell@2
     displayName: 'Generate Profiles'
     continueOnError: false
+    enabled: false
     inputs:
       targetType: 'filePath'
       pwsh: true
diff --git a/config/ModuleMetadata.json b/config/ModuleMetadata.json
@@ -22,5 +22,5 @@
   ],
   "releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",
   "assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",
-  "version": "1.3.0"
+  "version": "1.3.1"
 }
diff --git a/src/Applications/Applications/readme.md b/src/Applications/Applications/readme.md
@@ -81,6 +81,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Authentication/Authentication/Helpers/ContentHelper.cs b/src/Authentication/Authentication/Helpers/ContentHelper.cs
@@ -28,9 +28,7 @@ internal static RestReturnType CheckReturnType(this HttpResponseMessage response
 
             var rt = RestReturnType.Detect;
             var contentType = response.GetContentType();
-            if (string.IsNullOrEmpty(contentType))
-                rt = RestReturnType.Detect;
-            else if (IsJson(contentType))
+            if (string.IsNullOrEmpty(contentType) || IsJson(contentType))
                 rt = RestReturnType.Json;
             else if (IsXml(contentType))
                 rt = RestReturnType.Xml;
diff --git a/src/Authentication/Authentication/Microsoft.Graph.Authentication.csproj b/src/Authentication/Authentication/Microsoft.Graph.Authentication.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>1.3.0</Version>
+    <Version>1.3.1</Version>
     <LangVersion>7.1</LangVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
@@ -21,9 +21,9 @@
     <PreLoadAssemblies Include="$(RepoTools)Lib\System.Security.Cryptography.ProtectedData.dll" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.6" />
-    <PackageReference Include="Microsoft.Graph.Core" Version="1.23.0" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.23.0" />
+    <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
+    <PackageReference Include="Microsoft.Graph.Core" Version="1.20.1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.14.0" />
     <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" />
diff --git a/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec b/src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <id>Microsoft.Graph.Authentication</id>
     <description>Microsoft Graph PowerShell authentication module</description>
     <authors>Microsoft</authors>
diff --git a/src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1 b/src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft
 #
-# Generated on: 1/27/2021
+# Generated on: 1/29/2021
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = './Microsoft.Graph.Authentication.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.3.0'
+ModuleVersion = '1.3.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
diff --git a/src/Bookings/Bookings/readme.md b/src/Bookings/Bookings/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Calendar/Calendar/readme.md b/src/Calendar/Calendar/readme.md
@@ -52,6 +52,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/ChangeNotifications/ChangeNotifications/readme.md b/src/ChangeNotifications/ChangeNotifications/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/CloudCommunications/CloudCommunications/readme.md b/src/CloudCommunications/CloudCommunications/readme.md
@@ -59,6 +59,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Compliance/Compliance/readme.md b/src/Compliance/Compliance/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/CrossDeviceExperiences/CrossDeviceExperiences/readme.md b/src/CrossDeviceExperiences/CrossDeviceExperiences/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Devices.CloudPrint/Devices.CloudPrint/readme.md b/src/Devices.CloudPrint/Devices.CloudPrint/readme.md
@@ -48,6 +48,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Devices.CorporateManagement/Devices.CorporateManagement/readme.md b/src/Devices.CorporateManagement/Devices.CorporateManagement/readme.md
@@ -86,6 +86,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/DirectoryObjects/DirectoryObjects/readme.md b/src/DirectoryObjects/DirectoryObjects/readme.md
@@ -54,6 +54,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Education/Education/readme.md b/src/Education/Education/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Files/Files/readme.md b/src/Files/Files/readme.md
@@ -43,6 +43,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Financials/Financials/readme.md b/src/Financials/Financials/readme.md
@@ -57,6 +57,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Groups/Groups/readme.md b/src/Groups/Groups/readme.md
@@ -129,6 +129,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.DirectoryManagement/Identity.DirectoryManagement/readme.md b/src/Identity.DirectoryManagement/Identity.DirectoryManagement/readme.md
@@ -109,6 +109,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.Governance/Identity.Governance/readme.md b/src/Identity.Governance/Identity.Governance/readme.md
@@ -79,6 +79,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Identity.SignIns/Identity.SignIns/readme.md b/src/Identity.SignIns/Identity.SignIns/readme.md
@@ -52,6 +52,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Mail/Mail/readme.md b/src/Mail/Mail/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Notes/Notes/readme.md b/src/Notes/Notes/readme.md
@@ -44,6 +44,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/People/People/readme.md b/src/People/People/readme.md
@@ -74,6 +74,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/PersonalContacts/PersonalContacts/readme.md b/src/PersonalContacts/PersonalContacts/readme.md
@@ -34,6 +34,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Planner/Planner/readme.md b/src/Planner/Planner/readme.md
@@ -46,6 +46,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Reports/Reports/readme.md b/src/Reports/Reports/readme.md
@@ -81,6 +81,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/SchemaExtensions/SchemaExtensions/readme.md b/src/SchemaExtensions/SchemaExtensions/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Search/Search/readme.md b/src/Search/Search/readme.md
@@ -35,6 +35,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Security/Security/readme.md b/src/Security/Security/readme.md
@@ -73,6 +73,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Sites/Sites/readme.md b/src/Sites/Sites/readme.md
@@ -104,6 +104,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Teams/Teams/readme.md b/src/Teams/Teams/readme.md
@@ -44,6 +44,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Users.Actions/Users.Actions/readme.md b/src/Users.Actions/Users.Actions/readme.md
@@ -124,6 +124,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Users.Functions/Users.Functions/readme.md b/src/Users.Functions/Users.Functions/readme.md
@@ -61,6 +61,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```
diff --git a/src/Users/Users/readme.md b/src/Users/Users/readme.md
@@ -44,6 +44,6 @@ directive:
 ### Versioning
 
 ``` yaml
-module-version: 1.3.0
+module-version: 1.3.1
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`],`
`23`	`23`	`"releaseNotes": "See https://aka.ms/GraphPowerShell-Release.",`
`24`	`24`	`"assemblyOriginatorKeyFile": "35MSSharedLib1024.snk",`
`25`		`- "version": "1.3.0"`
	`25`	`+ "version": "1.3.1"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Generated by: Microsoft`
`5`	`5`	`#`
`6`		`-# Generated on: 1/27/2021`
	`6`	`+# Generated on: 1/29/2021`
`7`	`7`	`#`
`8`	`8`
`9`	`9`	`@{`
`@@ -12,7 +12,7 @@`
`12`	`12`	`RootModule = './Microsoft.Graph.Authentication.psm1'`
`13`	`13`
`14`	`14`	`# Version number of this module.`
`15`		`-ModuleVersion = '1.3.0'`
	`15`	`+ModuleVersion = '1.3.1'`
`16`	`16`
`17`	`17`	`# Supported PSEditions`
`18`	`18`	`CompatiblePSEditions = 'Core', 'Desktop'`