Merge branch 'release-1.5'

Author: robinhultman

Build/Build.proj

@@ -1,18 +1,25 @@
 <Project DefaultTargets="GenerateMsi" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="$(MSBuildExtensionsPath)\BtsMsiTask\BtsMsiTask.targets" />
+	<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks"/>
 	<PropertyGroup>
 		<DestinationPath>.</DestinationPath>
 		<ApplicationName>BizTalkComponents.PipelineComponents.CopyContextProperty</ApplicationName>
 	</PropertyGroup>
 	<ItemGroup>
 		<Resource Include="..\Src\CopyContextProperty\bin\Debug\BizTalkComponents.PipelineComponents.CopyContextProperty.dll" />
 	</ItemGroup>
-		
-	<Target Name="GenerateMsi">
+	<Target Name="GetVersion">
+		<MSBuild.ExtensionPack.Framework.Assembly TaskAction="GetInfo" NetAssembly="..\Src\CopyContextProperty\bin\Debug\BizTalkComponents.PipelineComponents.CopyContextProperty.dll">
+				<Output TaskParameter="OutputItems" ItemName="Info"/>
+			 </MSBuild.ExtensionPack.Framework.Assembly>
+	</Target>
+
+	<Target Name="GenerateMsi" DependsOnTargets="GetVersion">
 		<MsiTask  
-			FileName="$(FileName)"
+			FileName="BizTalkComponents.PipelineComponents.CopyContextProperty_%(Info.AssemblyInformationalVersion).msi"
 			DestinationPath="$(DestinationPath)"
 			ApplicationName="$(ApplicationName)"
+			SourceLocation="C:\%(Info.AssemblyInformationalVersion)"
 			Resources="@(Resource)" />
 	</Target>
 </Project>

Src/CopyContextProperty/BizTalkComponents.PipelineComponents.CopyContextProperty.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>BizTalkComponents.PipelineComponents.CopyContextProperty</id>
-    <version>1.0.0.2</version>
+    <version>$version$</version>
     <authors>Robin Hultman</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <projectUrl>https://github.com/BizTalkComponents/CopyContextProperty</projectUrl>

Src/CopyContextProperty/Properties/AssemblyInfo.cs

@@ -34,3 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyInformationalVersion("1.5.0.0")]