Fixing packaging and settings

Author: peppertree

BuildScripts/MSBuild.Community.Tasks.Targets

@@ -2,8 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildProjectDirectory)\BuildScripts</MSBuildCommunityTasksPath>
-    <MSBuildDnnBinPath Condition="'$(MSBuildDnnBinPath)' == ''">$(MSBuildProjectDirectory)\..\..\bin</MSBuildDnnBinPath>
-	<MSBuildCommunityTasksLib>$(SolutionDir)\packages\MSBuildTasks.1.4.0.61\tools\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
+    <MSBuildDnnBinPath Condition="'$(MSBuildDnnBinPath)' == ''">$(MSBuildProjectDirectory)\..\..\..\bin</MSBuildDnnBinPath>
+    <MSBuildCommunityTasksLib>$(MSBuildExtensionsPath)\MSBuildCommunityTasks\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
   </PropertyGroup>
 <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AspNet.InstallAspNet" />
 <UsingTask AssemblyFile="$(MSBuildCommunityTasksLib)" TaskName="MSBuild.Community.Tasks.AssemblyInfo" />

BuildScripts/ModulePackage.targets

@@ -41,7 +41,7 @@
      <SourceInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;" />
      <SourceInclude Include="**\images\**" />
      <SourceInclude Include="**\*.vb" />
-	 <SourceInclude Include="**\Packages\**" />
+	   <SourceInclude Include="**\Packages\**" />
      <SourceInclude Include="**\*.vb.designer" />
      <SourceInclude Include="**\*.vbproj" />
      <SourceInclude Include="**\*.targets" />
@@ -66,6 +66,7 @@
    </CreateItem>
 
    <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+   <Copy SourceFiles="$(MSBuildDnnBinPath)\PerceptiveMCAPI.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
    <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
    <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
    <Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />

Licenses/PerceptiveMCAPI.txt

@@ -0,0 +1,37 @@
+The MailChimpConnector project makes use of the PerceptiveMCAP project, which can be found here:
+
+http://perceptivemcapi.codeplex.com/
+
+That API is licensed under the following conditions:
+
+Microsoft Public License (Ms-PL)
+
+This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+
+1. Definitions
+
+The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+
+A "contribution" is the original software, or any additions or changes to the software.
+
+A "contributor" is any person that distributes its contribution under this license.
+
+"Licensed patents" are a contributor's patent claims that read directly on its contribution.
+
+2. Grant of Rights
+
+(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+
+(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+
+3. Conditions and Limitations
+
+(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+
+(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+
+(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
+
+(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+
+(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

MailChimpConnector.dnn

@@ -78,6 +78,10 @@
               <name>Connect.Modules.MailChimpConnector.dll</name>
               <path>bin</path>
             </assembly>
+            <assembly>
+              <name>PerceptiveMCAPI.dll</name>
+              <path>bin</path>
+            </assembly>            
           </assemblies>
         </component>
       </components>

MailChimpConnector.sln

@@ -11,8 +11,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{279C5C96-5031-407A-919C-EF50FD06454D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{279C5C96-5031-407A-919C-EF50FD06454D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{279C5C96-5031-407A-919C-EF50FD06454D}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{279C5C96-5031-407A-919C-EF50FD06454D}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{279C5C96-5031-407A-919C-EF50FD06454D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{279C5C96-5031-407A-919C-EF50FD06454D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

MailChimpConnector.v12.suo

@@ -35,7 +35,7 @@
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\bin\</OutputPath>
     <DocumentationFile>Connect.Modules.MailChimpConnector.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
@@ -125,6 +125,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="License.txt" />
+    <Content Include="Licenses\PerceptiveMCAPI.txt" />
     <Content Include="module.css" />
     <Content Include="ReleaseNotes.txt" />
     <Content Include="Settings.ascx" />

MailChimpConnector.vbproj

@@ -115,28 +115,6 @@ Public Class View
         DotNetNuke.Framework.AJAX.RegisterScriptManager()
         LoadList()
 
-        If Not Page.IsPostBack Then
-            If IsSubscribed() Then
-                pnlSettings.Visible = True
-                pnlSettingsResult.Visible = False
-                pnlSubscribe.Visible = False
-                pnlSubscribeResult.Visible = False
-                pnlUnSubscribe.Visible = False
-                pnlUnSubscribeResult.Visible = False
-                pnlError.Visible = False
-            Else
-                pnlSettings.Visible = False
-                pnlSettingsResult.Visible = False
-                pnlSubscribe.Visible = True
-                pnlSubscribeResult.Visible = False
-                pnlUnSubscribe.Visible = False
-                pnlUnSubscribeResult.Visible = False
-                pnlError.Visible = False
-            End If
-        End If
-
-        ProcessTemplates()
-
     End Sub
 
     Protected Sub Page_Load(sender As Object, e As System.EventArgs) Handles Me.Load
@@ -525,12 +503,36 @@ Public Class View
                 _mergefields = output.result
             Else
                 ShowModuleSettingsNote()
+                Exit Sub
             End If
         Else
             ShowModuleSettingsNote()
+            Exit Sub
         End If
 
 
+        If Not Page.IsPostBack Then
+            If IsSubscribed() Then
+                pnlSettings.Visible = True
+                pnlSettingsResult.Visible = False
+                pnlSubscribe.Visible = False
+                pnlSubscribeResult.Visible = False
+                pnlUnSubscribe.Visible = False
+                pnlUnSubscribeResult.Visible = False
+                pnlError.Visible = False
+            Else
+                pnlSettings.Visible = False
+                pnlSettingsResult.Visible = False
+                pnlSubscribe.Visible = True
+                pnlSubscribeResult.Visible = False
+                pnlUnSubscribe.Visible = False
+                pnlUnSubscribeResult.Visible = False
+                pnlError.Visible = False
+            End If
+        End If
+
+        ProcessTemplates()
+
     End Sub
 
     Private Sub ShowModuleSettingsNote()