Updated version numbers preparing for master merge

erwinvanhunen · erwinvanhunen · commit 3af670b86cc5 · 2015-09-04T10:35:17.000+02:00
diff --git a/Commands/Branding/ApplyProvisioningTemplate.cs b/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)
                     {
diff --git a/Commands/ModuleFiles/OfficeDevPnP.PowerShell.Commands.psd1 b/Commands/ModuleFiles/OfficeDevPnP.PowerShell.Commands.psd1
diff --git a/Commands/Properties/AssemblyInfo.cs b/Commands/Properties/AssemblyInfo.cs
@@ -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")]

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected override void ExecuteCmdlet()`
`88`	`88`	`WriteProgress(new ProgressRecord(0, string.Format("Applying template to {0}", SelectedWeb.Url), message) { PercentComplete = (100 / total) * step });`
`89`	`89`	`};`
`90`	`90`
`91`		`- applyingInformation.MessageDelegate = (message, type) =>`
	`91`	`+ applyingInformation.MessagesDelegate = (message, type) =>`
`92`	`92`	`{`
`93`	`93`	`if (type == ProvisioningMessageType.Warning)`
`94`	`94`	`{`