Skip to content

Commit 5d58dab

Browse files
TratcherTratcher
committed
#7 IdentityModel dependency update
1 parent 7cb4597 commit 5d58dab

File tree

72 files changed

+492
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+492
-341
lines changed

‎build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation All rights reserved.")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyVersion("4.0.0.0")]
11-
[assembly: AssemblyFileVersion("4.0.60210.0")]
12-
[assembly: AssemblyInformationalVersion("4.0.0-alpha1-60210-000")]
11+
[assembly: AssemblyFileVersion("4.0.60801.0")]
12+
[assembly: AssemblyInformationalVersion("4.0.0-alpha1-60801-000")]
1313
[assembly: AssemblyMetadata("Serviceable", "True")]

‎build/DevAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation All rights reserved.")]
99
[assembly: AssemblyTrademark("")]
1010
[assembly: AssemblyVersion("0.31.0.0")]
11-
[assembly: AssemblyFileVersion("0.31.60210.0")]
12-
[assembly: AssemblyInformationalVersion("0.31.0-pre-60210-000")]
11+
[assembly: AssemblyFileVersion("0.31.60801.0")]
12+
[assembly: AssemblyInformationalVersion("0.31.0-pre-60801-000")]
1313
[assembly: AssemblyMetadata("Serviceable", "True")]

‎build/Katana.version.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<PropertyGroup>
44
<ShipVersion>4.0.0</ShipVersion>
55
<ShipStrongNameVersion>4.0.0.0</ShipStrongNameVersion>
6-
<ShipFullVersion>4.0.0-alpha1-60210-000</ShipFullVersion>
7-
<ShipFileVersion>4.0.60210.0</ShipFileVersion>
6+
<ShipFullVersion>4.0.0-alpha1-60801-000</ShipFullVersion>
7+
<ShipFileVersion>4.0.60801.0</ShipFileVersion>
88
<MajorVersion>4</MajorVersion>
99
<MinorVersion>0</MinorVersion>
1010
<PatchVersion>0</PatchVersion>
1111
<BuildQuality>alpha1</BuildQuality>
12-
<BuildDate>60210</BuildDate>
12+
<BuildDate>60801</BuildDate>
1313
<BranchSuffix></BranchSuffix>
14-
<Eula>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</Eula>
14+
<Eula>https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</Eula>
1515
<ProjectUrl>https://github.com/aspnet/AspNetKatana/</ProjectUrl>
1616
<Tags>Microsoft OWIN Katana</Tags>
1717
</PropertyGroup>

‎build/Sakefile.shade

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ var AUTHORS='Microsoft'
44
var SHIP='${Version(4, 0, 0, "alpha1")}'
55
var DEV='${Version(0, 31, 0, "pre")}'
66
set FINAL_MILESTONE='${false}'
7-
8-
var AZUREAD_JWT_SUFFIX=''
9-
var AZUREAD_EXT_SUFFIX=''
7+
var AZUREAD_VERSION='5.2.0'
8+
var AZUREAD_SUFFIX='.407281058-pre'
109
var VERSION='${SHIP.VERSION}'
1110
var FULL_VERSION='${SHIP.FULL_VERSION}'
1211
var EULA='https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm'
@@ -271,16 +270,15 @@ var signing='${new List<string>()}'
271270
test if='OFFICIAL_BUILD && !RELEASE_BUILD'
272271
-title = title.Split(new[]{"("}, StringSplitOptions.None)[0] + string.Format(" (nightly {0:yyyy MMM dd})", DateTime.Now);
273272

274-
var azureAdJwtSuffix='${AZUREAD_JWT_SUFFIX}'
275-
set azureAdJwtSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
276-
var azureAdExtSuffix='${AZUREAD_EXT_SUFFIX}'
277-
set azureAdExtSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
273+
var azureAdVersion='${AZUREAD_VERSION}'
274+
var azureAdSuffix='${AZUREAD_SUFFIX}'
275+
set azureAdSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'
278276

279277
var licenseUrl='${EULA}'
280278
var projectUrl='${PROJECT_URL}'
281279
var tags='${TAGS}'
282280

283-
nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};licenseUrl=${licenseUrl};projectUrl=${projectUrl};tags=${tags};azureAdJwtSuffix=${azureAdJwtSuffix};azureAdExtSuffix=${azureAdExtSuffix}"'
281+
nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};licenseUrl=${licenseUrl};projectUrl=${projectUrl};tags=${tags};azureAdVersion=${azureAdVersion};azureAdSuffix=${azureAdSuffix}"'
284282

285283
#nuget-deploy target='deploy' description='Upload NuGet packages to gallery'
286284
var extra=''

‎src/Microsoft.Owin.Security.ActiveDirectory/ActiveDirectoryFederationServicesBearerAuthenticationExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.Globalization;
65
using System.Linq;
76
using Microsoft.Owin.Security.ActiveDirectory;
87
using Microsoft.Owin.Security.Jwt;
@@ -28,7 +27,7 @@ public static IAppBuilder UseActiveDirectoryFederationServicesBearerAuthenticati
2827
throw new ArgumentNullException("options");
2928
}
3029

31-
var cachingSecurityTokenProvider = new WsFedCachingSecurityTokenProvider(options.MetadataEndpoint,
30+
var cachingSecurityTokenProvider = new WsFedCachingSecurityKeyProvider(options.MetadataEndpoint,
3231
options.BackchannelCertificateValidator, options.BackchannelTimeout, options.BackchannelHttpHandler);
3332

3433
#pragma warning disable 618

‎src/Microsoft.Owin.Security.ActiveDirectory/ActiveDirectoryFederationServicesBearerAuthenticationOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IdentityModel.Tokens;
5+
using System.IdentityModel.Tokens.Jwt;
66
using System.Net.Http;
7-
7+
using Microsoft.IdentityModel.Tokens;
88
using Microsoft.Owin.Security.OAuth;
99

1010
namespace Microsoft.Owin.Security.ActiveDirectory

‎src/Microsoft.Owin.Security.ActiveDirectory/IssuerSigningKeys.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
5-
using System.IdentityModel.Tokens;
5+
using Microsoft.IdentityModel.Tokens;
66

77
namespace Microsoft.Owin.Security.ActiveDirectory
88
{
@@ -19,6 +19,6 @@ internal class IssuerSigningKeys
1919
/// <summary>
2020
/// Signing tokens.
2121
/// </summary>
22-
public IEnumerable<X509SecurityToken> Tokens { get; set; }
22+
public IEnumerable<SecurityKey> Keys { get; set; }
2323
}
2424
}

‎src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,44 @@
4040
<StartupObject />
4141
</PropertyGroup>
4242
<ItemGroup>
43+
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="Microsoft.IdentityModel.Protocols, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="Microsoft.IdentityModel.Protocols.WsFederation, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="Microsoft.IdentityModel.Tokens.Saml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll</HintPath>
61+
<Private>True</Private>
62+
</Reference>
63+
<Reference Include="Microsoft.IdentityModel.Xml, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\Microsoft.IdentityModel.Xml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Xml.dll</HintPath>
65+
<Private>True</Private>
66+
</Reference>
67+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<Private>True</Private>
70+
</Reference>
4371
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
4472
<SpecificVersion>False</SpecificVersion>
4573
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
4674
</Reference>
4775
<Reference Include="System" />
4876
<Reference Include="System.Core" />
4977
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.IdentityModel" />
51-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
78+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0.407281058-pre\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
80+
<Private>True</Private>
5481
</Reference>
5582
<Reference Include="System.Net.Http" />
5683
<Reference Include="System.Net.Http.WebRequest" />
@@ -68,7 +95,7 @@
6895
<DesignTime>True</DesignTime>
6996
<DependentUpon>Resources.resx</DependentUpon>
7097
</Compile>
71-
<Compile Include="WsFedCachingSecurityTokenProvider.cs" />
98+
<Compile Include="WsFedCachingSecurityKeyProvider.cs" />
7299
<Compile Include="IssuerSigningKeys.cs" />
73100
<Compile Include="WsFedMetadataRetriever.cs" />
74101
<Compile Include="WindowsAzureActiveDirectoryBearerAuthenticationExtensions.cs" />

‎src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency id="Microsoft.Owin.Security" version="$version$" />
2222
<dependency id="Microsoft.Owin.Security.OAuth" version="$version$" />
2323
<dependency id="Microsoft.Owin.Security.Jwt" version="$version$" />
24-
<dependency id="System.IdentityModel.Tokens.Jwt" version="4.0.0$azureAdJwtSuffix$" />
24+
<dependency id="System.IdentityModel.Tokens.Jwt" version="$azureAdVersion$$azureAdSuffix$" />
2525
</dependencies>
2626
</metadata>
2727
<files>

‎src/Microsoft.Owin.Security.ActiveDirectory/WindowsAzureActiveDirectoryBearerAuthenticationExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static IAppBuilder UseWindowsAzureActiveDirectoryBearerAuthentication(thi
4040
options.MetadataAddress = string.Format(CultureInfo.InvariantCulture, SecurityTokenServiceAddressFormat, options.Tenant);
4141
}
4242

43-
var cachingSecurityTokenProvider = new WsFedCachingSecurityTokenProvider(options.MetadataAddress,
43+
var cachingSecurityTokenProvider = new WsFedCachingSecurityKeyProvider(options.MetadataAddress,
4444
options.BackchannelCertificateValidator, options.BackchannelTimeout, options.BackchannelHttpHandler);
4545

4646
#pragma warning disable 618

‎src/Microsoft.Owin.Security.ActiveDirectory/WindowsAzureActiveDirectoryBearerAuthenticationOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.IdentityModel.Tokens;
5+
using System.IdentityModel.Tokens.Jwt;
66
using System.Net.Http;
7-
7+
using Microsoft.IdentityModel.Tokens;
88
using Microsoft.Owin.Security.OAuth;
99

1010
namespace Microsoft.Owin.Security.ActiveDirectory

‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedCachingSecurityTokenProvider.cs renamed to ‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedCachingSecurityKeyProvider.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics.CodeAnalysis;
7-
using System.IdentityModel.Tokens;
87
using System.Net.Http;
98
using System.Threading;
9+
using Microsoft.IdentityModel.Tokens;
1010
using Microsoft.Owin.Security.Jwt;
1111

1212
namespace Microsoft.Owin.Security.ActiveDirectory
1313
{
1414
/// <summary>
15-
/// A security token provider which retrieves the issuer and signing tokens from a WSFed metadata endpoint.
15+
/// A security key provider which retrieves the issuer and signing tokens from a WSFed metadata endpoint.
1616
/// </summary>
1717
[SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "This type is only controlled through the interface, which is not disposable.")]
18-
internal class WsFedCachingSecurityTokenProvider : IIssuerSecurityTokenProvider
18+
internal class WsFedCachingSecurityKeyProvider : IIssuerSecurityKeyProvider
1919
{
2020
private readonly TimeSpan _refreshInterval = new TimeSpan(1, 0, 0, 0);
2121

@@ -28,9 +28,9 @@ internal class WsFedCachingSecurityTokenProvider : IIssuerSecurityTokenProvider
2828

2929
private string _issuer;
3030

31-
private IEnumerable<SecurityToken> _tokens;
31+
private IEnumerable<SecurityKey> _keys;
3232

33-
public WsFedCachingSecurityTokenProvider(string metadataEndpoint, ICertificateValidator backchannelCertificateValidator,
33+
public WsFedCachingSecurityKeyProvider(string metadataEndpoint, ICertificateValidator backchannelCertificateValidator,
3434
TimeSpan backchannelTimeout, HttpMessageHandler backchannelHttpHandler)
3535
{
3636
_metadataEndpoint = metadataEndpoint;
@@ -67,20 +67,21 @@ public string Issuer
6767
}
6868

6969
/// <summary>
70-
/// Gets all known security tokens.
70+
/// Gets all known security keys.
7171
/// </summary>
7272
/// <value>
73-
/// All known security tokens.
73+
/// All known security keys.
7474
/// </value>
75-
public IEnumerable<SecurityToken> SecurityTokens
75+
public IEnumerable<SecurityKey> SecurityKeys
7676
{
7777
get
7878
{
7979
RefreshMetadata();
80-
return _tokens;
80+
return _keys;
8181
}
8282
}
8383

84+
[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Can't throw exceptions on a background thread.")]
8485
private void RefreshMetadata()
8586
{
8687
if (_syncAfter >= DateTimeOffset.UtcNow)
@@ -109,7 +110,7 @@ private void RetrieveMetadata()
109110
IssuerSigningKeys metaData = WsFedMetadataRetriever.GetSigningKeys(_metadataEndpoint,
110111
_backchannelTimeout, _backchannelHttpHandler);
111112
_issuer = metaData.Issuer;
112-
_tokens = metaData.Tokens;
113+
_keys = metaData.Keys;
113114
}
114115
}
115116
}

‎src/Microsoft.Owin.Security.ActiveDirectory/WsFedMetadataRetriever.cs

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using System.Collections.Generic;
6-
using System.IdentityModel.Metadata;
7-
using System.IdentityModel.Tokens;
5+
using System.Collections.ObjectModel;
86
using System.IO;
9-
using System.Linq;
107
using System.Net.Http;
11-
using System.Security.Cryptography.X509Certificates;
12-
using System.ServiceModel.Security;
138
using System.Xml;
9+
using Microsoft.IdentityModel.Protocols.WsFederation;
10+
using Microsoft.IdentityModel.Tokens;
1411

1512
namespace Microsoft.Owin.Security.ActiveDirectory
1613
{
@@ -23,9 +20,6 @@ internal static class WsFedMetadataRetriever
2320

2421
public static IssuerSigningKeys GetSigningKeys(string metadataEndpoint, TimeSpan backchannelTimeout, HttpMessageHandler backchannelHttpHandler)
2522
{
26-
string issuer = string.Empty;
27-
var tokens = new List<X509SecurityToken>();
28-
2923
using (var metadataRequest = new HttpClient(backchannelHttpHandler, false))
3024
{
3125
metadataRequest.Timeout = backchannelTimeout;
@@ -35,32 +29,13 @@ public static IssuerSigningKeys GetSigningKeys(string metadataEndpoint, TimeSpan
3529
Stream metadataStream = metadataResponse.Content.ReadAsStreamAsync().Result;
3630
using (XmlReader metaDataReader = XmlReader.Create(metadataStream, SafeSettings))
3731
{
38-
var serializer = new MetadataSerializer { CertificateValidationMode = X509CertificateValidationMode.None };
39-
40-
MetadataBase metadata = serializer.ReadMetadata(metaDataReader);
41-
var entityDescriptor = (EntityDescriptor)metadata;
42-
43-
if (!string.IsNullOrWhiteSpace(entityDescriptor.EntityId.Id))
44-
{
45-
issuer = entityDescriptor.EntityId.Id;
46-
}
32+
var serializer = new WsFederationMetadataSerializer();
33+
var wsFederationConfiguration = serializer.ReadMetadata(metaDataReader);
4734

48-
SecurityTokenServiceDescriptor stsd = entityDescriptor.RoleDescriptors.OfType<SecurityTokenServiceDescriptor>().First();
49-
if (stsd == null)
50-
{
51-
throw new InvalidOperationException(Properties.Resources.Exception_MissingDescriptor);
52-
}
53-
54-
IEnumerable<X509RawDataKeyIdentifierClause> x509DataClauses =
55-
stsd.Keys.Where(key => key.KeyInfo != null
56-
&& (key.Use == KeyType.Signing || key.Use == KeyType.Unspecified))
57-
.Select(key => key.KeyInfo.OfType<X509RawDataKeyIdentifierClause>().First());
58-
tokens.AddRange(x509DataClauses.Select(token => new X509SecurityToken(new X509Certificate2(token.GetX509RawData()))));
35+
return new IssuerSigningKeys { Issuer = wsFederationConfiguration.Issuer, Keys = wsFederationConfiguration.SigningKeys };
5936
}
6037
}
6138
}
62-
63-
return new IssuerSigningKeys { Issuer = issuer, Tokens = tokens };
6439
}
6540
}
6641
}

‎src/Microsoft.Owin.Security.ActiveDirectory/packages.config

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.IdentityModel.Logging" version="5.2.0.407281058-pre" targetFramework="net451" />
4+
<package id="Microsoft.IdentityModel.Protocols" version="5.2.0.407281058-pre" targetFramework="net451" />
5+
<package id="Microsoft.IdentityModel.Protocols.WsFederation" version="5.2.0.407281058-pre" targetFramework="net451" />
6+
<package id="Microsoft.IdentityModel.Tokens" version="5.2.0.407281058-pre" targetFramework="net451" />
7+
<package id="Microsoft.IdentityModel.Tokens.Saml" version="5.2.0.407281058-pre" targetFramework="net451" />
8+
<package id="Microsoft.IdentityModel.Xml" version="5.2.0.407281058-pre" targetFramework="net451" />
9+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
310
<package id="Owin" version="1.0" targetFramework="net45" />
4-
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
11+
<package id="System.IdentityModel.Tokens.Jwt" version="5.2.0.407281058-pre" targetFramework="net451" />
512
</packages>

‎src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.IdentityModel" />
4645
<Reference Include="System.Runtime.Serialization" />
4746
<Reference Include="System.Xml" />
4847
</ItemGroup>

‎src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<DocumentationFile>bin\Release\Microsoft.Owin.Security.Facebook.XML</DocumentationFile>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41-
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
40+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
42+
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
@@ -48,7 +48,6 @@
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />
5050
<Reference Include="Microsoft.CSharp" />
51-
<Reference Include="System.IdentityModel" />
5251
<Reference Include="System.Net.Http" />
5352
<Reference Include="System.Net.Http.WebRequest" />
5453
</ItemGroup>

‎src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</frameworkAssemblies>
1818
<dependencies>
1919
<dependency id="Owin" version="1.0" />
20-
<dependency id="Newtonsoft.Json" version="6.0.4" />
20+
<dependency id="Newtonsoft.Json" version="9.0.1" />
2121
<dependency id="Microsoft.Owin" version="$version$" />
2222
<dependency id="Microsoft.Owin.Security" version="$version$" />
2323
</dependencies>

0 commit comments

Comments
 (0)