Skip to content

Commit

Permalink
Merge pull request #2 from UpendoVentures/tasks/dnn-944
Browse files Browse the repository at this point in the history
Updated support to DNN 9.4.4+
  • Loading branch information
Will Strohl authored May 4, 2021
2 parents 721b0c6 + ba1dcad commit 2c39dbb
Show file tree
Hide file tree
Showing 112 changed files with 163 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Build/SolutionReferences.targets
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<DnnVersion>09.03.02</DnnVersion>
<DnnVersion>09.04.04</DnnVersion>
<HccVersion>03.02.01</HccVersion>
<ReferencesPath>..\..\References</ReferencesPath>
<DnnReferencePath>$(ReferencesPath)\DNN\$(DnnVersion)</DnnReferencePath>
Expand Down
6 changes: 3 additions & 3 deletions Libraries/RestartApp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Upendo")]
[assembly: AssemblyProduct("RestartApp Libraries Extension for DNN")]
[assembly: AssemblyCopyright("Copyright 2021 Upendo")]
[assembly: AssemblyCopyright("Copyright 2021 Upendo Ventures, LLC")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("01.00.00")]
[assembly: AssemblyFileVersion("01.00.00")]
[assembly: AssemblyVersion("01.01.00")]
[assembly: AssemblyFileVersion("01.01.00")]
14 changes: 14 additions & 0 deletions Libraries/RestartApp/RestartApp.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
/*
Copyright Upendo Ventures, LLC
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/

using DotNetNuke.Instrumentation;
using DotNetNuke.Services.Exceptions;
Expand Down
4 changes: 2 additions & 2 deletions Libraries/RestartApp/RestartApp.dnn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="Upendo.Libraries.RestartApp" type="Library" version="01.00.00">
<package name="Upendo.Libraries.RestartApp" type="Library" version="01.01.00">
<friendlyName>RestartApp Scheduled Job</friendlyName>
<description>
<![CDATA[<p>Allows a scheduled job to run that automatically restarts the application for your DNN website to clear cache and reload the site. This helps prevent issues on sites that don&#39;t recycle.</p>]]>
Expand All @@ -16,7 +16,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="CoreVersion">09.02.01</dependency>
<dependency type="CoreVersion">09.04.04</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
4 changes: 2 additions & 2 deletions Libraries/RestartApp/RestartApp_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="Upendo.Libraries.RestartApp" type="Library" version="01.00.00">
<package name="Upendo.Libraries.RestartApp" type="Library" version="01.01.00">
<friendlyName>RestartApp Library Symbols</friendlyName>
<description><![CDATA[Allows a scheduled job to run that automatically restarts the application for your DNN website to clear cache and reload the site. This helps prevent issues on sites that don&#39;t recycle.]]></description>
<owner>
Expand All @@ -14,7 +14,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="1.0.0">Upendo.Libraries.RestartApp</dependency>
<dependency type="managedPackage" version="1.1.0">Upendo.Libraries.RestartApp</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
18 changes: 9 additions & 9 deletions Libraries/RestartApp/Upendo.Libraries.RestartApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<DnnVersion>09.03.02</DnnVersion>
<DnnVersion>09.04.04</DnnVersion>
<HccVersion>03.02.01</HccVersion>
<ReferencesPath>..\..\References</ReferencesPath>
<DnnReferencePath>$(ReferencesPath)\DNN\$(DnnVersion)</DnnReferencePath>
Expand Down Expand Up @@ -38,14 +38,14 @@
</PropertyGroup>
<Import Project="..\..\Build\SolutionReferences.targets" />
<ItemGroup>
<PackageReference Include="DotNetNuke.Core" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.Instrumentation" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.Web" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.Web.Mvc" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.Web.Client" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.Web.Deprecated" Version="9.2.1.533" />
<PackageReference Include="DotNetNuke.WebApi" Version="9.2.1.533" />
<PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
<PackageReference Include="DotNetNuke.Core" Version="9.4.4" />
<PackageReference Include="DotNetNuke.Instrumentation" Version="9.4.4" />
<PackageReference Include="DotNetNuke.Web" Version="9.4.4" />
<PackageReference Include="DotNetNuke.Web.Mvc" Version="9.4.4" />
<PackageReference Include="DotNetNuke.Web.Client" Version="9.4.4" />
<PackageReference Include="DotNetNuke.Web.Deprecated" Version="9.4.4" />
<PackageReference Include="DotNetNuke.WebApi" Version="9.4.4" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions Libraries/RestartApp/releasenotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
</style>
<div class="uv-install-wrapper">
<h2>RestartApp Libraries Extension for DNN</h2>
<p>Version 01.01.00</p>
<ul>
<li>Raised support for DNN 09.04.04 and up.</li>
</ul>
<p>Version 01.00.00</p>
<ul>
<li>Initial release. Allows a scheduled job to run that automatically restarts the application for your DNN website to clear cache and reload the site. This helps prevent issues on sites that don&#39;t recycle.</li>
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ The previous version was not adhering to known best practices and as a result, i
The solution currently expects to be in the following environment, but you can update that to be any version you'd like, provided all extensions will be compatible:

- DNN: 09.04.04
- Hotcakes Commerce: 03.02.03
- SQL: 2014+

You should build and develop in a development environment that's separate from the local environment where you'd be testing. The examples below help to illustrate this...
Expand Down
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.EditBar.Library.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.EditBar.UI.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.Modules.Console.dll
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.AdminLogs.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Library.dll
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Pages.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Prompt.dll
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Roles.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Security.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Seo.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Servers.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Sites.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Themes.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.UI.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Dnn.PersonaBar.Users.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Log4Net.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Web.DDRMenu.dll
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Web.Mvc.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Web.Razor.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Web.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.Website.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/DotNetNuke.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/LiteDB.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/PetaPoco.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed References/DNN/09.03.02/Telerik.Web.UI.Skins.dll
Binary file not shown.
Binary file removed References/DNN/09.03.02/Telerik.Web.UI.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
47 changes: 47 additions & 0 deletions References/DNN/09.04.04/DotNetNuke.Abstractions.deps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": "cfe1dc2a80602aef150a12815387068463a61a0d"
},
"compilationOptions": {},
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"DotNetNuke.Abstractions/1.0.0": {
"dependencies": {
"NETStandard.Library": "2.0.3"
},
"runtime": {
"DotNetNuke.Abstractions.dll": {}
}
},
"Microsoft.NETCore.Platforms/1.1.0": {},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
}
}
},
"libraries": {
"DotNetNuke.Abstractions/1.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"path": "microsoft.netcore.platforms/1.1.0",
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
},
"NETStandard.Library/2.0.3": {
"type": "package",
"serviceable": true,
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
}
}
}
Binary file not shown.
81 changes: 81 additions & 0 deletions References/DNN/09.04.04/DotNetNuke.DependencyInjection.deps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"runtimeTarget": {
"name": ".NETStandard,Version=v2.0/",
"signature": "0c3829ba1182516385f75ddd572b350269a1a3d5"
},
"compilationOptions": {},
"targets": {
".NETStandard,Version=v2.0": {},
".NETStandard,Version=v2.0/": {
"DotNetNuke.DependencyInjection/1.0.0": {
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "2.1.1",
"NETStandard.Library": "2.0.3"
},
"runtime": {
"DotNetNuke.DependencyInjection.dll": {}
}
},
"Microsoft.Extensions.DependencyInjection/2.1.1": {
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1"
},
"runtime": {
"lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll": {
"assemblyVersion": "2.1.1.0",
"fileVersion": "2.1.1.18157"
}
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
"runtime": {
"lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
"assemblyVersion": "2.1.1.0",
"fileVersion": "2.1.1.18157"
}
}
},
"Microsoft.NETCore.Platforms/1.1.0": {},
"NETStandard.Library/2.0.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.0"
}
}
}
},
"libraries": {
"DotNetNuke.DependencyInjection/1.0.0": {
"type": "project",
"serviceable": false,
"sha512": ""
},
"Microsoft.Extensions.DependencyInjection/2.1.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==",
"path": "microsoft.extensions.dependencyinjection/2.1.1",
"hashPath": "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512"
},
"Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": {
"type": "package",
"serviceable": true,
"sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==",
"path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1",
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
"path": "microsoft.netcore.platforms/1.1.0",
"hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
},
"NETStandard.Library/2.0.3": {
"type": "package",
"serviceable": true,
"sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
"path": "netstandard.library/2.0.3",
"hashPath": "netstandard.library.2.0.3.nupkg.sha512"
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.Web.Mvc.dll
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.Web.Razor.dll
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.Web.dll
Binary file not shown.
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.Website.dll
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.dll
Binary file not shown.
Binary file added References/DNN/09.04.04/DotNetNuke.log4net.dll
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file added References/DNN/09.04.04/PetaPoco.dll
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 2c39dbb

Please sign in to comment.