Skip to content

Commit

Permalink
Merge pull request #256 from WillStrohl/development
Browse files Browse the repository at this point in the history
Sync dev and main
  • Loading branch information
WillStrohl authored Oct 31, 2024
2 parents f114d04 + 33c5e6f commit 78d2640
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 139 deletions.
32 changes: 16 additions & 16 deletions Modules/WillStrohl.OpenGraph/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ Imports System.Runtime.InteropServices
<Assembly: CLSCompliant(True)>

'The following GUID is for the ID of the typelib if this project is exposed to COM
<Assembly: Guid("39E40A3E-FF34-4DEC-86A3-CEA07CFC4D56")>

' Version information for an assembly consists of the following four values:
'
' Major Version
' Minor Version
' Build Number
' Revision
'
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:

<Assembly: AssemblyVersion("02.00.00")>

<Assembly: ComVisibleAttribute(False)>
<Assembly: AssemblyFileVersion("02.00.00")>
<Assembly: Guid("39E40A3E-FF34-4DEC-86A3-CEA07CFC4D56")>

' Version information for an assembly consists of the following four values:
'
' Major Version
' Minor Version
' Build Number
' Revision
'
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:

<Assembly: AssemblyVersion("02.01.00")>

<Assembly: ComVisibleAttribute(False)>
<Assembly: AssemblyFileVersion("02.01.00")>
21 changes: 17 additions & 4 deletions Modules/WillStrohl.OpenGraph/WillStrohl.Modules.OpenGraph.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,11 @@
<Reference Include="DotNetNuke.log4net, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Instrumentation.9.11.0\lib\net45\DotNetNuke.log4net.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web">
<HintPath>..\..\References\DotNetNuke\DotNetNuke.Web.dll</HintPath>
<Reference Include="DotNetNuke.Web, Version=9.11.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.11.0\lib\net45\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\DotNetNuke.Web.9.11.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.11.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
Expand All @@ -129,6 +132,9 @@
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<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>
</Reference>
Expand All @@ -137,13 +143,20 @@
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<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>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<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.Web.Services" />
<Reference Include="System.Xml">
<Name>System.XML</Name>
Expand Down Expand Up @@ -230,7 +243,7 @@
</ItemGroup>
<ItemGroup />
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
Expand All @@ -250,6 +263,6 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="Module.Build" />
</Project>
220 changes: 110 additions & 110 deletions Modules/WillStrohl.OpenGraph/WillStrohl.OpenGraph.dnn
Original file line number Diff line number Diff line change
@@ -1,111 +1,111 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="WillStrohl.OpenGraph" type="Module" version="02.00.00">
<friendlyName>Open Graph Protocol</friendlyName>
<description>
<![CDATA[<p>This module allows you to quickly and easily add the Open Graph Protocol markup to your website. Doing so makes you compatible with sharing content with sites like Facebook.</p>]]>
</description>
<iconFile>DesktopModules/WillStrohl.OpenGraph/Images/logo.png</iconFile>
<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="coreversion">09.11.00</dependency>
</dependencies>
<components>
<component type="Module">
<desktopModule>
<moduleName>WillStrohl.OpenGraph</moduleName>
<foldername>WillStrohl.OpenGraph</foldername>
<businessControllerClass>WillStrohl.Modules.OpenGraph.OpenGraphController, WillStrohl.Modules.OpenGraph</businessControllerClass>
<supportedFeatures/>
<moduleDefinitions>
<moduleDefinition>
<friendlyName>Open Graph Protocol</friendlyName>
<defaultCacheTime>-1</defaultCacheTime>
<moduleControls>
<moduleControl>
<controlKey />
<controlSrc>DesktopModules/WillStrohl.OpenGraph/Default.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle />
<controlType>View</controlType>
<iconFile />
<helpUrl />
</moduleControl>
<moduleControl>
<controlKey>Edit</controlKey>
<controlSrc>DesktopModules/WillStrohl.OpenGraph/Settings.ascx</controlSrc>
<supportsPartialRendering>True</supportsPartialRendering>
<supportsPopUps>True</supportsPopUps>
<controlTitle />
<controlType>Edit</controlType>
<iconFile />
<helpUrl />
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
</desktopModule>
<eventMessage>
<processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
<processorCommand>UpgradeModule</processorCommand>
<attributes>
<businessControllerClass>WillStrohl.Modules.OpenGraph.OpenGraphController, WillStrohl.Modules.OpenGraph</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>02.00.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
<component type="Assembly">
<assemblies>
<assembly>
<name>WillStrohl.Modules.OpenGraph.dll</name>
<version>02.00.00</version>
<path>bin</path>
</assembly>
</assemblies>
</component>
<component type="File">
<files>
<basePath>DesktopModules\WillStrohl.OpenGraph</basePath>
<file>
<name>WillStrohl.OpenGraph.dnn</name>
</file>
</files>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules\WillStrohl.OpenGraph</basePath>
<resourceFile>
<name>Resources.zip</name>
</resourceFile>
</resourceFiles>
</component>
<component type="Config">
<config>
<configFile>web.config</configFile>
<install>
<configuration>
<nodes/>
</configuration>
</install>
<uninstall>
<configuration>
<nodes>
<node path="/configuration/system.webServer/modules/add[@name = 'willStrohlOpenGraphRewriter']" action="remove" />
</nodes>
</configuration>
</uninstall>
</config>
</component>
</components>
</package>
</packages>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="WillStrohl.OpenGraph" type="Module" version="02.01.00">
<friendlyName>Open Graph Protocol</friendlyName>
<description>
<![CDATA[<p>This module allows you to quickly and easily add the Open Graph Protocol markup to your website. Doing so makes you compatible with sharing content with sites like Facebook.</p>]]>
</description>
<iconFile>DesktopModules/WillStrohl.OpenGraph/Images/logo.png</iconFile>
<owner>
<name>Will Strohl</name>
<organization>Upendo Ventures, LLC</organization>
<url>https://upendoventures.com/What/CMS/DNN</url>
<email>[email protected]</email>
</owner>
<license src="license.txt" />
<releaseNotes src="releasenotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="coreversion">09.11.00</dependency>
</dependencies>
<components>
<component type="Module">
<desktopModule>
<moduleName>WillStrohl.OpenGraph</moduleName>
<foldername>WillStrohl.OpenGraph</foldername>
<businessControllerClass>WillStrohl.Modules.OpenGraph.OpenGraphController, WillStrohl.Modules.OpenGraph</businessControllerClass>
<supportedFeatures/>
<moduleDefinitions>
<moduleDefinition>
<friendlyName>Open Graph Protocol</friendlyName>
<defaultCacheTime>-1</defaultCacheTime>
<moduleControls>
<moduleControl>
<controlKey />
<controlSrc>DesktopModules/WillStrohl.OpenGraph/Default.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle />
<controlType>View</controlType>
<iconFile />
<helpUrl />
</moduleControl>
<moduleControl>
<controlKey>Edit</controlKey>
<controlSrc>DesktopModules/WillStrohl.OpenGraph/Settings.ascx</controlSrc>
<supportsPartialRendering>True</supportsPartialRendering>
<supportsPopUps>True</supportsPopUps>
<controlTitle />
<controlType>Edit</controlType>
<iconFile />
<helpUrl />
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
</desktopModule>
<eventMessage>
<processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
<processorCommand>UpgradeModule</processorCommand>
<attributes>
<businessControllerClass>WillStrohl.Modules.OpenGraph.OpenGraphController, WillStrohl.Modules.OpenGraph</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>02.00.00,02.01.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
<component type="Assembly">
<assemblies>
<assembly>
<name>WillStrohl.Modules.OpenGraph.dll</name>
<version>02.01.00</version>
<path>bin</path>
</assembly>
</assemblies>
</component>
<component type="File">
<files>
<basePath>DesktopModules\WillStrohl.OpenGraph</basePath>
<file>
<name>WillStrohl.OpenGraph.dnn</name>
</file>
</files>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules\WillStrohl.OpenGraph</basePath>
<resourceFile>
<name>Resources.zip</name>
</resourceFile>
</resourceFiles>
</component>
<component type="Config">
<config>
<configFile>web.config</configFile>
<install>
<configuration>
<nodes/>
</configuration>
</install>
<uninstall>
<configuration>
<nodes>
<node path="/configuration/system.webServer/modules/add[@name = 'willStrohlOpenGraphRewriter']" action="remove" />
</nodes>
</configuration>
</uninstall>
</config>
</component>
</components>
</package>
</packages>
</dotnetnuke>
6 changes: 3 additions & 3 deletions Modules/WillStrohl.OpenGraph/WillStrohl.OpenGraph_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="WillStrohl.OpenGraph_Symbols" type="Library" version="02.00.00">
<package name="WillStrohl.OpenGraph_Symbols" type="Library" version="02.01.00">
<friendlyName>Open Graph Protocol Symbols</friendlyName>
<description>
<![CDATA[<p>This module allows you to quickly and easily add the Open Graph Protocol markup to your website. Doing so makes you compatible with sharing content with sites like Facebook.</p>]]>
Expand All @@ -10,14 +10,14 @@
<owner>
<name>Will Strohl</name>
<organization>Upendo Ventures, LLC</organization>
<url>https://upendoventures.com</url>
<url>https://upendoventures.com/What/CMS/DNN</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="2.0.0">WillStrohl.OpenGraph</dependency>
<dependency type="managedPackage" version="2.1.0">WillStrohl.OpenGraph</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
4 changes: 4 additions & 0 deletions Modules/WillStrohl.OpenGraph/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
<package id="DotNetNuke.Core" version="9.11.0" targetFramework="net472" />
<package id="DotNetNuke.DependencyInjection" version="9.11.0" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.11.0" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.11.0" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
<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="13.0.3" targetFramework="net472" />
</packages>
13 changes: 7 additions & 6 deletions Modules/WillStrohl.OpenGraph/releasenotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</style>
<div class="uv-install-wrapper">
<h2>Open Graph Protocol Module</h2>
<h3>Version 02.00.00</h3>
<h3>Version 02.01.00</h3>

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

Expand All @@ -24,13 +24,14 @@
<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>
<li>Alejandro Roman, <a href="https://upendoventures.com/What/CMS/DNN/Extensions" target="_blank">Upendo Ventures</a></li>
</ul>

<p><strong>Date Released:</strong> 11/24/2020</p>
<p><strong>Date Released:</strong> 10/31/2024</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>Unable to download seemingly unrelated files protected by &quot;file tickets&quot; (<a href="https://github.com/hismightiness/dnnextensions/issues/164" target="_blank">Issue 164</a>), Thanks <a href="https://github.com/bacon1986" target="_blank">@bacon1986</a>!</li>
<li>Now generating and releasing a Symbols package, Thanks <a href="https://github.com/hismightiness" target="_blank">@hismightiness</a>!</li>
<li>Removed deprecated DNN API references (DNN 10+ compatible!), Thanks <a href="https://github.com/hismightiness" target="_blank">@hismightiness</a>!</li>
<li>ENH: Increased minimum supported version of DNN to DNN Platform 09.11.00, Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
<li>ENH: Increased minimum supported version of NewtonSoft.Json to 13.00.03, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
<li>BUG: Caching error message always shows (<a href="https://github.com/hismightiness/dnnextensions/issues/31" target="_blank">Issue 31</a>), Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a>!</li>
<li>BUG: Updated `DotNetNuke.Web` reference to use Nuget instead of a local reference, Thanks <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
</ul>
</div>

0 comments on commit 78d2640

Please sign in to comment.