Merge pull request #49 from erwinvanhunen/dev

Prep for master merge

Author: erwinvanhunen

Commands/Branding/ApplyProvisioningTemplate.cs

@@ -88,7 +88,7 @@ protected override void ExecuteCmdlet()
                     WriteProgress(new ProgressRecord(0, string.Format("Applying template to {0}", SelectedWeb.Url), message) { PercentComplete = (100 / total) * step });
                 };
 
-                applyingInformation.MessageDelegate = (message, type) =>
+                applyingInformation.MessagesDelegate = (message, type) =>
                 {
                     if (type == ProvisioningMessageType.Warning)
                     {

Commands/ModuleFiles/OfficeDevPnP.PowerShell.Commands.psd1

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.2.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]

Commands/Properties/AssemblyInfo.cs

@@ -13,7 +13,7 @@
   <Product Id="*"
            Name="$(var.ProductName)"
            Language="1033"
-           Version="1.3.2.0"
+           Version="1.4.0.0"
            Manufacturer="OfficeDev PnP"
            UpgradeCode="630fe2af-dc42-467d-94c8-6eefd065cbfa">
 
@@ -52,13 +52,9 @@
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="APPFOLDER" Name="OfficeDevPnP">
-          <Directory Id="PowerShell" Name="PowerShell">
-            <Directory Id="Modules" Name="Modules">
-              <Directory Id="APPLICATIONFOLDER" Name="OfficeDevPnP.PowerShell.Commands" />
-            </Directory>
-          </Directory>
+      <Directory Id="APPLICATIONFOLDER" Name="OfficeDevPnP.PowerShell.Commands" >
+        <Directory Id="Modules2" Name="Modules">
+          <Directory Id="MODULEFOLDER" Name="OfficeDevPnP.PowerShell.Commands"></Directory>
         </Directory>
       </Directory>
     </Directory>
@@ -74,7 +70,7 @@
   </Fragment>
 
   <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="APPLICATIONFOLDER">
+    <ComponentGroup Id="ProductComponents" Directory="MODULEFOLDER">
       <Component Id="PowerShellCommands" Guid="{1F5CA574-E185-49D2-9A91-CD46A8548D3E}">
         <File Id="Commands" Source="$(var.OfficeDevPnP.PowerShell.Commands.TargetPath)" />
         <File Id="CommandsHelp" Source="$(var.OfficeDevPnP.PowerShell.Commands.TargetPath)-help.xml"/>
@@ -102,7 +98,7 @@
     <ComponentGroup Id="ENVIRONMENTVARS" Directory="TARGETDIR">
       <Component Id="EnvironmentVarPerMachine" Guid="{4D971CA5-CFE1-4121-B265-7C56B75D12A1}">
         <Condition>ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Condition>
-        <Environment Id="PSMODULEPATHPERMACHINE" Name="PSMODULEPATH" Value="[APPFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
+        <Environment Id="PSMODULEPATHPERMACHINE" Name="PSMODULEPATH" Value="[APPLICATIONFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
       </Component>
       <Component Id="EnvironmentVarPerUser" Guid="{CAE7B727-018A-4F37-9D62-C70363B9A9D1}">
         <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition>