From 6994767ff5026690ca6d33194ba656a03e0f0c1f Mon Sep 17 00:00:00 2001
From: Brian Dukes <bdukes@engagesoftware.com>
Date: Mon, 13 Oct 2014 10:48:36 -0500
Subject: [PATCH] No longer build separate packages for old DNN versions

We don't need a different package for DNN 5 & 5.2, because the new minimum
version is DNN 6
---
 Source/EngageSurvey.5.dnn                     | 145 ------------------
 Source/EngageSurvey.Build                     |  70 ++-------
 Source/EngageSurvey.csproj                    |   5 +-
 ...{EngageSurvey.5.2.dnn => EngageSurvey.dnn} |   0
 4 files changed, 17 insertions(+), 203 deletions(-)
 delete mode 100644 Source/EngageSurvey.5.dnn
 rename Source/{EngageSurvey.5.2.dnn => EngageSurvey.dnn} (100%)

diff --git a/Source/EngageSurvey.5.dnn b/Source/EngageSurvey.5.dnn
deleted file mode 100644
index 92325f5..0000000
--- a/Source/EngageSurvey.5.dnn
+++ /dev/null
@@ -1,145 +0,0 @@
-<dotnetnuke type="Package" version="5.0">
-  <packages>
-    <package name="Engage: Survey" type="Module" version="3.1.0">
-      <friendlyName>Engage: Survey</friendlyName>
-      <description>The DotNetNuke Survey module by Engage Software (www.engagesoftware.com)</description>
-      <iconFile>DesktopModules/EngageSurvey/images/survey-icon32.png</iconFile>
-      <owner>
-        <name>Engage Software</name>
-        <organization>Engage Software</organization>
-        <url>http://www.engagesoftware.com/</url>
-        <email>support@engagesoftware.com</email>
-      </owner>
-      <license src="Licenses/EULA-Standard.htm"/>
-      <releaseNotes src="ReleaseNotes_3.1.0.htm" />
-      <components>
-        <component type="ResourceFile">
-          <resourceFiles>
-            <basePath>DesktopModules/EngageSurvey</basePath>
-            <resourceFile>
-              <name>Resources.zip</name>
-            </resourceFile>
-          </resourceFiles>
-        </component>
-        <component type="Script">
-          <scripts>
-            <basePath>DesktopModules\EngageSurvey</basePath>
-            <script type="Install">
-              <name>03.00.00.SqlDataProvider</name>
-              <version>03.00.00</version>
-            </script>
-            <script type="Install">
-              <name>03.01.00.SqlDataProvider</name>
-              <version>03.01.00</version>
-            </script>
-            <script type="Install">
-              <name>03.04.00.SqlDataProvider</name>
-              <version>03.04.00</version>
-            </script>
-            <script type="UnInstall">
-              <name>Uninstall.SqlDataProvider</name>
-              <version latestVersion="latestVersion">3.4.0</version>
-            </script>
-          </scripts>
-        </component>
-        <component type="Module">
-          <desktopModule>
-            <moduleName>Engage: Survey</moduleName>
-            <foldername>EngageSurvey</foldername>
-            <businessControllerClass>Engage.Dnn.Survey.FeatureController</businessControllerClass>
-            <moduleDefinitions>
-              <moduleDefinition>
-                <friendlyName>Engage: Survey</friendlyName>
-                <defaultCacheTime>0</defaultCacheTime>
-                <moduleControls>
-                  <moduleControl>
-                    <controlKey/>
-                    <controlSrc>DesktopModules/EngageSurvey/MainContainer.ascx</controlSrc>
-                    <controlType>View</controlType>
-                    <helpUrl>http://www.EngageSoftware.com/Support.aspx</helpUrl>
-                  </moduleControl>
-                  <moduleControl>
-                    <controlKey>Settings</controlKey>
-                    <controlSrc>DesktopModules/EngageSurvey/Settings.ascx</controlSrc>
-                    <controlType>Edit</controlType>
-                    <helpUrl>http://www.EngageSoftware.com/Support.aspx</helpUrl>
-                  </moduleControl>
-                </moduleControls>
-              </moduleDefinition>
-            </moduleDefinitions>
-          </desktopModule>
-          <eventMessage>
-            <processorType>DotNetNuke.Entities.Modules.EventMessageProcessor, DotNetNuke</processorType>
-            <processorCommand>UpgradeModule</processorCommand>
-            <attributes>
-              <businessControllerClass>Engage.Dnn.Survey.FeatureController</businessControllerClass>
-              <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>3.0.0</upgradeVersionsList>
-            </attributes>
-          </eventMessage>
-        </component>
-        <component type="Assembly">
-          <assemblies>
-            <assembly>
-              <name>EngageSurvey.dll</name>
-              <version latestVersion="latestVersion">3.1.0</version>
-            </assembly>
-            <assembly>
-              <name>Engage.Survey.dll</name>
-              <version>3.1.0</version>
-            </assembly>
-            <assembly>
-              <name>EngageSurvey.Entities.dll</name>
-              <version>3.1.0</version>
-            </assembly>
-            <assembly>
-              <name>Engage.Framework.dll</name>
-              <version>3.1.3</version>
-            </assembly>
-            <assembly>
-              <name>Engage.Dnn.Framework.dll</name>
-              <version>3.1.4</version>
-            </assembly>
-            <assembly>
-              <name>BrandonHaynes.ModelAdapter.dll</name>
-              <version>1.0.1</version>
-            </assembly>
-            <assembly>
-              <name>AntiXSSLibrary.dll</name>
-              <version>4.2.0</version>
-            </assembly>
-            <assembly>
-              <name>Telerik.Web.UI.dll</name>
-              <version>2009.3.1103.35</version>
-            </assembly>
-          </assemblies>
-        </component>
-        <component type="Config">
-          <config>
-            <configFile>web.config</configFile>
-            <install>
-              <configuration>
-                <nodes>
-                  <node path="/configuration/system.web/httpHandlers" action="update" key="path" collision="ignore">
-                    <add verb="*" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" validate="true" />
-                  </node>
-                  <node path="/configuration/system.webServer/handlers" action="update" key="path" collision="ignore">
-                    <add name="Telerik.Web.UI.ChartHttpHandler" verb="*" path="ChartImage.axd" type="Telerik.Web.UI.ChartHttpHandler, Telerik.Web.UI, Culture=neutral, PublicKeyToken=121fae78165ba3d4" />
-                  </node>
-                </nodes>
-              </configuration>
-            </install>
-            <uninstall>
-              <configuration>
-                <nodes>
-                  <node path="/configuration/system.web/httpHandlers/add[@path='ChartImage.axd']" action="remove" />
-                  <node path="/configuration/system.webServer/handlers/add[@path='ChartImage.axd']" action="remove" />
-                </nodes>
-              </configuration>
-            </uninstall>
-          </config>
-        </component>
-      </components>
-    </package>
-  </packages>
-</dotnetnuke>
\ No newline at end of file
diff --git a/Source/EngageSurvey.Build b/Source/EngageSurvey.Build
index 0d50a30..3ed1247 100644
--- a/Source/EngageSurvey.Build
+++ b/Source/EngageSurvey.Build
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project xmlns="http://nant.sf.net/release/0.92/nant.xsd" name="Engage Build Script" basedir="." default="package">
   <property name="projectName" value="Survey"/>
-  <property name="versions" value="5,5.2+"/>
   <property name="licenses" value="Free"/>
-  <property name="packageFileNameTemplate" value="${projectName}_${projectVersion}_${packageType}_DNN${dnnVersion}" dynamic="true"/>
+  <property name="packageFileNameTemplate" value="${projectName}_${projectVersion}_${packageType}" dynamic="true"/>
   <property name="createSourcePackage" value="true"/>
   <property name="sourcePackageLicenseName" value="Free"/>
   <property name="combineSourceWithInstallPackage" value="false"/>
@@ -51,9 +50,7 @@
       <call target="create-packages"/>
 
       <if test="${combineSourceWithInstallPackage}">
-        <foreach item="String" in="${versions}" delim="," property="dnnVersion">
-          <call target="combine-source"/>
-        </foreach>
+        <call target="combine-source"/>
       </if>
     </if>
     
@@ -88,8 +85,6 @@
         <include name="ReadMe.txt" />
         <include name="**/*.SqlDataProvider"/>
         <include name="**/*.dnn"/>
-        <include name="**/*.5.dnn"/>
-        <include name="**/*.5.2.dnn"/>
       </fileset>
     </copy>
         <copy-references todir="${packageDirectory}/temp/package/bin" solutionFile="${solutionFile}" flatten="true">
@@ -103,40 +98,19 @@
       </fileset>
     </attrib>
 
-    <if test="${file::exists(packageDirectory + '/temp/package/Engage' + projectName + '.5.dnn')}">
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${releaseNotesFile}" xpath="dotnetnuke/packages/package/releaseNotes/@src" failonerror="false" />
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${projectVersion}" xpath="dotnetnuke/packages/package/@version" failonerror="false" />
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${projectVersion}" xpath="//*[@latestVersion='latestVersion']" failonerror="false" />
-      
-      <foreach item="File" in="${packageDirectory}/temp/package/bin" property="assemblyFile">
-        <call target="set-assemblyVersion"/>
-        <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/components/component[@type='Assembly']/assemblies/assembly[name='${path::get-file-name(assemblyFile)}']/version" failonerror="false" />
-      </foreach>
+    <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${releaseNotesFile}" xpath="dotnetnuke/packages/package/releaseNotes/@src" failonerror="false" />
+    <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${projectVersion}" xpath="dotnetnuke/packages/package/@version" failonerror="false" />
+    <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${projectVersion}" xpath="//*[@latestVersion='latestVersion']" failonerror="false" />
 
-      <if test="${file::exists(referencesDirectory + '/DotNetNuke.dll')}">
-        <property name="assemblyFile" value="${referencesDirectory}/DotNetNuke.dll" />
-        <call target="set-assemblyVersion" />
-        <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/dependencies/dependency[@type='CoreVersion']" failonerror="false" />
-      </if>
-    </if>
-    <if test="${file::exists(packageDirectory + '/temp/package/Engage' + projectName + '.5.2.dnn')}">
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${releaseNotesFile}" xpath="dotnetnuke/packages/package/releaseNotes/@src" failonerror="false" />
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${projectVersion}" xpath="dotnetnuke/packages/package/@version" failonerror="false" />
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${projectVersion}" xpath="//*[@latestVersion='latestVersion']" failonerror="false" />
-
-      <foreach item="File" in="${packageDirectory}/temp/package/bin" property="assemblyFile">
-        <call target="set-assemblyVersion"/>
-        <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/components/component[@type='Assembly']/assemblies/assembly[name='${path::get-file-name(assemblyFile)}']/version" failonerror="false" />
-      </foreach>
+    <foreach item="File" in="${packageDirectory}/temp/package/bin" property="assemblyFile">
+      <call target="set-assemblyVersion"/>
+      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/components/component[@type='Assembly']/assemblies/assembly[name='${path::get-file-name(assemblyFile)}']/version" failonerror="false" />
+    </foreach>
 
-      <if test="${file::exists(referencesDirectory + '/DotNetNuke.dll')}">
-        <property name="assemblyFile" value="${referencesDirectory}/DotNetNuke.dll" />
-        <call target="set-assemblyVersion" />
-        <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/dependencies/dependency[@type='CoreVersion']" failonerror="false" />
-      </if>
-    </if>
-    <if test="${file::exists(packageDirectory + '/temp/package/Engage' + projectName + '.dnn')}">
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${projectVersion}" xpath="//*[@latestVersion='latestVersion']" failonerror="false" />
+    <if test="${file::exists(referencesDirectory + '/DotNetNuke.dll')}">
+      <property name="assemblyFile" value="${referencesDirectory}/DotNetNuke.dll" />
+      <call target="set-assemblyVersion" />
+      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${assemblyVersion}" xpath="dotnetnuke/packages/package/dependencies/dependency[@type='CoreVersion']" failonerror="false" />
     </if>
   </target>
   <target name="create-resources-zip" description="Creates the Resources.zip file for content (Install package) files">
@@ -160,10 +134,7 @@
     <target name="create-packages" description="For the given license and type, creates packages for all specified DNN versions">
     <property name="licenseFile" value="EULA-${packageLicense}"/>
     <call target="switch-license"/>
-
-    <foreach item="String" in="${versions}" delim="," property="dnnVersion">
-      <call target="zip-package"/>
-    </foreach>
+    <call target="zip-package"/>
   </target>
   <target name="switch-license" description="Switches out the license file and updates the reference to it in the DNN 5 manifest file">
     <delete>
@@ -177,12 +148,7 @@
       </fileset>
     </copy>
 
-    <if test="${file::exists(packageDirectory + '/temp/package/Engage' + projectName + '.5.dnn')}">
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.dnn" value="${licenseFile}.htm" xpath="dotnetnuke/packages/package/license/@src" failonerror="false" />
-    </if>
-    <if test="${file::exists(packageDirectory + '/temp/package/Engage' + projectName + '.5.2.dnn')}">
-      <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.5.2.dnn" value="${licenseFile}.htm" xpath="dotnetnuke/packages/package/license/@src" failonerror="false" />
-    </if>
+    <xmlpoke file="${packageDirectory}/temp/package/Engage${projectName}.dnn" value="${licenseFile}.htm" xpath="dotnetnuke/packages/package/license/@src" failonerror="false" />
   </target>
   <target name="zip-package" description="Zips up the files in the temp/package directory, getting the correct manifest file and using the correct naming convention">
     <property name="packageType" value="Install"/>
@@ -190,10 +156,6 @@
     <zip zipfile="${packageDirectory}/${packageFileNameTemplate}.zip">
       <fileset basedir="${packageDirectory}/temp/package">
         <include name="**/*"/>
-        <exclude name="**/*.4.dnn" if="${dnnVersion!='4'}"/>
-        <exclude name="**/*.5.dnn" if="${dnnVersion!='5'}"/>
-        <exclude name="**/*.5.2.dnn" if="${dnnVersion!='5.2+'}"/>
-        <exclude name="**/Telerik.Web.UI.dll" if="${dnnVersion=='5.2+'}"/>
       </fileset>
     </zip>
   </target>
@@ -216,7 +178,7 @@
     <property name="installPackageFileName" value="${packageFileNameTemplate}"/>
     <property name="packageType" value="Source"/>
     <property name="sourcePackageFileName" value="${packageFileNameTemplate}"/>
-    <zip zipfile="${packageDirectory}/${projectName}_${projectVersion}_DNN${dnnVersion}.zip">
+    <zip zipfile="${packageDirectory}/${projectName}_${projectVersion}.zip">
       <fileset basedir="${packageDirectory}">
         <include name="${installPackageFileName}.zip"/>
         <include name="${sourcePackageFileName}.zip"/>
diff --git a/Source/EngageSurvey.csproj b/Source/EngageSurvey.csproj
index f375a78..80cb5ca 100644
--- a/Source/EngageSurvey.csproj
+++ b/Source/EngageSurvey.csproj
@@ -120,7 +120,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AnalyzeResponses.ascx" />
-    <None Include="EngageSurvey.5.2.dnn">
+    <None Include="EngageSurvey.dnn">
       <SubType>Designer</SubType>
     </None>
     <None Include="JavaScript\Array.prototype.indexOf.js" />
@@ -246,9 +246,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EngageSurvey.5.dnn">
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="packages.config" />
     <None Include="Providers\DataProviders\SqlDataProvider\03.00.00.SqlDataProvider" />
     <None Include="EngageSurvey.Build">
diff --git a/Source/EngageSurvey.5.2.dnn b/Source/EngageSurvey.dnn
similarity index 100%
rename from Source/EngageSurvey.5.2.dnn
rename to Source/EngageSurvey.dnn