Skip to content

Commit

Permalink
Merge pull request #186 from hismightiness/development
Browse files Browse the repository at this point in the history
Syncing dev w/ main
  • Loading branch information
Will Strohl authored Nov 24, 2020
2 parents 4ae921c + d4f148e commit f944270
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 52 deletions.
1 change: 1 addition & 0 deletions Modules/WillStrohl.Injection/03.00.00.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DesktopModules/WillStrohl.Injection/Images/injection.png
Binary file removed Modules/WillStrohl.Injection/Images/injection.png
Binary file not shown.
Binary file added Modules/WillStrohl.Injection/Images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Modules/WillStrohl.Injection/Module.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
<FullModulePath>$(WebsitePath)\DesktopModules\$(ModulePath)</FullModulePath>
</PropertyGroup>
<Import Project="$(BuildScriptsPath)\ModulePackageSource.Targets" />
<Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;PackageModule">
</Target>
<Target Name="GetFiles">
Expand Down
12 changes: 6 additions & 6 deletions Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
[assembly: AssemblyTitle("WillStrohl.Injection")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Will Strohl")]
[assembly: AssemblyProduct("http://www.willstrohl.com")]
[assembly: AssemblyCopyright("Copyright 2009-2016 Will Strohl")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCompany("Upendo Ventures, LLC")]
[assembly: AssemblyProduct("https://upendoventures.com")]
[assembly: AssemblyCopyright("Copyright Upendo Ventures, LLC")]
[assembly: AssemblyTrademark("Upendo Ventures, LLC")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
Expand All @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("02.00.02")]
[assembly: AssemblyFileVersion("02.00.02")]
[assembly: AssemblyVersion("03.00.00")]
[assembly: AssemblyFileVersion("03.00.00")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Release Notes:

*/

IF NOT EXISTS (SELECT 1 FROM {databaseOwner}[{objectQualifier}syscolumns] c JOIN {databaseOwner}[{objectQualifier}sysobjects] o ON c.[id] = o.[id] WHERE c.[name] = N'custom_properties' AND o.[name] = '{objectQualifier}wns_inj_injection')
IF NOT EXISTS (SELECT 1 FROM {databaseOwner}[syscolumns] c JOIN {databaseOwner}[sysobjects] o ON c.[id] = o.[id] WHERE c.[name] = N'custom_properties' AND o.[name] = '{objectQualifier}wns_inj_injection')
ALTER TABLE {databaseOwner}[{objectQualifier}wns_inj_injection]
ADD [custom_properties] NVARCHAR(MAX) NULL;
GO
Expand Down
25 changes: 15 additions & 10 deletions Modules/WillStrohl.Injection/WillStrohl.Injection.dnn
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="WillStrohl.Injection" type="Module" version="02.00.02">
<package name="WillStrohl.Injection" type="Module" version="03.00.00">
<friendlyName>Content Injection</friendlyName>
<description>
<![CDATA[<p>This is a content injection module, written by Will Strohl. Its purpose is to allow you to inject markup into the header or footer of the page.</p>]]>
<![CDATA[<p>This is a content injection module, written by Upendo Ventures. Its purpose is to allow you to inject markup into the header, body, and footer of the page.</p>]]>
</description>
<iconFile>DesktopModules/WillStrohl.Injection/Images/injection.png</iconFile>
<iconFile>DesktopModules/WillStrohl.Injection/Images/logo.png</iconFile>
<owner>
<name>Will Strohl</name>
<organization>Will Strohl</organization>
<url><![CDATA[<a href="http://hismightiness.github.io/dnnextensions/" target="_blank">http://hismightiness.github.io/dnnextensions/</a>]]></url>
<email><![CDATA[<a href="mailto:will.strohl@gmail.com" target="_blank">[email protected]</a>]]></email>
<organization>Upendo Ventures, LLC</organization>
<url>https://upendoventures.com</url>
<email>solutions@upendoventures.com</email>
</owner>
<license src="license.txt" />
<releaseNotes src="releasenotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="coreversion">07.04.02</dependency>
<dependency type="coreversion">09.04.00</dependency>
</dependencies>
<components>
<component type="Script">
Expand Down Expand Up @@ -80,7 +80,7 @@
<script type="UnInstall">
<path>Providers\DataProviders\SqlDataProvider</path>
<name>Uninstall.SqlDataProvider</name>
<version>02.00.02</version>
<version>03.00.00</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -126,19 +126,21 @@
<attributes>
<businessControllerClass>WillStrohl.Modules.Injection.Components.InjectionController, WillStrohl.Modules.Injection</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList />
<upgradeVersionsList>03.00.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>

<component type="Assembly">
<assemblies>
<assembly>
<name>WillStrohl.Modules.Injection.dll</name>
<version>02.00.02</version>
<version>03.00.00</version>
<path>bin</path>
</assembly>
</assemblies>
</component>

<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules\WillStrohl.Injection</basePath>
Expand All @@ -147,6 +149,9 @@
</resourceFile>
</resourceFiles>
</component>

<component type="Cleanup" version="03.00.00" fileName="03.00.00.txt" />

</components>
</package>
</packages>
Expand Down
31 changes: 31 additions & 0 deletions Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="WillStrohl.Injection_Symbols" type="Library" version="03.00.00">
<friendlyName>Content Injection Symbols</friendlyName>
<![CDATA[<p>This is a content injection module, written by Upendo Ventures. Its purpose is to allow you to inject markup into the header, body, and footer of the page.</p>]]>
<owner>
<name>Will Strohl</name>
<organization>Upendo Ventures, LLC</organization>
<url>https://upendoventures.com</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="3.0.0">WillStrohl.Injection</dependency>
</dependencies>
<components>
<component type="ResourceFile">
<resourceFiles>
<basePath></basePath>
<resourceFile>
<name>Resources.zip</name>
</resourceFile>
</resourceFiles>
</component>
</components>
</package>
</packages>
</dotnetnuke>
25 changes: 13 additions & 12 deletions Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<SccLocalPath />
<SccAuxPath />
<SccProvider />
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
Expand Down Expand Up @@ -105,25 +105,22 @@
<PostBuildEvent />
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke, Version=7.2.0.607, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Website\bin\DotNetNuke.dll</HintPath>
<Private>False</Private>
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Website\bin\DotNetNuke.Web.dll</HintPath>
<Private>False</Private>
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Client, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Website\bin\DotNetNuke.Web.Client.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Website\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System">
Expand Down Expand Up @@ -211,9 +208,11 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="03.00.00.txt" />
<Content Include="App_LocalResources\EditInjections.ascx.resx" />
<Content Include="App_LocalResources\ViewInjection.ascx.resx" />
<Content Include="EditInjections.ascx" />
<Content Include="Images\logo.png" />
<Content Include="License.txt" />
<Content Include="Module.build">
<SubType>Designer</SubType>
Expand All @@ -235,6 +234,8 @@
<ItemGroup>
<Content Include="Providers\DataProviders\SqlDataProvider\02.00.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\02.00.02.SqlDataProvider" />
<None Include="packages.config" />
<Content Include="WillStrohl.Injection_Symbols.dnn" />
<None Include="WillStrohl.Injection.dnn" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
5 changes: 5 additions & 0 deletions Modules/WillStrohl.Injection/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net451" />
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net451" />
</packages>
55 changes: 33 additions & 22 deletions Modules/WillStrohl.Injection/releasenotes.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
<h3>Version 02.00.02</h3>
<p><strong>Date Released:</strong> 06/30/2016</p>
<ul>
<li>Feature: Increased minimum supported version to DNN 7.4.2</li>
<li>Bug: Fixed Azure installation issue</li>
</ul>
<style>
div.uv-install-wrapper h3, div.uv-install-wrapper h4, div.uv-install-wrapper p, div.uv-install-wrapper hr, div.uv-install-wrapper ul { margin-bottom: 0.5em; }
div.uv-install-wrapper ul { padding-left: 2em; }
.muy-importante { color:red;font-weight:bold; }
</style>
<div class="uv-install-wrapper">
<h3>Version 03.00.00</h3>

<p class="muy-importante">The release notes continue after the Sponsors and Code Contributors below.</p>

<h3>Sponsors</h3>
<p>Open-source is not free. We're so GRATEFUL for the following people/organizations for <a href="https://github.com/sponsors/hismightiness" target="_blank">sponsoring developers</a> to work on this release!</p>
<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/hismightiness" target="_blank">Please consider sponsoring</a> any amount.</p>
<p>THANK YOU to the following rockstars!</p>
<ul>
<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
<li>Dan Rice, <a href="https://www.puresystems.co.uk/" target="_blank">Pure Systems</a></li>
<li>David Poindexter, <a href="https://nvisionative.com/" target="_blank">nvisionative</a></li>
<li>Matt Rutledge, <a href="https://beleivekids.com/" target="_blank">Believe Kids</a></li>
</ul>

<h3>Code Contributors</h3>
<p>THANK YOU to the following community members for participating in this release!</p>
<ul>
<li>Will Strohl, <a href="https://upendoventures.com/What/CMS/DNN" target="_blank">Upendo Ventures</a></li>
</ul>

<h3>Version 02.00.01</h3>
<p><strong>Date Released:</strong> 09/18/2015</p>
<ul>
<li>Bug: Updated a typo in the manifest file that caused exceptions in the event log</li>
<li>Bug: Added missing reference to get rid of old SqlDataProvider DLL</li>
</ul>

<h3>Version 02.00.00</h3>
<p><strong>Date Released:</strong> 09/06/2015</p>
<ul>
<li>Feature: Specify and use CRM features for JavaScript/CSS files</li>
<li>Feature: Display auditing history for injections</li>
<li>Feature: Display injection type in grid listing</li>
<li>Feature: Converted project to C#</li>
<li>Bug: Unable to install in Windows Azure</li>
</ul>
<p><strong>Date Released:</strong> 11/24/2020</p>
<ul>
<li>Increased minimum supported version to DNN 9.4.0, Thanks <a href="https://github.com/hismightiness" target="_blank">@hismightiness</a>!</li>
<li>Now generating and releasing a Symbols package, Thanks <a href="https://github.com/hismightiness" target="_blank">@hismightiness</a>!</li>
<li>Fixed install/upgrade issue with SQL provider in version 2.0, Thanks <a href="https://github.com/hismightiness" target="_blank">@hismightiness</a>, <a href="https://github.com/MaiklT" target="_blank">@MaiklT</a>, and <a href="https://github.com/moorecreative" target="_blank">@moorecreative</a>!</li>
</ul>
</div>

0 comments on commit f944270

Please sign in to comment.