From 289a664ffb6b7c61607a251f372791b30d60247f Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:08:27 -0600 Subject: [PATCH 01/25] Update MyCompany.MyPaymentMethod.csproj --- DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj b/DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj index 4c3f7771..fd5ecd57 100644 --- a/DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj +++ b/DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj @@ -76,10 +76,8 @@ - - False - ..\References\System.Web.Mvc.dll - False + + ..\..\packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll From d281de91c0662f9f9442b30ea8aa11f270b26369 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:08:35 -0600 Subject: [PATCH 02/25] Update MyCompany.MyViewSet.csproj --- DevSamples/MyViewSet/MyCompany.MyViewSet.csproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DevSamples/MyViewSet/MyCompany.MyViewSet.csproj b/DevSamples/MyViewSet/MyCompany.MyViewSet.csproj index b55e5bb0..43afc781 100644 --- a/DevSamples/MyViewSet/MyCompany.MyViewSet.csproj +++ b/DevSamples/MyViewSet/MyCompany.MyViewSet.csproj @@ -72,10 +72,8 @@ - - False - ..\References\System.Web.Mvc.dll - False + + ..\..\packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll From e9b293021dbe21adc91a643905ad5a225fc26b68 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:08:49 -0600 Subject: [PATCH 03/25] Update App.Config --- Libraries/Hotcakes.Commerce.Dnn/App.Config | 29 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Libraries/Hotcakes.Commerce.Dnn/App.Config b/Libraries/Hotcakes.Commerce.Dnn/App.Config index e6f15a71..cb5a9b4e 100644 --- a/Libraries/Hotcakes.Commerce.Dnn/App.Config +++ b/Libraries/Hotcakes.Commerce.Dnn/App.Config @@ -29,7 +29,7 @@ - + @@ -37,15 +37,15 @@ - + - + - + @@ -59,6 +59,25 @@ + + + + + + + + + + + + + + + + - + + + + \ No newline at end of file From a953318070f8955f9a12ee4cdfdfa61d52f5c624 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:08:55 -0600 Subject: [PATCH 04/25] Update Hotcakes.Commerce.Dnn.csproj --- .../Hotcakes.Commerce.Dnn.csproj | 118 +++++++++++++----- 1 file changed, 86 insertions(+), 32 deletions(-) diff --git a/Libraries/Hotcakes.Commerce.Dnn/Hotcakes.Commerce.Dnn.csproj b/Libraries/Hotcakes.Commerce.Dnn/Hotcakes.Commerce.Dnn.csproj index 23a3a75f..428647a6 100644 --- a/Libraries/Hotcakes.Commerce.Dnn/Hotcakes.Commerce.Dnn.csproj +++ b/Libraries/Hotcakes.Commerce.Dnn/Hotcakes.Commerce.Dnn.csproj @@ -1,5 +1,6 @@  + Debug @@ -16,6 +17,8 @@ SAK SAK + + true @@ -47,77 +50,120 @@ ..\..\References\Dnn\Dnn.PersonaBar.Library.dll - - ..\..\References\Dnn\DotNetNuke.dll + + ..\..\packages\DotNetNuke.Core.9.11.0\lib\net45\DotNetNuke.dll - - ..\..\References\Dnn\DotNetNuke.Abstractions.dll + + ..\..\packages\DotNetNuke.Abstractions.9.11.0\lib\netstandard2.0\DotNetNuke.Abstractions.dll - - ..\..\References\Dnn\DotNetNuke.DependencyInjection.dll + + ..\..\packages\DotNetNuke.DependencyInjection.9.11.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll ..\..\References\Dnn\DotNetNuke.HttpModules.dll - - ..\..\References\Dnn\DotNetNuke.Instrumentation.dll + + ..\..\packages\DotNetNuke.Instrumentation.9.11.0\lib\net45\DotNetNuke.Instrumentation.dll - - ..\..\References\Dnn\DotNetNuke.Log4Net.dll + + ..\..\packages\DotNetNuke.Instrumentation.9.11.0\lib\net45\DotNetNuke.log4net.dll - - ..\..\References\Dnn\DotNetNuke.Web.dll + + ..\..\packages\DotNetNuke.Web.9.11.0\lib\net45\DotNetNuke.Web.dll - - ..\..\References\Dnn\DotNetNuke.Web.Client.dll + + ..\..\packages\DotNetNuke.Web.Client.9.11.0\lib\net45\DotNetNuke.Web.Client.dll - - False - ..\..\References\Dnn\DotNetNuke.WebUtility.dll + + ..\..\packages\DotNetNuke.Web.9.11.0\lib\net45\DotNetNuke.WebUtility.dll - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True + ..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True + ..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll ..\..\References\Hcc\Hotcakes.Common.Dnn.dll + + ..\..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll + + + ..\..\packages\DotNetNuke.Core.9.11.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\..\packages\MiniProfiler.3.1.1.140\lib\net40\MiniProfiler.dll ..\..\packages\MiniProfiler.EF6.3.0.11\lib\net40\MiniProfiler.EntityFramework6.dll - - ..\..\References\Dnn\ICSharpCode.SharpZipLib.dll + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + - - False - ..\..\References\Dnn\System.Web.Http.dll + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.3.0\lib\net45\System.Web.Http.dll False ..\..\References\Dnn\System.Web.Http.WebHost.dll - - False - ..\..\References\Dnn\System.Web.Mvc.dll + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.9\lib\net45\System.Web.Mvc.dll - - False - ..\..\References\Dnn\System.Web.WebPages.dll + + ..\..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll @@ -270,6 +316,14 @@ + + + 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}. + + + + + -
+
- + - + - + + + + \ No newline at end of file From 2096c581946107ae45b02ccfa80f256d3eaaf952 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:12:52 -0600 Subject: [PATCH 17/25] Update Hotcakes.Web.csproj --- Libraries/Hotcakes.Web/Hotcakes.Web.csproj | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Libraries/Hotcakes.Web/Hotcakes.Web.csproj b/Libraries/Hotcakes.Web/Hotcakes.Web.csproj index decce4c2..16dff494 100644 --- a/Libraries/Hotcakes.Web/Hotcakes.Web.csproj +++ b/Libraries/Hotcakes.Web/Hotcakes.Web.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -17,6 +18,8 @@ SAK SAK + + true @@ -47,12 +50,10 @@ ..\..\References\Misc\DocumentFormat.OpenXml.Extensions.dll - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True + ..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True + ..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll ..\..\packages\ImageResizer.3.4.2\lib\ImageResizer.dll @@ -175,6 +176,14 @@ + + + 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}. + + + + + - + @@ -250,18 +250,10 @@ - - - - - - - - @@ -274,10 +266,6 @@ - - - - @@ -348,6 +336,18 @@ + + + + + + + + + + + + From 9d2c03558c5b14f12daa7a24d9c4e7cbbb5ee6c1 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:14:10 -0600 Subject: [PATCH 23/25] Update packages.config --- .../DesktopModules/Hotcakes/packages.config | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Website/DesktopModules/Hotcakes/packages.config b/Website/DesktopModules/Hotcakes/packages.config index 8ef01ad0..57b7065f 100644 --- a/Website/DesktopModules/Hotcakes/packages.config +++ b/Website/DesktopModules/Hotcakes/packages.config @@ -1,20 +1,23 @@  - - - - - + + + + + + + + + - - - + + \ No newline at end of file From 910152fab58689eeb35c9549fa5afa374da5ff32 Mon Sep 17 00:00:00 2001 From: ArielBlanco Date: Tue, 17 Dec 2024 20:14:15 -0600 Subject: [PATCH 24/25] Update Hotcakes.Modules.csproj --- .../Hotcakes/Hotcakes.Modules.csproj | 99 ++++++++++++++++--- 1 file changed, 83 insertions(+), 16 deletions(-) diff --git a/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj b/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj index 0e092603..b0537a59 100644 --- a/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj +++ b/Website/DesktopModules/Hotcakes/Hotcakes.Modules.csproj @@ -1,5 +1,6 @@  + @@ -99,26 +100,26 @@ ..\..\..\References\Dnn\DotNetNuke.WebUtility.dll - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True + ..\..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True + ..\..\..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll False ..\..\..\References\Hcc\Hotcakes.Common.Dnn.dll - - ..\..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll - True + + ..\..\..\packages\log4net.3.0.3\lib\net462\log4net.dll False ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\..\..\packages\MiniProfiler.3.1.1.140\lib\net40\MiniProfiler.dll @@ -161,20 +162,29 @@ + + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll + False ..\..\..\References\Dnn\System.Web.Http.dll - - False - ..\..\..\packages\Microsoft.AspNet.Mvc.5.1.0\lib\net45\System.Web.Mvc.dll - True - - - False - ..\..\..\References\Dnn\System.Web.WebPages.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.9\lib\net45\System.Web.Mvc.dll + + + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll + + + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll + + + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll @@ -216,6 +226,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + admin.css @@ -964,6 +1015,17 @@ + + + + + + + + + + + @@ -3789,6 +3851,8 @@ + + web.config @@ -4257,7 +4321,7 @@ xcopy "$(TargetDir)*" "$(SolutionDir)Website\bin\" /y /s /e xcopy "$(SolutionDir)References\Dnn" "$(SolutionDir)Website\bin\" /y /s /e xcopy "$(SolutionDir)References\Dev" "$(SolutionDir)Website\bin\" /y /s /e -xcopy "$(SolutionDir)packages\EntityFramework.6.4.4\lib\net40" "$(SolutionDir)Website\bin\" /y /s /e +xcopy "$(SolutionDir)packages\EntityFramework.6.5.1\lib\net40" "$(SolutionDir)Website\bin\" /y /s /e @@ -4266,7 +4330,10 @@ xcopy "$(SolutionDir)packages\EntityFramework.6.4.4\lib\net40" "$(SolutionDir)We + + +