Merge pull request #132 from hismightiness/ContentInjection-2.0.2

Content injection 2.0.2

Modules/WillStrohl.Injection/Components/DataProvider.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Components/InjectionController.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Components/SqlDataProvider.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Components/WNSPortalModuleBase.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/EditInjections.ascx.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/CustomPropertyInfo.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/ICustomPropertyInfo.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/IInjectionInfo.cs

@@ -16,7 +16,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/InjectionInfo.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/InjectionInfoCollection.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/InjectionInfoMembers.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/Entities/InjectionType.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/License.txt

@@ -1,5 +1,5 @@
-<p>Will Strohl (<a href="mailto:will.strohl@gmail.com">will.strohl@gmail.com</a>)<br /><a href="http://www.willstrohl.com" target="_blank">http://www.willstrohl.com</a></p>
-<p>Copyright (c) 2009-2015, Will Strohl</p>
+<p>Will Strohl (<a href="mailto:will.strohl@gmail.com">will.strohl@gmail.com</a>)<br /><a href="http://hismightiness.github.io/dnnextensions/" target="_blank">http://hismightiness.github.io/dnnextensions/</a></p>
+<p>Copyright (c) 2009-2016, Will Strohl</p>
 <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
 <p>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</p>
 <p>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</p>

Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Will Strohl")]
 [assembly: AssemblyProduct("http://www.willstrohl.com")]
-[assembly: AssemblyCopyright("Copyright 2009-2015 Will Strohl")]
+[assembly: AssemblyCopyright("Copyright 2009-2016 Will Strohl")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("02.00.01")]
-[assembly: AssemblyFileVersion("02.00.01")]
+[assembly: AssemblyVersion("02.00.02")]
+[assembly: AssemblyFileVersion("02.00.02")]

Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.04.SqlDataProvider

@@ -42,3 +42,4 @@ GO
 ALTER TABLE {databaseOwner}[{objectQualifier}wns_inj_injection] WITH NOCHECK 
 	ADD CONSTRAINT [FK_{objectQualifier}wns_inj_injection_moduleid] FOREIGN KEY ([module_id]) 
 	REFERENCES {databaseOwner}[{objectQualifier}Modules] ([ModuleId]) ON DELETE CASCADE
+GO

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

@@ -15,7 +15,7 @@ Release Notes:
 
 */
 
-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')
+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')
     ALTER TABLE {databaseOwner}[{objectQualifier}wns_inj_injection] 
     ADD [custom_properties] NVARCHAR(MAX) NULL;
 GO

Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.01.SqlDataProvider

@@ -0,0 +1,18 @@
+/*
+
+INSTALL SQL PROVIDER SCRIPT
+
+Injection Module for DotNetNuke
+Version: 02.00.01
+Author: Will Strohl
+E-Mail: will.strohl@gmail.com
+Website: http://www.willstrohl.com
+
+Copyright 2009-2015 Will Strohl
+
+Release Notes:
+  Placeholder
+
+*/
+
+/* END OF FILE */

Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.02.SqlDataProvider

@@ -0,0 +1,18 @@
+/*
+
+INSTALL SQL PROVIDER SCRIPT
+
+Injection Module for DotNetNuke
+Version: 02.00.02
+Author: Will Strohl
+E-Mail: will.strohl@gmail.com
+Website: http://www.willstrohl.com
+
+Copyright 2009-2016 Will Strohl
+
+Release Notes:
+  Placeholder
+
+*/
+
+/* END OF FILE */

Modules/WillStrohl.Injection/ViewInjection.ascx.cs

@@ -2,7 +2,7 @@
 // Will Strohl (will.strohl@gmail.com)
 // http://www.willstrohl.com
 //
-//Copyright (c) 2009-2015, Will Strohl
+//Copyright (c) 2009-2016, Will Strohl
 //All rights reserved.
 //
 //Redistribution and use in source and binary forms, with or without modification, are 

Modules/WillStrohl.Injection/WillStrohl.Injection.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="WillStrohl.Injection" type="Module" version="02.00.01">
+    <package name="WillStrohl.Injection" type="Module" version="02.00.02">
       <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>]]>
@@ -9,14 +9,14 @@
       <owner>
         <name>Will Strohl</name>
         <organization>Will Strohl</organization>
-        <url><![CDATA[<a href="http://www.willstrohl.com" target="_blank">http://www.willstrohl.com</a>]]></url>
+        <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">will.strohl@gmail.com</a>]]></email>
       </owner>
       <license src="license.txt" />
       <releaseNotes src="releasenotes.txt" />
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="coreversion">07.02.00</dependency>
+        <dependency type="coreversion">07.04.02</dependency>
       </dependencies>
       <components>
         <component type="Script">
@@ -67,10 +67,20 @@
               <name>02.00.00.SqlDataProvider</name>
               <version>02.00.00</version>
             </script>
+            <script type="Install">
+              <path>Providers\DataProviders\SqlDataProvider</path>
+              <name>02.00.01.SqlDataProvider</name>
+              <version>02.00.01</version>
+            </script>
+            <script type="Install">
+              <path>Providers\DataProviders\SqlDataProvider</path>
+              <name>02.00.02.SqlDataProvider</name>
+              <version>02.00.02</version>
+            </script>
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>02.00.01</version>
+              <version>02.00.02</version>
             </script>
           </scripts>
         </component>
@@ -122,10 +132,10 @@
         </component>
         <component type="Assembly">
           <assemblies>
-            <basePath>bin</basePath>
             <assembly>
               <name>WillStrohl.Modules.Injection.dll</name>
-              <version>02.00.01</version>
+              <version>02.00.02</version>
+              <path>bin</path>
             </assembly>
           </assemblies>
         </component>
@@ -137,7 +147,6 @@
             </resourceFile>
           </resourceFiles>
         </component>
-        <component type="Cleanup" fileName="02.00.01.txt" version="02.00.01" />
       </components>
     </package>
   </packages>

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

@@ -55,6 +55,7 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>
@@ -101,20 +102,25 @@
     <PostBuildEvent />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke">
-      <HintPath>..\..\References\DotNetNuke\DotNetNuke.dll</HintPath>
-      <Private>True</Private>
+    <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>
-    <Reference Include="DotNetNuke.Web">
+    <Reference Include="DotNetNuke.Web, Version=7.4.2.216, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Website\bin\DotNetNuke.Web.dll</HintPath>
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web.Client, Version=6.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <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="Microsoft.ApplicationBlocks.Data">
-      <HintPath>..\..\References\DotNetNuke\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System">
@@ -224,7 +230,8 @@
     <Content Include="ViewInjection.ascx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="02.00.01.txt" />
+    <Content Include="Providers\DataProviders\SqlDataProvider\02.00.01.SqlDataProvider" />
+    <Content Include="Providers\DataProviders\SqlDataProvider\02.00.02.SqlDataProvider" />
     <None Include="WillStrohl.Injection.dnn" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Modules/WillStrohl.Injection/releasenotes.txt

@@ -1,4 +1,11 @@
-<h3>Version 02.00.01</h3>
+<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>
+
+<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>