Skip to content

Commit f944270

Browse files
author
Will Strohl
authored
Merge pull request #186 from hismightiness/development
Syncing dev w/ main
2 parents 4ae921c + d4f148e commit f944270

File tree

11 files changed

+106
-52
lines changed

11 files changed

+106
-52
lines changed

‎Modules/WillStrohl.Injection/03.00.00.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DesktopModules/WillStrohl.Injection/Images/injection.png

‎Modules/WillStrohl.Injection/Images/injection.png‎

-9.21 KB
Binary file not shown.

‎Modules/WillStrohl.Injection/Images/logo.png‎

6.52 KB
Loading

‎Modules/WillStrohl.Injection/Module.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
1010
<FullModulePath>$(WebsitePath)\DesktopModules\$(ModulePath)</FullModulePath>
1111
</PropertyGroup>
12-
<Import Project="$(BuildScriptsPath)\ModulePackageSource.Targets" />
12+
<Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
1313
<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;PackageModule">
1414
</Target>
1515
<Target Name="GetFiles">

‎Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
[assembly: AssemblyTitle("WillStrohl.Injection")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("Will Strohl")]
12-
[assembly: AssemblyProduct("http://www.willstrohl.com")]
13-
[assembly: AssemblyCopyright("Copyright 2009-2016 Will Strohl")]
14-
[assembly: AssemblyTrademark("")]
11+
[assembly: AssemblyCompany("Upendo Ventures, LLC")]
12+
[assembly: AssemblyProduct("https://upendoventures.com")]
13+
[assembly: AssemblyCopyright("Copyright Upendo Ventures, LLC")]
14+
[assembly: AssemblyTrademark("Upendo Ventures, LLC")]
1515
[assembly: AssemblyCulture("")]
1616

1717
// Setting ComVisible to false makes the types in this assembly not visible
@@ -29,5 +29,5 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("02.00.02")]
33-
[assembly: AssemblyFileVersion("02.00.02")]
32+
[assembly: AssemblyVersion("03.00.00")]
33+
[assembly: AssemblyFileVersion("03.00.00")]

‎Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.00.SqlDataProvider‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Release Notes:
1515

1616
*/
1717

18-
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')
18+
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')
1919
ALTER TABLE {databaseOwner}[{objectQualifier}wns_inj_injection]
2020
ADD [custom_properties] NVARCHAR(MAX) NULL;
2121
GO

‎Modules/WillStrohl.Injection/WillStrohl.Injection.dnn‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<dotnetnuke type="Package" version="6.0">
22
<packages>
3-
<package name="WillStrohl.Injection" type="Module" version="02.00.02">
3+
<package name="WillStrohl.Injection" type="Module" version="03.00.00">
44
<friendlyName>Content Injection</friendlyName>
55
<description>
6-
<![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>]]>
6+
<![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>]]>
77
</description>
8-
<iconFile>DesktopModules/WillStrohl.Injection/Images/injection.png</iconFile>
8+
<iconFile>DesktopModules/WillStrohl.Injection/Images/logo.png</iconFile>
99
<owner>
1010
<name>Will Strohl</name>
11-
<organization>Will Strohl</organization>
12-
<url><![CDATA[<a href="http://hismightiness.github.io/dnnextensions/" target="_blank">http://hismightiness.github.io/dnnextensions/</a>]]></url>
13-
<email><![CDATA[<a href="mailto:will.strohl@gmail.com" target="_blank">will.strohl@gmail.com</a>]]></email>
11+
<organization>Upendo Ventures, LLC</organization>
12+
<url>https://upendoventures.com</url>
13+
<email>solutions@upendoventures.com</email>
1414
</owner>
1515
<license src="license.txt" />
1616
<releaseNotes src="releasenotes.txt" />
1717
<azureCompatible>true</azureCompatible>
1818
<dependencies>
19-
<dependency type="coreversion">07.04.02</dependency>
19+
<dependency type="coreversion">09.04.00</dependency>
2020
</dependencies>
2121
<components>
2222
<component type="Script">
@@ -80,7 +80,7 @@
8080
<script type="UnInstall">
8181
<path>Providers\DataProviders\SqlDataProvider</path>
8282
<name>Uninstall.SqlDataProvider</name>
83-
<version>02.00.02</version>
83+
<version>03.00.00</version>
8484
</script>
8585
</scripts>
8686
</component>
@@ -126,19 +126,21 @@
126126
<attributes>
127127
<businessControllerClass>WillStrohl.Modules.Injection.Components.InjectionController, WillStrohl.Modules.Injection</businessControllerClass>
128128
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
129-
<upgradeVersionsList />
129+
<upgradeVersionsList>03.00.00</upgradeVersionsList>
130130
</attributes>
131131
</eventMessage>
132132
</component>
133+
133134
<component type="Assembly">
134135
<assemblies>
135136
<assembly>
136137
<name>WillStrohl.Modules.Injection.dll</name>
137-
<version>02.00.02</version>
138+
<version>03.00.00</version>
138139
<path>bin</path>
139140
</assembly>
140141
</assemblies>
141142
</component>
143+
142144
<component type="ResourceFile">
143145
<resourceFiles>
144146
<basePath>DesktopModules\WillStrohl.Injection</basePath>
@@ -147,6 +149,9 @@
147149
</resourceFile>
148150
</resourceFiles>
149151
</component>
152+
153+
<component type="Cleanup" version="03.00.00" fileName="03.00.00.txt" />
154+
150155
</components>
151156
</package>
152157
</packages>

‎Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<dotnetnuke type="Package" version="6.0">
3+
<packages>
4+
<package name="WillStrohl.Injection_Symbols" type="Library" version="03.00.00">
5+
<friendlyName>Content Injection Symbols</friendlyName>
6+
<![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>]]>
7+
<owner>
8+
<name>Will Strohl</name>
9+
<organization>Upendo Ventures, LLC</organization>
10+
<url>https://upendoventures.com</url>
11+
<email>solutions@upendoventures.com</email>
12+
</owner>
13+
<license src="License.txt" />
14+
<releaseNotes src="ReleaseNotes.txt" />
15+
<azureCompatible>True</azureCompatible>
16+
<dependencies>
17+
<dependency type="managedPackage" version="3.0.0">WillStrohl.Injection</dependency>
18+
</dependencies>
19+
<components>
20+
<component type="ResourceFile">
21+
<resourceFiles>
22+
<basePath></basePath>
23+
<resourceFile>
24+
<name>Resources.zip</name>
25+
</resourceFile>
26+
</resourceFiles>
27+
</component>
28+
</components>
29+
</package>
30+
</packages>
31+
</dotnetnuke>

‎Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<SccLocalPath />
4949
<SccAuxPath />
5050
<SccProvider />
51-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
51+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
5252
<TargetFrameworkProfile />
5353
<UseIISExpress>false</UseIISExpress>
5454
<IISExpressSSLPort />
@@ -105,25 +105,22 @@
105105
<PostBuildEvent />
106106
</PropertyGroup>
107107
<ItemGroup>
108-
<Reference Include="DotNetNuke, Version=7.2.0.607, Culture=neutral, processorArchitecture=MSIL">
109-
<SpecificVersion>False</SpecificVersion>
110-
<HintPath>..\..\Website\bin\DotNetNuke.dll</HintPath>
111-
<Private>False</Private>
108+
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
112110
</Reference>
113-
<Reference Include="DotNetNuke.Web, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\Website\bin\DotNetNuke.Web.dll</HintPath>
116-
<Private>False</Private>
111+
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
112+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
117113
</Reference>
118114
<Reference Include="DotNetNuke.Web.Client, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
119115
<SpecificVersion>False</SpecificVersion>
120116
<HintPath>..\..\Website\bin\DotNetNuke.Web.Client.dll</HintPath>
121117
<Private>False</Private>
122118
</Reference>
119+
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
120+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
121+
</Reference>
123122
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
124-
<SpecificVersion>False</SpecificVersion>
125-
<HintPath>..\..\Website\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
126-
<Private>False</Private>
123+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
127124
</Reference>
128125
<Reference Include="Microsoft.VisualBasic" />
129126
<Reference Include="System">
@@ -211,9 +208,11 @@
211208
</BootstrapperPackage>
212209
</ItemGroup>
213210
<ItemGroup>
211+
<Content Include="03.00.00.txt" />
214212
<Content Include="App_LocalResources\EditInjections.ascx.resx" />
215213
<Content Include="App_LocalResources\ViewInjection.ascx.resx" />
216214
<Content Include="EditInjections.ascx" />
215+
<Content Include="Images\logo.png" />
217216
<Content Include="License.txt" />
218217
<Content Include="Module.build">
219218
<SubType>Designer</SubType>
@@ -235,6 +234,8 @@
235234
<ItemGroup>
236235
<Content Include="Providers\DataProviders\SqlDataProvider\02.00.01.SqlDataProvider" />
237236
<Content Include="Providers\DataProviders\SqlDataProvider\02.00.02.SqlDataProvider" />
237+
<None Include="packages.config" />
238+
<Content Include="WillStrohl.Injection_Symbols.dnn" />
238239
<None Include="WillStrohl.Injection.dnn" />
239240
</ItemGroup>
240241
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Modules/WillStrohl.Injection/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net451" />
4+
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net451" />
5+
</packages>

0 commit comments

Comments
 (0)