From 1d0e5b7e6f68251130db1e76f90370c6a781edb0 Mon Sep 17 00:00:00 2001 From: RobbertHock Date: Thu, 5 Nov 2020 11:11:22 +0100 Subject: [PATCH 1/2] Upgrade SitecoreServices.SISnitch to Sitecore 10.0.0 - Upgraded to .NET framework 4.8 + completely cleaned up packages and then upgraded to Sitecore.Kernel 10.0.0 + Sitecore.Owin.Authentication 10.0.0 versions so that the NuGet package references are containing the correct versions belonging to Sitecore 10.0.0. --- .../Properties/AssemblyInfo.cs | 4 +- SitecoreServices.SISnitch/SISnitch.cs | 7 +- .../SitecoreServices.SISnitch.csproj | 121 ++++++++-------- SitecoreServices.SISnitch/app.config | 29 ++-- SitecoreServices.SISnitch/packages.config | 133 +++++++++--------- 5 files changed, 149 insertions(+), 145 deletions(-) diff --git a/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs b/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs index d48336f..eeeaa81 100644 --- a/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs +++ b/SitecoreServices.SISnitch/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SitecoreServices.SISnitch")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("A small utility for inspecting claims on a Sitecore instance that are coming from a Sitecore Identity Server.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SitecoreServices.SISnitch")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/SitecoreServices.SISnitch/SISnitch.cs b/SitecoreServices.SISnitch/SISnitch.cs index f404c69..7fcdddf 100644 --- a/SitecoreServices.SISnitch/SISnitch.cs +++ b/SitecoreServices.SISnitch/SISnitch.cs @@ -1,15 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Security.Claims; -using System.Text; -using System.Threading.Tasks; using Sitecore.Owin.Authentication.Services; -using Sitecore.Owin.Authentication.IdentityServer.Transformations; using Sitecore.Abstractions; using Sitecore.Diagnostics; -namespace SitecoreServices.SISnitch +namespace SitecoreServices.SISnitch { public class Snitch : Transformation { diff --git a/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj b/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj index 012b617..a1cf3d3 100644 --- a/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj +++ b/SitecoreServices.SISnitch/SitecoreServices.SISnitch.csproj @@ -9,8 +9,9 @@ Properties SitecoreServices.SISnitch SitecoreServices.SISnitch - v4.7.1 + v4.8 512 + true @@ -36,9 +37,6 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\IdentityModel.3.7.0\lib\net452\IdentityModel.dll - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -48,6 +46,12 @@ ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll + + ..\packages\Microsoft.Configuration.ConfigurationBuilders.Base.1.0.2\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.Base.dll + + + ..\packages\Microsoft.Configuration.ConfigurationBuilders.Environment.1.0.2\lib\Net471\Microsoft.Configuration.ConfigurationBuilders.Environment.dll + ..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll @@ -78,50 +82,50 @@ ..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.IdentityModel.Logging.5.2.2\lib\net451\Microsoft.IdentityModel.Logging.dll + + ..\packages\Microsoft.IdentityModel.JsonWebTokens.5.3.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - - ..\packages\Microsoft.IdentityModel.Protocols.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.dll + + ..\packages\Microsoft.IdentityModel.Logging.5.3.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll + + ..\packages\Microsoft.IdentityModel.Protocols.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.dll - - ..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.2.2\lib\net451\Microsoft.IdentityModel.Protocols.WsFederation.dll + + ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll - - ..\packages\Microsoft.IdentityModel.Tokens.5.2.2\lib\net451\Microsoft.IdentityModel.Tokens.dll + + ..\packages\Microsoft.IdentityModel.Protocols.WsFederation.5.3.0\lib\net461\Microsoft.IdentityModel.Protocols.WsFederation.dll - - ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.2.2\lib\net451\Microsoft.IdentityModel.Tokens.Saml.dll + + ..\packages\Microsoft.IdentityModel.Tokens.5.3.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - ..\packages\Microsoft.IdentityModel.Xml.5.2.2\lib\net451\Microsoft.IdentityModel.Xml.dll + + ..\packages\Microsoft.IdentityModel.Tokens.Saml.5.3.0\lib\net461\Microsoft.IdentityModel.Tokens.Saml.dll - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.IdentityModel.Xml.5.3.0\lib\net461\Microsoft.IdentityModel.Xml.dll - - ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\Microsoft.Owin.Security.ActiveDirectory.4.0.0\lib\net451\Microsoft.Owin.Security.ActiveDirectory.dll + + ..\packages\Microsoft.Owin.Security.4.1.0\lib\net45\Microsoft.Owin.Security.dll - - ..\packages\Microsoft.Owin.Security.Cookies.4.0.0\lib\net451\Microsoft.Owin.Security.Cookies.dll + + ..\packages\Microsoft.Owin.Security.ActiveDirectory.4.1.0\lib\net45\Microsoft.Owin.Security.ActiveDirectory.dll - - ..\packages\Microsoft.Owin.Security.Jwt.4.0.0\lib\net451\Microsoft.Owin.Security.Jwt.dll + + ..\packages\Microsoft.Owin.Security.Cookies.4.1.0\lib\net45\Microsoft.Owin.Security.Cookies.dll - - ..\packages\Microsoft.Owin.Security.OAuth.4.0.0\lib\net451\Microsoft.Owin.Security.OAuth.dll + + ..\packages\Microsoft.Owin.Security.Jwt.4.1.0\lib\net45\Microsoft.Owin.Security.Jwt.dll - - ..\packages\Microsoft.Owin.Security.OpenIdConnect.4.0.0\lib\net451\Microsoft.Owin.Security.OpenIdConnect.dll + + ..\packages\Microsoft.Owin.Security.OAuth.4.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll ..\packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45\Microsoft.Practices.EnterpriseLibrary.Common.dll @@ -153,41 +157,38 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\packages\Sitecore.Framework.Conditions.4.0.0\lib\netstandard2.0\Sitecore.Framework.Conditions.dll + + ..\packages\Sitecore.Framework.Conditions.4.2.0\lib\netstandard2.0\Sitecore.Framework.Conditions.dll - - ..\packages\Sitecore.Framework.Data.Blobs.1.0.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.dll + + ..\packages\Sitecore.Framework.Data.Blobs.1.1.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.dll - - ..\packages\Sitecore.Framework.Data.Blobs.Abstractions.1.0.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.Abstractions.dll + + ..\packages\Sitecore.Framework.Data.Blobs.Abstractions.1.1.0\lib\netstandard2.0\Sitecore.Framework.Data.Blobs.Abstractions.dll - - ..\packages\Sitecore.Kernel.9.3.0\lib\net471\Sitecore.Kernel.dll + + ..\packages\Sitecore.Kernel.10.0.0\lib\net48\Sitecore.Kernel.dll - - ..\packages\Sitecore.Logging.9.3.0\lib\net471\Sitecore.Logging.dll + + ..\packages\Sitecore.Logging.10.0.0\lib\net48\Sitecore.Logging.dll - - ..\packages\Sitecore.Logging.Client.9.3.0\lib\net471\Sitecore.Logging.Client.dll + + ..\packages\Sitecore.Logging.Client.10.0.0\lib\net48\Sitecore.Logging.Client.dll - ..\packages\Sitecore.Nexus.Consumption.1.1.1\lib\netstandard2.0\Sitecore.Nexus.Consumption.dll + ..\packages\Sitecore.Nexus.Consumption.1.2.0\lib\netstandard2.0\Sitecore.Nexus.Consumption.dll ..\packages\Sitecore.Nexus.Licensing.2.0.6\lib\netstandard2.0\Sitecore.Nexus.Licensing.dll - - ..\packages\Sitecore.Owin.9.3.0\lib\net471\Sitecore.Owin.dll + + ..\packages\Sitecore.Owin.10.0.0\lib\net48\Sitecore.Owin.dll - - ..\packages\Sitecore.Owin.Authentication.9.3.0\lib\net471\Sitecore.Owin.Authentication.dll + + ..\packages\Sitecore.Owin.Authentication.10.0.0\lib\net48\Sitecore.Owin.Authentication.dll - - ..\packages\Sitecore.Owin.Authentication.IdentityServer.9.3.0\lib\net471\Sitecore.Owin.Authentication.IdentityServer.dll - - - ..\packages\Sitecore.Zip.9.3.0\lib\net471\Sitecore.Zip.dll + + ..\packages\Sitecore.Zip.10.0.0\lib\net48\Sitecore.Zip.dll @@ -201,9 +202,10 @@ - - ..\packages\System.IdentityModel.Tokens.Jwt.5.2.2\lib\net451\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.5.3.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll + @@ -242,9 +244,6 @@ - - ..\packages\System.Text.Encodings.Web.4.4.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - diff --git a/SitecoreServices.SISnitch/app.config b/SitecoreServices.SISnitch/app.config index 6acda81..eb7e23d 100644 --- a/SitecoreServices.SISnitch/app.config +++ b/SitecoreServices.SISnitch/app.config @@ -1,5 +1,12 @@  + +
+ + + + + @@ -8,27 +15,27 @@ - + - + - + - + - + - + @@ -36,16 +43,20 @@ - + - + + + + + - \ No newline at end of file + diff --git a/SitecoreServices.SISnitch/packages.config b/SitecoreServices.SISnitch/packages.config index 2fbb624..0df8fd0 100644 --- a/SitecoreServices.SISnitch/packages.config +++ b/SitecoreServices.SISnitch/packages.config @@ -1,70 +1,69 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0cd475a3a6b1e47d3bb9e9df0dd5f5667a03aa8d Mon Sep 17 00:00:00 2001 From: RobbertHock Date: Thu, 5 Nov 2020 11:29:09 +0100 Subject: [PATCH 2/2] Upgrade SitecoreServices.SISnitch to Sitecore 10.0.0 - Added Sitecore 10.0.0 SI Snitch package + updated readme file with v10.0.0 info --- README.md | 3 ++- .../SI-Snitch for Sitecore-10.0.0.zip | Bin 0 -> 3979 bytes Sitecore Packages/SI-Snitch for Sitecore.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip diff --git a/README.md b/README.md index d853f47..ff85ea6 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ There are two ways to use this project: _Right click 'Save link as...' since GitHub doesn't respect url encoding, but markdown needs it for formatting in this readme ;-)_ - [SI-Snitch for Sitecore-9.3](./Sitecore%20Packages/SI-Snitch%20for%20Sitecore-9.3.zip) ( Sitecore 9.3) +- [SI-Snitch for Sitecore-10.0.0](./Sitecore%20Packages/SI-Snitch%20for%20Sitecore-10.0.0.zip) ( Sitecore 10.0.0) The above package can be installed through the normal Sitecore Installation Wizard. @@ -58,6 +59,6 @@ _Originally developed by:_ Derek Correia - Twitter: [@derekc](https://twitter.com/derekc), GitHub: https://github.com/derekcorreia -_Upgraded to support Sitecore 9.3_ +_Upgraded to support Sitecore 9.3 & Sitecore 10.0.0_ Robbert Hock - Twitter: [@kayeeNL](https://twitter.com/kayeenl), GitHub: https://github.com/KayeeNL diff --git a/Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip b/Sitecore Packages/SI-Snitch for Sitecore-10.0.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..5f0053b7531b06e3d720968d598b2b3daeac5b5c GIT binary patch literal 3979 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 literal 0 HcmV?d00001 diff --git a/Sitecore Packages/SI-Snitch for Sitecore.xml b/Sitecore Packages/SI-Snitch for Sitecore.xml index 3b5b2e6..45af944 100644 --- a/Sitecore Packages/SI-Snitch for Sitecore.xml +++ b/Sitecore Packages/SI-Snitch for Sitecore.xml @@ -3,7 +3,7 @@ SI-Snitch for Sitecore Derek Correia & Robbert Hock - 9.3 + 10.0.0