From 1e4324e013f1a4b3b94d62f537e4e1a6243192b8 Mon Sep 17 00:00:00 2001 From: Sam Gooch Date: Fri, 10 Jan 2020 15:49:18 +0000 Subject: [PATCH 1/4] Upgrade package to Umbraco v8 --- .../Cogworks.SiteLock.csproj | 265 +++++++++++------- .../Cogworks.SiteLock.nuspec | 2 +- .../Authentication/AuthenticationChecker.cs | 2 +- src/Cogworks.SiteLock/app.config | 21 +- src/Cogworks.SiteLock/packages.config | 76 +++-- .../Cogworks.SiteLock.Test.csproj | 40 ++- src/Tests/Cogworks.SiteLock.Test/app.config | 21 +- .../Cogworks.SiteLock.Test/packages.config | 19 +- 8 files changed, 278 insertions(+), 168 deletions(-) diff --git a/src/Cogworks.SiteLock/Cogworks.SiteLock.csproj b/src/Cogworks.SiteLock/Cogworks.SiteLock.csproj index cd29ab1..3a68119 100644 --- a/src/Cogworks.SiteLock/Cogworks.SiteLock.csproj +++ b/src/Cogworks.SiteLock/Cogworks.SiteLock.csproj @@ -9,9 +9,11 @@ Properties Cogworks.SiteLock Cogworks.SiteLock - v4.5.2 + v4.7.2 512 + + true @@ -46,164 +48,208 @@ Designer - + + Designer + Designer - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + ..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll + + + ..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll + + + ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + ..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll + + ..\packages\Examine.1.0.0\lib\net452\Examine.dll - - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + + ..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll + + ..\packages\ImageProcessor.2.7.0.100\lib\net452\ImageProcessor.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\controls.dll + + ..\packages\LightInject.5.4.0\lib\net46\LightInject.dll - - ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + + ..\packages\LightInject.Annotation.1.1.0\lib\net46\LightInject.Annotation.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\Examine.dll + + ..\packages\LightInject.Mvc.2.0.0\lib\net46\LightInject.Mvc.dll - - ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + ..\packages\LightInject.Web.2.0.0\lib\net46\LightInject.Web.dll - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + ..\packages\LightInject.WebApi.2.0.0\lib\net46\LightInject.WebApi.dll - - ..\packages\ImageProcessor.1.9.0.0\lib\ImageProcessor.dll + + ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - - ..\packages\ImageProcessor.Web.3.2.3.0\lib\net45\ImageProcessor.Web.dll + + ..\packages\Markdown.2.2.1\lib\net451\Markdown.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll + + ..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll + + ..\packages\Microsoft.AspNet.Identity.Owin.2.2.2\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + + ..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.ApplicationBlocks.Data.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\Microsoft.Web.Helpers.dll + + ..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll + + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + + + ..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll + + + ..\packages\Microsoft.Owin.Security.Cookies.4.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll + + + ..\packages\Microsoft.Owin.Security.OAuth.4.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.0\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + ..\packages\MiniProfiler.4.0.138\lib\net461\MiniProfiler.dll - - ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + + ..\packages\MiniProfiler.Shared.4.0.138\lib\net461\MiniProfiler.Shared.dll - - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\NPoco.3.9.4\lib\net45\NPoco.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\SQLCE4Umbraco.dll + + ..\packages\Owin.1.0\lib\net40\Owin.dll - - - ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.dll - True + + ..\packages\Semver.2.0.4\lib\net452\Semver.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\System.Data.SqlServerCe.Entity.dll - True + + ..\packages\Serilog.2.8.0\lib\net46\Serilog.dll - - - ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + ..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll - - - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - True + + ..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll + + ..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll + + ..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll - - ..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll + + ..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll - - ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll - True + + ..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - True + + ..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - True + + ..\packages\Superpower.2.0.0\lib\net45\Superpower.dll - - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll - True + + + + + + + ..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.dll - - - - ..\packages\UmbracoCms.Core.7.1.2\lib\TidyNet.dll + + ..\packages\Umbraco.SqlServerCE.4.0.0.1\lib\net472\System.Data.SqlServerCe.Entity.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll + + + + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + + + + + + + + + ..\packages\System.Threading.Tasks.Dataflow.4.9.0\lib\netstandard2.0\System.Threading.Tasks.Dataflow.dll + + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.DataLayer.dll + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.editorControls.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.MacroEngines.dll + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Web.UI.dll + + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.XmlSerializers.dll + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\UmbracoExamine.dll + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - ..\packages\UmbracoCms.Core.7.1.2\lib\UrlRewritingNet.UrlRewriter.dll + + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + + + + + ..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll + + + ..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll + + + ..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll + + + ..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll @@ -221,6 +267,13 @@ xcopy /S /H /Y /I "$(ProjectDir)bin\Debug\*.*" "$(ProjectDir)..\Website\bin\" + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +