Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit 02ee1b3

Browse files
erwinvanhunenerwinvanhunen
authored
Merge pull request #1674 from erwinvanhunen/dev
2018 August Intermediate Release 1
2 parents 301b77e + 8da974c commit 02ee1b3

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

‎Commands/Base/ConnectOnline.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,7 @@ protected override void ProcessRecord()
552552
}
553553
else if (ParameterSetName == ParameterSet_ACCESSTOKEN)
554554
{
555-
#if !NETSTANDARD2_0
556-
var jwtToken = new System.IdentityModel.Tokens.JwtSecurityToken(AccessToken);
557-
#else
558555
var jwtToken = new System.IdentityModel.Tokens.Jwt.JwtSecurityToken(AccessToken);
559-
#endif
560556
var aud = jwtToken.Audiences.FirstOrDefault();
561557
if (aud != null)
562558
{

‎Commands/Base/GetAccessToken.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.IdentityModel.Tokens.Jwt;
66
#else
77
using System.IdentityModel.Tokens;
8+
using System.IdentityModel.Tokens.Jwt;
89
#endif
910
using System.Linq;
1011
using System.Management.Automation;

‎Commands/Base/SPOnlineConnectionHelper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,7 @@ internal static SPOnlineConnection InstantiateDeviceLoginConnection(string url,
180180

181181
internal static SPOnlineConnection InstantiateGraphAccessTokenConnection(string accessToken, PSHost host, bool disableTelemetry)
182182
{
183-
#if NETSTANDARD2_0
184183
var jwtToken = new System.IdentityModel.Tokens.Jwt.JwtSecurityToken(accessToken);
185-
#else
186-
var jwtToken = new System.IdentityModel.Tokens.JwtSecurityToken(accessToken);
187-
#endif
188184
var tokenResult = new TokenResult();
189185
tokenResult.AccessToken = accessToken;
190186
tokenResult.ExpiresOn = jwtToken.ValidTo;

‎Commands/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646
// [assembly: AssemblyVersion("1.0.*")]
47-
[assembly: AssemblyVersion("3.0.1808.0")]
48-
[assembly: AssemblyFileVersion("3.0.1808.0")]
47+
[assembly: AssemblyVersion("3.0.1808.1")]
48+
[assembly: AssemblyFileVersion("3.0.1808.1")]
4949
[assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]

‎Commands/SharePointPnP.PowerShell.Commands.csproj

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,15 @@
352352
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.19.8.16603, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
353353
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.8\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
354354
</Reference>
355+
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
356+
<HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net45\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
357+
</Reference>
358+
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
359+
<HintPath>..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
360+
</Reference>
361+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
362+
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net45\Microsoft.IdentityModel.Tokens.dll</HintPath>
363+
</Reference>
355364
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
356365
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
357366
</Reference>
@@ -377,8 +386,8 @@
377386
<Private>False</Private>
378387
</Reference>
379388
<Reference Include="System.IdentityModel.Selectors" />
380-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
381-
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
389+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
390+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
382391
</Reference>
383392
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
384393
<HintPath>..\packages\System.Management.Automation.dll.10.0.10586.0\lib\net40\System.Management.Automation.dll</HintPath>

‎Commands/packages.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@
1717
<package id="Microsoft.Identity.Client" version="1.0.304142221-alpha" targetFramework="net45" />
1818
<package id="Microsoft.IdentityModel" version="6.1.7600.16394" targetFramework="net45" />
1919
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.19.8" targetFramework="net45" />
20+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net45" />
21+
<package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net45" />
22+
<package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net45" />
2023
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2124
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
2225
<package id="SharePointPnP.IdentityModel.Extensions" version="1.2.3" targetFramework="net45" />
2326
<package id="System.ComponentModel" version="4.0.1" targetFramework="net45" />
2427
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
2528
<package id="System.Diagnostics.DiagnosticSource" version="4.4.0" targetFramework="net45" />
2629
<package id="System.Globalization" version="4.0.11" targetFramework="net45" />
27-
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
30+
<package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net45" />
2831
<package id="System.Linq" version="4.1.0" targetFramework="net45" />
2932
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" />
3033
<package id="System.Management.Automation.dll" version="10.0.10586.0" targetFramework="net45" />

0 commit comments

Comments
 (0)