From 66dc696435c4a1fcacd367f0321465f597a7804f Mon Sep 17 00:00:00 2001 From: Anders Abel Date: Wed, 18 Mar 2020 08:00:29 +0100 Subject: [PATCH] Update to Microsoft.IdentityModel 5.6.0 --- .../SampleOwinApplication.csproj | 19 +++++++++++-------- Samples/SampleOwinApplication/Web.config | 12 ++++++++++++ Samples/SampleOwinApplication/packages.config | 9 +++++---- .../Sustainsys.Saml2.StubIdp.csproj | 17 +++++++++-------- Sustainsys.Saml2.StubIdp/Web.config | 12 ++++++++++++ Sustainsys.Saml2.StubIdp/packages.config | 8 ++++---- Sustainsys.Saml2/Sustainsys.Saml2.csproj | 6 +++--- .../AspNetCore2.Tests.csproj | 2 +- Tests/HttpModule.Tests/App.config | 12 ++++++++++++ .../HttpModule.Tests/HttpModule.Tests.csproj | 16 ++++++++-------- Tests/HttpModule.Tests/packages.config | 8 ++++---- Tests/Mvc.Tests/App.config | 18 +++++++++++++++--- Tests/Mvc.Tests/Mvc.Tests.csproj | 16 ++++++++-------- Tests/Mvc.Tests/packages.config | 8 ++++---- Tests/Owin.Tests/App.config | 12 ++++++++++++ Tests/Owin.Tests/Owin.Tests.csproj | 16 ++++++++-------- Tests/Owin.Tests/packages.config | 12 ++++++------ Tests/Tests.NETCore/Tests.NETCore.csproj | 6 +++--- Tests/Tests.NETFramework/App.config | 8 ++++++-- .../Tests.NETFramework.csproj | 16 ++++++++-------- Tests/Tests.NETFramework/packages.config | 8 ++++---- 21 files changed, 155 insertions(+), 86 deletions(-) diff --git a/Samples/SampleOwinApplication/SampleOwinApplication.csproj b/Samples/SampleOwinApplication/SampleOwinApplication.csproj index 4d6c6f7f9..584bda1d9 100644 --- a/Samples/SampleOwinApplication/SampleOwinApplication.csproj +++ b/Samples/SampleOwinApplication/SampleOwinApplication.csproj @@ -64,17 +64,20 @@ True - - ..\..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll + + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll - - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll ..\..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll diff --git a/Samples/SampleOwinApplication/Web.config b/Samples/SampleOwinApplication/Web.config index 30551c15c..bfff476d4 100644 --- a/Samples/SampleOwinApplication/Web.config +++ b/Samples/SampleOwinApplication/Web.config @@ -299,6 +299,18 @@ + + + + + + + + + + + + diff --git a/Samples/SampleOwinApplication/packages.config b/Samples/SampleOwinApplication/packages.config index 164ab1708..fd59243cb 100644 --- a/Samples/SampleOwinApplication/packages.config +++ b/Samples/SampleOwinApplication/packages.config @@ -16,11 +16,12 @@ - - - - + + + + + diff --git a/Sustainsys.Saml2.StubIdp/Sustainsys.Saml2.StubIdp.csproj b/Sustainsys.Saml2.StubIdp/Sustainsys.Saml2.StubIdp.csproj index d4d0e48ab..7cf58e381 100644 --- a/Sustainsys.Saml2.StubIdp/Sustainsys.Saml2.StubIdp.csproj +++ b/Sustainsys.Saml2.StubIdp/Sustainsys.Saml2.StubIdp.csproj @@ -49,17 +49,17 @@ ..\packages\dotless.1.5.2\lib\dotless.Core.dll - - ..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll True @@ -73,6 +73,7 @@ + diff --git a/Sustainsys.Saml2.StubIdp/Web.config b/Sustainsys.Saml2.StubIdp/Web.config index be5f3d4c9..1ecaa31fe 100644 --- a/Sustainsys.Saml2.StubIdp/Web.config +++ b/Sustainsys.Saml2.StubIdp/Web.config @@ -266,6 +266,18 @@ + + + + + + + + + + + + diff --git a/Sustainsys.Saml2.StubIdp/packages.config b/Sustainsys.Saml2.StubIdp/packages.config index 3cf6eaeb1..740a01836 100644 --- a/Sustainsys.Saml2.StubIdp/packages.config +++ b/Sustainsys.Saml2.StubIdp/packages.config @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/Sustainsys.Saml2/Sustainsys.Saml2.csproj b/Sustainsys.Saml2/Sustainsys.Saml2.csproj index 071060cda..6b2c9a09d 100644 --- a/Sustainsys.Saml2/Sustainsys.Saml2.csproj +++ b/Sustainsys.Saml2/Sustainsys.Saml2.csproj @@ -42,9 +42,9 @@ - - - + + + diff --git a/Tests/AspNetCore2.Tests/AspNetCore2.Tests.csproj b/Tests/AspNetCore2.Tests/AspNetCore2.Tests.csproj index f24533d80..2201a96dd 100644 --- a/Tests/AspNetCore2.Tests/AspNetCore2.Tests.csproj +++ b/Tests/AspNetCore2.Tests/AspNetCore2.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/Tests/HttpModule.Tests/App.config b/Tests/HttpModule.Tests/App.config index 7b7eca607..f087bb702 100644 --- a/Tests/HttpModule.Tests/App.config +++ b/Tests/HttpModule.Tests/App.config @@ -20,6 +20,18 @@ + + + + + + + + + + + + diff --git a/Tests/HttpModule.Tests/HttpModule.Tests.csproj b/Tests/HttpModule.Tests/HttpModule.Tests.csproj index 8887e4d7b..6b7f79f00 100644 --- a/Tests/HttpModule.Tests/HttpModule.Tests.csproj +++ b/Tests/HttpModule.Tests/HttpModule.Tests.csproj @@ -62,17 +62,17 @@ ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll diff --git a/Tests/HttpModule.Tests/packages.config b/Tests/HttpModule.Tests/packages.config index 4ebca8b2b..f0faaf7f2 100644 --- a/Tests/HttpModule.Tests/packages.config +++ b/Tests/HttpModule.Tests/packages.config @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/Tests/Mvc.Tests/App.config b/Tests/Mvc.Tests/App.config index eaba0312c..ce6682563 100644 --- a/Tests/Mvc.Tests/App.config +++ b/Tests/Mvc.Tests/App.config @@ -35,13 +35,25 @@ - - + + + + + + + + + + + + + + - + diff --git a/Tests/Mvc.Tests/Mvc.Tests.csproj b/Tests/Mvc.Tests/Mvc.Tests.csproj index f42565bbb..9f900df17 100644 --- a/Tests/Mvc.Tests/Mvc.Tests.csproj +++ b/Tests/Mvc.Tests/Mvc.Tests.csproj @@ -62,17 +62,17 @@ ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll ..\..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll diff --git a/Tests/Mvc.Tests/packages.config b/Tests/Mvc.Tests/packages.config index 09c452042..65c14ce46 100644 --- a/Tests/Mvc.Tests/packages.config +++ b/Tests/Mvc.Tests/packages.config @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/Tests/Owin.Tests/App.config b/Tests/Owin.Tests/App.config index 0f1094ac9..f0d30747b 100644 --- a/Tests/Owin.Tests/App.config +++ b/Tests/Owin.Tests/App.config @@ -42,6 +42,18 @@ + + + + + + + + + + + + diff --git a/Tests/Owin.Tests/Owin.Tests.csproj b/Tests/Owin.Tests/Owin.Tests.csproj index 5709fe30a..b4a6cab18 100644 --- a/Tests/Owin.Tests/Owin.Tests.csproj +++ b/Tests/Owin.Tests/Owin.Tests.csproj @@ -61,17 +61,17 @@ ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll ..\..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll diff --git a/Tests/Owin.Tests/packages.config b/Tests/Owin.Tests/packages.config index 3e79a8d75..3d4c4b7dd 100644 --- a/Tests/Owin.Tests/packages.config +++ b/Tests/Owin.Tests/packages.config @@ -1,16 +1,16 @@  - - - - - - + + + + + + diff --git a/Tests/Tests.NETCore/Tests.NETCore.csproj b/Tests/Tests.NETCore/Tests.NETCore.csproj index 9824420fd..1e59564e8 100644 --- a/Tests/Tests.NETCore/Tests.NETCore.csproj +++ b/Tests/Tests.NETCore/Tests.NETCore.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/Tests/Tests.NETFramework/App.config b/Tests/Tests.NETFramework/App.config index 760c73e0e..ad42ba373 100644 --- a/Tests/Tests.NETFramework/App.config +++ b/Tests/Tests.NETFramework/App.config @@ -77,11 +77,15 @@ - + - + + + + + diff --git a/Tests/Tests.NETFramework/Tests.NETFramework.csproj b/Tests/Tests.NETFramework/Tests.NETFramework.csproj index b8e3a25e3..4e54b938d 100644 --- a/Tests/Tests.NETFramework/Tests.NETFramework.csproj +++ b/Tests/Tests.NETFramework/Tests.NETFramework.csproj @@ -50,17 +50,17 @@ ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\..\packages\Microsoft.IdentityModel.Logging.5.6.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\..\packages\Microsoft.IdentityModel.Tokens.Saml.5.6.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\..\packages\Microsoft.IdentityModel.Xml.5.2.4\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\..\packages\Microsoft.IdentityModel.Xml.5.6.0\lib\net461\Microsoft.IdentityModel.Xml.dll ..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll diff --git a/Tests/Tests.NETFramework/packages.config b/Tests/Tests.NETFramework/packages.config index 2457ba76f..ba64cb9bc 100644 --- a/Tests/Tests.NETFramework/packages.config +++ b/Tests/Tests.NETFramework/packages.config @@ -11,10 +11,10 @@ - - - - + + + +