Merge pull request #7 from BizTalkComponents/fix-build

Fix build.proj,nuspec and info version

Author: walissa

BizTalkComponents.PipelineComponents.CustomJsonCoders.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32602.291
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizTalkComponents.PipelineComponents.CustomJsonCoders", "src\CustomJSONCoders\BizTalkComponents.PipelineComponents.CustomJsonCoders.csproj", "{12E418FA-FDF9-49AC-9EF6-F5C2BC96BE19}"
 EndProject
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizTalkComponents.PipelineC
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{45F8185C-32F6-48FF-85BE-D78929D47730}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\..\Others\MessageContextCopier\LICENSE = ..\..\..\Others\MessageContextCopier\LICENSE
+		LICENSE = LICENSE
 		ReadMe.md = ReadMe.md
 	EndProjectSection
 EndProject
@@ -36,4 +36,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E3FBFFC7-4BBC-4FF2-8561-F3F63CF1788B}
+	EndGlobalSection
 EndGlobal

Build/Build.proj

@@ -1,6 +1,6 @@
 <Project DefaultTargets="GenerateMsi" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="$(MSBuildExtensionsPath)\BtsMsiTask\BtsMsiTask.targets" />
-
+	<Import Project="$(MSBuildExtensionsPath1)\BtsMsiTask\BtsMsiTask.targets" />
+    <Import Project="$(MSBuildExtensionsPath1)\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks"/>
 	<PropertyGroup>
 		<DestinationPath>$(BUILD_STAGINGDIRECTORY)</DestinationPath>
 		<ApplicationName>BizTalkComponents.PipelineComponents.CustomJsonCoders</ApplicationName>
@@ -10,13 +10,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<Resource Include="$(BUILD_SOURCESDIRECTORY)\src\CustomJSON\bin\$(BuildConfiguration)\BizTalkComponents.PipelineComponents.CustomJsonCoders.dll" />
+		<Resource Include="$(BUILD_SOURCESDIRECTORY)\src\CustomJsonCoders\bin\$(BuildConfiguration)\BizTalkComponents.PipelineComponents.CustomJsonCoders.dll" />
 	</ItemGroup>
-
-	<Target Name="GenerateMsi">
-		<MsiTask  ApplicationDescription="$(ApplicationDescription)"
-              Version="1.0.0.0"
-              FileName="Deploy.msi"
+    <Target Name="GetVersion">
+      <MSBuild.ExtensionPack.Framework.Assembly TaskAction="GetInfo" NetAssembly="$(BUILD_SOURCESDIRECTORY)\src\CustomJsonCoders\bin\$(BuildConfiguration)\BizTalkComponents.PipelineComponents.CustomJsonCoders.dll">
+        <Output TaskParameter="OutputItems" ItemName="Info"/>
+      </MSBuild.ExtensionPack.Framework.Assembly>
+    </Target>
+    <Target Name="GenerateMsi" DependsOnTargets="GetVersion">
+	  <MsiTask  ApplicationDescription="$(ApplicationDescription)"
+              Version="%(Info.AssemblyInformationalVersion)"
+              FileName="BizTalkComponents.PipelineComponents.CustomJsonCoders%(Info.AssemblyInformationalVersion).msi"
               DestinationPath="$(DestinationPath)"
               ApplicationName="$(ApplicationName)"
               BtsAssemblies="@(BtsAssembly)"

ReadMe.md

@@ -1,3 +1,4 @@
+[![Build status](https://ibizsolutions.visualstudio.com/BizTalkComponents/_apis/build/status/CustomJsonCoders)](https://ibizsolutions.visualstudio.com/BizTalkComponents/_build/latest?definitionId=604)
 # Custom Json Coders
 Encoding/Decoding JSON arrays in BizTalk, besides JSON objects as usual in BizTalk.
 The components are based on the usual BizTalk JSON Encoder/JSON Decoder, there are some additional properties to handle the JSON array.

Tests/UnitTests/BizTalkComponents.PipelineComponents.CustomJsonCoders.Tests.UnitTests.csproj

@@ -52,7 +52,6 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

src/CustomJSONCoders/BizTalkComponents.PipelineComponents.CustomJsonCoders.csproj

@@ -88,7 +88,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="BizTalkComponents.PipelineComponents.CustomJsonCoders.nuspec" />
+    <None Include="CustomJsonCoders.nuspec" />
     <None Include="CustomJSON.snk" />
     <None Include="packages.config" />
   </ItemGroup>

src/CustomJSONCoders/CustomJsonCoders.nuspec

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>BizTalkComponents.PipelineComponents.CustomJsonCoders</id>
+    <version>$version$</version>
+    <title>Custom Json Coders</title>
+    <authors>Wael Alissa</authors>
+    <owners>Wael Alissa</owners>
+    <projectUrl>https://github.com/BizTalkComponents/CustomJsonCoders</projectUrl>
+    <releaseNotes>Initial release.</releaseNotes>
+    <copyright>Copyright 2019</copyright>
+    <tags>BizTalk</tags>    
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Encoding/Decoding JSON arrays in BizTalk.</description>    
+  </metadata>
+  <files>
+    <file src="bin\release\BizTalkComponents.PipelineComponents.CustomJsonCoders.dll" target="lib\net45"/>
+  </files>
+</package>

src/CustomJSONCoders/Properties/AssemblyInfo.cs

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