Merge pull request #1675 from SharePoint/dev

August 2018 Intermediate Release 1

Author: erwinvanhunen

Commands/Base/ConnectOnline.cs

@@ -552,11 +552,7 @@ protected override void ProcessRecord()
             }
             else if (ParameterSetName == ParameterSet_ACCESSTOKEN)
             {
-#if !NETSTANDARD2_0
-                var jwtToken = new System.IdentityModel.Tokens.JwtSecurityToken(AccessToken);
-#else
                 var jwtToken = new System.IdentityModel.Tokens.Jwt.JwtSecurityToken(AccessToken);
-#endif
                 var aud = jwtToken.Audiences.FirstOrDefault();
                 if (aud != null)
                 {

Commands/Base/GetAccessToken.cs

@@ -5,6 +5,7 @@
 using System.IdentityModel.Tokens.Jwt;
 #else
 using System.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
 #endif
 using System.Linq;
 using System.Management.Automation;

Commands/Base/SPOnlineConnectionHelper.cs

@@ -180,11 +180,7 @@ internal static SPOnlineConnection InstantiateDeviceLoginConnection(string url,
 
         internal static SPOnlineConnection InstantiateGraphAccessTokenConnection(string accessToken, PSHost host, bool disableTelemetry)
         {
-#if NETSTANDARD2_0
             var jwtToken = new System.IdentityModel.Tokens.Jwt.JwtSecurityToken(accessToken);
-#else
-            var jwtToken = new System.IdentityModel.Tokens.JwtSecurityToken(accessToken);
-#endif
             var tokenResult = new TokenResult();
             tokenResult.AccessToken = accessToken;
             tokenResult.ExpiresOn = jwtToken.ValidTo;

Commands/Properties/AssemblyInfo.cs

@@ -44,6 +44,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.1808.0")]
-[assembly: AssemblyFileVersion("3.0.1808.0")]
+[assembly: AssemblyVersion("3.0.1808.1")]
+[assembly: AssemblyFileVersion("3.0.1808.1")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]

Commands/SharePointPnP.PowerShell.Commands.csproj

@@ -352,6 +352,15 @@
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net45\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net45\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
@@ -377,8 +386,8 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System.IdentityModel.Selectors" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll</HintPath>

Commands/packages.config

@@ -17,14 +17,17 @@
   <package id="Microsoft.Identity.Client" version="1.0.304142221-alpha" targetFramework="net45" />
   <package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net45" />
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.19.8" targetFramework="net45" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net45" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net45" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="SharePointPnP.IdentityModel.Extensions" version="1.2.3" targetFramework="net45" />
   <package id="System.ComponentModel" version="4.0.1" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.4.0" targetFramework="net45" />
   <package id="System.Globalization" version="4.0.11" targetFramework="net45" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net45" />
   <package id="System.Linq" version="4.1.0" targetFramework="net45" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" />
   <package id="System.Management.Automation.dll" version="10.0.10586.0" targetFramework="net45" />