Skip to content

Commit

Permalink
Merge pull request #243 from WillStrohl/development
Browse files Browse the repository at this point in the history 
Syncing branches
  • Loading branch information
@WillStrohl
WillStrohl authored Feb 15, 2024
2 parents f346475 + c43bf6b commit 073b28e
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 40 deletions.
4 changes: 2 additions & 2 deletions Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("03.01.00")]
[assembly: AssemblyFileVersion("03.01.00")]
[assembly: AssemblyVersion("03.02.00")]
[assembly: AssemblyFileVersion("03.02.00")]
10 changes: 5 additions & 5 deletions Modules/WillStrohl.Injection/WillStrohl.Injection.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="WillStrohl.Injection" type="Module" version="03.01.00">
<package name="WillStrohl.Injection" type="Module" version="03.02.00">
<friendlyName>Content Injection</friendlyName>
<description>
<![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>]]>
Expand All @@ -16,7 +16,7 @@
<releaseNotes src="releasenotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="coreversion">09.10.00</dependency>
<dependency type="coreversion">09.13.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>03.01.00</version>
<version>03.02.00</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -126,7 +126,7 @@
<attributes>
<businessControllerClass>WillStrohl.Modules.Injection.Components.InjectionController, WillStrohl.Modules.Injection</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>03.00.00</upgradeVersionsList>
<upgradeVersionsList>03.00.00,03.02.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand All @@ -135,7 +135,7 @@
<assemblies>
<assembly>
<name>WillStrohl.Modules.Injection.dll</name>
<version>03.01.00</version>
<version>03.02.00</version>
<path>bin</path>
</assembly>
</assemblies>
Expand Down
4 changes: 2 additions & 2 deletions Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn
View file
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="WillStrohl.Injection_Symbols" type="Library" version="03.01.00">
<package name="WillStrohl.Injection_Symbols" type="Library" version="03.02.00">
<friendlyName>Content Injection Symbols</friendlyName>
<description>
<![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>]]>
Expand All @@ -17,7 +17,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="3.1.0">WillStrohl.Injection</dependency>
<dependency type="managedPackage" version="3.2.0">WillStrohl.Injection</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
47 changes: 27 additions & 20 deletions Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,29 @@
<PostBuildEvent />
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke, Version=9.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Core.9.10.0\lib\net45\DotNetNuke.dll</HintPath>
<Reference Include="DotNetNuke, Version=9.13.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Core.9.13.0\lib\net45\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.DependencyInjection, Version=9.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.DependencyInjection.9.10.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
<Reference Include="DotNetNuke.DependencyInjection, Version=9.13.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.DependencyInjection.9.13.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Instrumentation, Version=9.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Instrumentation.9.10.0\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
<Reference Include="DotNetNuke.Instrumentation, Version=9.13.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Instrumentation.9.13.0\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.log4net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Instrumentation.9.10.0\lib\net45\DotNetNuke.log4net.dll</HintPath>
<Reference Include="DotNetNuke.Log4Net, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Instrumentation.9.13.0\lib\net45\DotNetNuke.Log4Net.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web, Version=9.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.10.0\lib\net45\DotNetNuke.Web.dll</HintPath>
<Reference Include="DotNetNuke.Web, Version=9.13.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.13.0\lib\net45\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Client, Version=9.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.10.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
<Reference Include="DotNetNuke.Web.Client, Version=9.13.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.13.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.10.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
<HintPath>..\..\packages\DotNetNuke.Web.9.13.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Core.9.10.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\..\packages\DotNetNuke.Core.9.13.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
Expand All @@ -137,8 +137,8 @@
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
Expand All @@ -148,8 +148,8 @@
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
<Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Web">
<Name>System.Web</Name>
Expand All @@ -158,8 +158,8 @@
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
<Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
Expand Down Expand Up @@ -260,6 +260,13 @@
<Content Include="Providers\DataProviders\SqlDataProvider\02.00.02.SqlDataProvider" />
<None Include="packages.config" />
<Content Include="WillStrohl.Injection_Symbols.dnn" />
<Content Include="web.config" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
<None Include="web.Release.config">
<DependentUpon>web.config</DependentUpon>
</None>
<None Include="WillStrohl.Injection.dnn" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
18 changes: 9 additions & 9 deletions Modules/WillStrohl.Injection/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetNuke.Core" version="9.10.0" targetFramework="net472" />
<package id="DotNetNuke.DependencyInjection" version="9.10.0" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.10.0" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.10.0" targetFramework="net472" />
<package id="DotNetNuke.Web.Client" version="9.10.0" targetFramework="net472" />
<package id="DotNetNuke.WebApi" version="9.10.0" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net472" />
<package id="DotNetNuke.Core" version="9.13.0" targetFramework="net48" />
<package id="DotNetNuke.DependencyInjection" version="9.13.0" targetFramework="net48" />
<package id="DotNetNuke.Instrumentation" version="9.13.0" targetFramework="net48" />
<package id="DotNetNuke.Web" version="9.13.0" targetFramework="net48" />
<package id="DotNetNuke.Web.Client" version="9.13.0" targetFramework="net48" />
<package id="DotNetNuke.WebApi" version="9.13.0" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
</packages>
23 changes: 21 additions & 2 deletions Modules/WillStrohl.Injection/releasenotes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
<ul>
<li>David Poindexter, <a href="https://nvisionative.com/" target="_blank">nvisionative</a></li>
<li>Dan Rice, <a href="https://www.puresystems.co.uk/" target="_blank">Pure Systems</a></li>
<li>Matt Rutledge, <a href="https://beleivekids.com/" target="_blank">Believe Kids</a></li>
<li>Matt Rutledge, <a href="https://believekids.com/" target="_blank">Believe Kids</a></li>
<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
<li>Jeremy Farrance, <a href="https://accuraty.com/" target="_blank">Accuraty</a></li>
<li><a href="https://github.com/JohnRamminger" target="_blank">John Ramminger</a></li>
<li>(_2 private sponsors_)</li>
</ul>

<h3>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/How/People/Will-Strohl" target="_blank">Upendo Ventures</a></li>
<li>Ariel Blanco, <a href="https://upendoventures.com/What/CMS/DNN/Extensions" target="_blank">Upendo Ventures</a></li>
</ul>

<h3><strong>Release Note Prefixes</strong></h3>
Expand All @@ -35,6 +37,23 @@
</ul>
<hr />

<h3>Version 03.02.00</h3>
<h4>Enhancements</h4>
<ul>
<li>Updated to build against DNN Platform 9.13.0. (<a href="https://github.com/WillStrohl/dnnextensions/pulls/241" target="_blank">Issue 241</a>, thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!)</li>
<!--
<li>SI: (<a href="https://github.com/WillStrohl/dnnextensions/issues/" target="_blank">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>
-->
</ul>
<h4>Maintenence &amp Bug Fixes</h4>
<ul>
<li>None at this time.</li>
<!--
<li> (<a href="https://github.com/WillStrohl/dnnextensions/issues/" target="_blank">Issue </a>, thanks <a href="https://github.com/" target="_blank">@</a>!)</li>
-->
</ul>
<hr />

<h3>Version 03.01.00</h3>
<h4>Enhancements</h4>
<ul>
Expand Down

0 comments on commit 073b28e

Please sign in to comment.