From 476b62a271a6075b64ea453a225d19133566e929 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 15 Nov 2017 10:48:08 -0800 Subject: [PATCH] Update IdentityModel deps to preview2 --- build/Sakefile.shade | 2 +- ...rosoft.Owin.Security.ActiveDirectory.csproj | 18 +++++++++--------- .../packages.config | 16 ++++++++-------- .../Microsoft.Owin.Security.Facebook.csproj | 4 ++-- .../packages.config | 2 +- .../Microsoft.Owin.Security.Google.csproj | 4 ++-- .../packages.config | 2 +- .../Microsoft.Owin.Security.Jwt.csproj | 10 +++++----- .../packages.config | 8 ++++---- ...osoft.Owin.Security.MicrosoftAccount.csproj | 4 ++-- .../packages.config | 2 +- .../Microsoft.Owin.Security.OAuth.csproj | 4 ++-- .../packages.config | 2 +- ...icrosoft.Owin.Security.OpenIdConnect.csproj | 14 +++++++------- .../packages.config | 12 ++++++------ .../Microsoft.Owin.Security.Twitter.csproj | 4 ++-- .../packages.config | 2 +- ...Microsoft.Owin.Security.WsFederation.csproj | 18 +++++++++--------- .../packages.config | 16 ++++++++-------- tests/FunctionalTests/FunctionalTests.csproj | 18 +++++++++--------- tests/FunctionalTests/packages.config | 16 ++++++++-------- .../Katana.Sandbox.WebServer.csproj | 10 +++++----- tests/Katana.Sandbox.WebServer/packages.config | 8 ++++---- .../Microsoft.Owin.Security.Tests.csproj | 10 +++++----- .../Twitter/TwitterMiddlewareTests.cs | 8 -------- .../packages.config | 8 ++++---- 26 files changed, 107 insertions(+), 115 deletions(-) diff --git a/build/Sakefile.shade b/build/Sakefile.shade index c45292bd..193ac015 100644 --- a/build/Sakefile.shade +++ b/build/Sakefile.shade @@ -5,7 +5,7 @@ var SHIP='${Version(4, 0, 0, "preview1")}' var DEV='${Version(0, 31, 0, "pre")}' set FINAL_MILESTONE='${false}' var AZUREAD_VERSION='5.2.0' -var AZUREAD_SUFFIX='-preview1-408290725' +var AZUREAD_SUFFIX='-preview2-41113220915' var VERSION='${SHIP.VERSION}' var FULL_VERSION='${SHIP.FULL_VERSION}' var EULA='https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm' diff --git a/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj b/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj index 8ba2c834..733f113a 100644 --- a/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj +++ b/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.csproj @@ -41,31 +41,31 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll True - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Xml.dll + ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Xml.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -76,7 +76,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/src/Microsoft.Owin.Security.ActiveDirectory/packages.config b/src/Microsoft.Owin.Security.ActiveDirectory/packages.config index f96ea0b8..6b3dca7b 100644 --- a/src/Microsoft.Owin.Security.ActiveDirectory/packages.config +++ b/src/Microsoft.Owin.Security.ActiveDirectory/packages.config @@ -1,12 +1,12 @@  - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.csproj b/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.csproj index 26f5762e..e7a35275 100644 --- a/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.csproj +++ b/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.csproj @@ -37,8 +37,8 @@ bin\Release\Microsoft.Owin.Security.Facebook.XML - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/Microsoft.Owin.Security.Facebook/packages.config b/src/Microsoft.Owin.Security.Facebook/packages.config index 4114bb54..173a68b3 100644 --- a/src/Microsoft.Owin.Security.Facebook/packages.config +++ b/src/Microsoft.Owin.Security.Facebook/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.csproj b/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.csproj index ecefbccb..dac59d61 100644 --- a/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.csproj +++ b/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.csproj @@ -35,8 +35,8 @@ bin\Release\Microsoft.Owin.Security.Google.XML - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/Microsoft.Owin.Security.Google/packages.config b/src/Microsoft.Owin.Security.Google/packages.config index 4114bb54..173a68b3 100644 --- a/src/Microsoft.Owin.Security.Google/packages.config +++ b/src/Microsoft.Owin.Security.Google/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj b/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj index 8b354e1f..e24ee30d 100644 --- a/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj +++ b/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.csproj @@ -37,15 +37,15 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -56,7 +56,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/src/Microsoft.Owin.Security.Jwt/packages.config b/src/Microsoft.Owin.Security.Jwt/packages.config index 9dd7125a..c532cd6f 100644 --- a/src/Microsoft.Owin.Security.Jwt/packages.config +++ b/src/Microsoft.Owin.Security.Jwt/packages.config @@ -1,8 +1,8 @@  - - - + + + - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.csproj b/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.csproj index 778a841a..d8914fa5 100644 --- a/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.csproj +++ b/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.csproj @@ -35,8 +35,8 @@ bin\Release\Microsoft.Owin.Security.MicrosoftAccount.XML - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/Microsoft.Owin.Security.MicrosoftAccount/packages.config b/src/Microsoft.Owin.Security.MicrosoftAccount/packages.config index 4114bb54..173a68b3 100644 --- a/src/Microsoft.Owin.Security.MicrosoftAccount/packages.config +++ b/src/Microsoft.Owin.Security.MicrosoftAccount/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.csproj b/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.csproj index 3edfe776..92be4646 100644 --- a/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.csproj +++ b/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.csproj @@ -36,8 +36,8 @@ bin\Release\Microsoft.Owin.Security.OAuth.XML - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/Microsoft.Owin.Security.OAuth/packages.config b/src/Microsoft.Owin.Security.OAuth/packages.config index 4114bb54..173a68b3 100644 --- a/src/Microsoft.Owin.Security.OAuth/packages.config +++ b/src/Microsoft.Owin.Security.OAuth/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj b/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj index 39d8cb9b..af04b9de 100644 --- a/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj +++ b/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.csproj @@ -41,23 +41,23 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -65,7 +65,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/src/Microsoft.Owin.Security.OpenIdConnect/packages.config b/src/Microsoft.Owin.Security.OpenIdConnect/packages.config index 12eab324..7346d11f 100644 --- a/src/Microsoft.Owin.Security.OpenIdConnect/packages.config +++ b/src/Microsoft.Owin.Security.OpenIdConnect/packages.config @@ -1,10 +1,10 @@  - - - - - + + + + + - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.csproj b/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.csproj index cf504a65..494d4d63 100644 --- a/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.csproj +++ b/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.csproj @@ -37,8 +37,8 @@ bin\Release\Microsoft.Owin.Security.Twitter.XML - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/src/Microsoft.Owin.Security.Twitter/packages.config b/src/Microsoft.Owin.Security.Twitter/packages.config index 4114bb54..173a68b3 100644 --- a/src/Microsoft.Owin.Security.Twitter/packages.config +++ b/src/Microsoft.Owin.Security.Twitter/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj b/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj index 02763d74..b26b5051 100644 --- a/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj +++ b/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.csproj @@ -39,31 +39,31 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll True - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Xml.dll + ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Xml.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -71,7 +71,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/src/Microsoft.Owin.Security.WsFederation/packages.config b/src/Microsoft.Owin.Security.WsFederation/packages.config index 2745d5ca..a8a21fb1 100644 --- a/src/Microsoft.Owin.Security.WsFederation/packages.config +++ b/src/Microsoft.Owin.Security.WsFederation/packages.config @@ -1,11 +1,11 @@  - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/tests/FunctionalTests/FunctionalTests.csproj b/tests/FunctionalTests/FunctionalTests.csproj index f04f5933..34db0e63 100644 --- a/tests/FunctionalTests/FunctionalTests.csproj +++ b/tests/FunctionalTests/FunctionalTests.csproj @@ -37,35 +37,35 @@ ..\..\packages\LTAF.Infrastructure.1.0.7\lib\Net40\LTAF.Infrastructure.dll - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.dll True - ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll + ..\..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll True - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0.407281058-pre\lib\net451\Microsoft.IdentityModel.Xml.dll + ..\..\packages\Microsoft.IdentityModel.Xml.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Xml.dll True True ..\..\packages\Microsoft.Web.Administration.7.0.0.0\lib\net20\Microsoft.Web.Administration.dll - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -78,7 +78,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0.407281058-pre\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/tests/FunctionalTests/packages.config b/tests/FunctionalTests/packages.config index c6ae9b3d..bb0dbd13 100644 --- a/tests/FunctionalTests/packages.config +++ b/tests/FunctionalTests/packages.config @@ -1,17 +1,17 @@  - - - - - - + + + + + + - + - + diff --git a/tests/Katana.Sandbox.WebServer/Katana.Sandbox.WebServer.csproj b/tests/Katana.Sandbox.WebServer/Katana.Sandbox.WebServer.csproj index 21efc99e..78494cba 100644 --- a/tests/Katana.Sandbox.WebServer/Katana.Sandbox.WebServer.csproj +++ b/tests/Katana.Sandbox.WebServer/Katana.Sandbox.WebServer.csproj @@ -43,15 +43,15 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -59,7 +59,7 @@ ..\..\packages\Owin.1.0\lib\net40\Owin.dll - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/tests/Katana.Sandbox.WebServer/packages.config b/tests/Katana.Sandbox.WebServer/packages.config index 9dd7125a..c532cd6f 100644 --- a/tests/Katana.Sandbox.WebServer/packages.config +++ b/tests/Katana.Sandbox.WebServer/packages.config @@ -1,8 +1,8 @@  - - - + + + - + \ No newline at end of file diff --git a/tests/Microsoft.Owin.Security.Tests/Microsoft.Owin.Security.Tests.csproj b/tests/Microsoft.Owin.Security.Tests/Microsoft.Owin.Security.Tests.csproj index a83666d3..f8461519 100644 --- a/tests/Microsoft.Owin.Security.Tests/Microsoft.Owin.Security.Tests.csproj +++ b/tests/Microsoft.Owin.Security.Tests/Microsoft.Owin.Security.Tests.csproj @@ -35,15 +35,15 @@ - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Logging.dll + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Logging.dll True - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview1-408290725\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.0-preview2-41113220915\lib\net451\Microsoft.IdentityModel.Tokens.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll True @@ -58,7 +58,7 @@ - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview1-408290725\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.0-preview2-41113220915\lib\net451\System.IdentityModel.Tokens.Jwt.dll True diff --git a/tests/Microsoft.Owin.Security.Tests/Twitter/TwitterMiddlewareTests.cs b/tests/Microsoft.Owin.Security.Tests/Twitter/TwitterMiddlewareTests.cs index 15162284..c6604407 100644 --- a/tests/Microsoft.Owin.Security.Tests/Twitter/TwitterMiddlewareTests.cs +++ b/tests/Microsoft.Owin.Security.Tests/Twitter/TwitterMiddlewareTests.cs @@ -150,14 +150,6 @@ private static async Task SendAsync(TestServer server, string uri, return transaction; } - private static async Task ReturnJsonResponse(object content) - { - var res = new HttpResponseMessage(HttpStatusCode.OK); - var text = await JsonConvert.SerializeObjectAsync(content); - res.Content = new StringContent(text, Encoding.UTF8, "application/json"); - return res; - } - private class TestHttpMessageHandler : HttpMessageHandler { public Func> Sender { get; set; } diff --git a/tests/Microsoft.Owin.Security.Tests/packages.config b/tests/Microsoft.Owin.Security.Tests/packages.config index 2b869783..502354b9 100644 --- a/tests/Microsoft.Owin.Security.Tests/packages.config +++ b/tests/Microsoft.Owin.Security.Tests/packages.config @@ -1,11 +1,11 @@  - - - + + + - +