update build for AppVeryor

.gitignore

@@ -13,4 +13,7 @@ Test
 *.zip
 *.nupkg
 *.msi
-*.chm
+*.chm
+/Tools/ilmerge/
+/Tools/MSBuildTasks/
+/Tools/NUnit.Runners/

Master.proj

@@ -1,62 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <BuildFolder>$(MSBuildProjectDirectory)\Build</BuildFolder>
+    <ToolFolder>$(MSBuildProjectDirectory)\Tools</ToolFolder>
+    <SourceFolder>$(MSBuildProjectDirectory)\Source</SourceFolder>
+
+    <MSBuildCommunityTasksPath>$(ToolFolder)\MSBuildTasks\tools</MSBuildCommunityTasksPath>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets"/>
+
+  <PropertyGroup>
+    <BuildNumber Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
+    <BuildNumber Condition=" '$(BUILD_NUMBER)' != '' ">$(BUILD_NUMBER)</BuildNumber>
+    <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
+
+    <BuildConfiguration  Condition=" '$(BuildConfiguration)' == '' ">Release</BuildConfiguration>
+
+    <Major Condition=" '$(Major)' == '' ">1</Major>
+    <Minor Condition=" '$(Minor)' == '' ">4</Minor>
+    <Patch Condition=" '$(Patch)' == '' ">0</Patch>
+
+    <AssemblyVersion>$(Major).$(Minor).0.0</AssemblyVersion>
+    <AssemblyFileVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</AssemblyFileVersion>
+    <AssemblyInformationalVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</AssemblyInformationalVersion>
+    <PackageVersion>$(Major).$(Minor).$(Patch).$(BuildNumber)</PackageVersion>
+  </PropertyGroup>
+
+  <Target Name="Clean">
+    <ItemGroup>
+      <RemoveFiles Include="$(BuildFolder)\*.*"/>
+      <RemoveFiles Include="$(MSBuildProjectDirectory)\*.zip"/>
+      <RemoveFiles Include="$(MSBuildProjectDirectory)\*.msi"/>
+      <RemoveFiles Include="$(MSBuildProjectDirectory)\*.nupkg"/>
+      <RemoveFiles Include="$(SourceFolder)\**\bin\*.*"/>
+      <RemoveFiles Include="$(SourceFolder)\**\obj\**\*.*"/>
+    </ItemGroup>
 
-  <Target Name="Build" DependsOnTargets="BoostrapCompile;SetCurrentTargetToBuild" >
-    <CallTarget Targets="ContinueBuild" />
+    <Delete Files="@(RemoveFiles)" />
   </Target>
 
-  <Target Name="SetCurrentTargetToBuild">
-    <CreateProperty Value="Build">
-      <Output TaskParameter="Value" PropertyName="CurrentTarget"/>
-    </CreateProperty>
+  <Target Name="Version">
+    <Time>
+      <Output TaskParameter="Year" PropertyName="Year" />
+    </Time>
+
+    <Message Text="Version: $(AssemblyInformationalVersion)"/>
+
+    <AssemblyInfo CodeLanguage="CS"
+                  OutputFile="$(SourceFolder)\GlobalAssemblyInfo.cs"
+                  GenerateClass="true"
+                  AssemblyProduct="MSBuild.Community.Tasks"
+                  AssemblyCompany="https://github.com/loresoft/msbuildtasks/"
+                  AssemblyCopyright="Copyright © $(Year) MSBuild Community Tasks Project"
+                  AssemblyConfiguration="$(BuildConfiguration)"
+                  AssemblyVersion="$(AssemblyVersion)"
+                  AssemblyFileVersion="$(AssemblyFileVersion)"
+                  AssemblyInformationalVersion="$(AssemblyInformationalVersion)"
+                  ComVisible="false"
+                  CLSCompliant="false" />
   </Target>
 
-  <Target Name="Installer" DependsOnTargets="BoostrapCompile;SetCurrentTargetToInstaller">
-    <CallTarget Targets="ContinueBuild" />
+  <Target Name="Compile" DependsOnTargets="Clean;Version">
+    <MSBuild Projects="$(SourceFolder)\MSBuild.Community.Tasks.sln"
+             Properties="Configuration=$(BuildConfiguration)"/>
   </Target>
 
-  <Target Name="SetCurrentTargetToInstaller">
-    <CreateProperty Value="Installer">
-      <Output TaskParameter="Value" PropertyName="CurrentTarget"/>
-    </CreateProperty>
+  <Target Name="Test" DependsOnTargets="Compile">
+    <ItemGroup>
+      <TestAssemblies Include="$(SourceFolder)\**\*.Tests\bin\$(BuildConfiguration)\*.Tests.dll"/>
+    </ItemGroup>
+
+    <Message Text="AppVeyor: $(APPVEYOR)"/>
+
+    <exec Condition=" '$(APPVEYOR)' != '' "
+          Command="nunit-console.exe &quot;%(TestAssemblies.Identity)&quot;"/>
+
+    <exec Condition=" '$(APPVEYOR)' == '' "
+          Command="Tools\NUnit.Runners\tools\nunit-console.exe &quot;%(TestAssemblies.Identity)&quot;"/>
   </Target>
 
-  <Target Name="Zip" DependsOnTargets="BoostrapCompile;SetCurrentTargetToZip">
-    <CallTarget Targets="ContinueBuild" />
+  <Target Name="Merge" DependsOnTargets="Compile">
+    <Copy SourceFiles="$(BuildFolder)\MSBuild.Community.Tasks.dll"
+          DestinationFiles="$(BuildFolder)\MSBuild.Temp.dll" />
+
+    <!-- Merge together files -->
+    <ILMerge InputAssemblies="$(BuildFolder)\MSBuild.Temp.dll;$(BuildFolder)\Ionic.Zip.Reduced.dll"
+             Internalize="true"
+             OutputFile="$(BuildFolder)\MSBuild.Community.Tasks.dll"
+             KeyFile="$(SourceFolder)\MSBuild.Community.Tasks\MSBuild.Community.Tasks.snk"
+             ToolPath="$(ToolFolder)\ilmerge\tools" />
+
+    <!-- Cleanup unneed files -->
+    <ItemGroup>
+      <CleanupFiles Include="$(BuildFolder)\*.dll" Exclude="$(BuildFolder)\MSBuild.Community.Tasks.dll" />
+      <CleanupFiles Include="$(BuildFolder)\*.x*l" Exclude="$(BuildFolder)\MSBuild.Community.Tasks.xml"/>
+    </ItemGroup>
+
+    <Delete Files="@(CleanupFiles)" />
   </Target>
 
-  <Target Name="SetCurrentTargetToZip">
-    <CreateProperty Value="Zip">
-      <Output TaskParameter="Value" PropertyName="CurrentTarget"/>
-    </CreateProperty>
+  <Target Name="Documentation" DependsOnTargets="Compile">
+    <TaskSchema Assemblies="$(BuildFolder)\MSBuild.Community.Tasks.dll"
+                OutputPath="Build"
+                CreateTaskList="false"
+                IgnoreMsBuildSchema="true"
+                Includes="Microsoft.Build.Commontypes.xsd"/>
   </Target>
 
-  <Target Name="Compile" DependsOnTargets="BoostrapCompile;SetCurrentTargetToCompile">
-    <CallTarget Targets="ContinueBuild" />
+  <Target Name="Zip" DependsOnTargets="Documentation;Test;Merge">
+    <ItemGroup>
+      <ZipFiles Include="$(BuildFolder)\*.*" />
+    </ItemGroup>
+
+    <Zip Files="@(ZipFiles)"
+         WorkingDirectory="$(BuildFolder)"
+         ZipFileName="MSBuild.Community.Tasks.v$(PackageVersion).zip" />
   </Target>
 
-  <Target Name="SetCurrentTargetToCompile">
-    <CreateProperty Value="Compile">
-      <Output TaskParameter="Value" PropertyName="CurrentTarget"/>
-    </CreateProperty>
+  <Target Name="Installer" DependsOnTargets="Compile;Documentation;Test;Merge" Condition="'$(OS)' == 'Windows_NT'">
+    <MSBuild Projects="$(SourceFolder)\MSBuild.Community.Tasks.Setup\MSBuildTasks.wixproj"
+             Properties="Configuration=Release;Major=$(Major);Minor=$(Minor);Build=$(Patch);Revision=$(BuildNumber)" />
+
+    <Copy SourceFiles="$(SourceFolder)\MSBuild.Community.Tasks.Setup\bin\Release\MSBuild.Community.Tasks.msi"
+          DestinationFiles="MSBuild.Community.Tasks.v$(PackageVersion).msi" />
   </Target>
 
-  <Target Name="BoostrapCompile">
-    <CreateItem Include="Build\*">
-      <Output TaskParameter="Include" ItemName="RemoveFiles" />
-    </CreateItem>
-    <Delete Files="@(RemoveFiles)" />
-
-    <MSBuild Projects="Source\MSBuild.Community.Tasks.sln" Properties="Configuration=Release" />
-
-    <CreateItem Include="Build\*">
-      <Output TaskParameter="Include" ItemName="BootstrapFiles" />
-    </CreateItem>
-    <Copy SourceFiles="@(BootstrapFiles)" DestinationFolder="Bootstrap" />
+  <Target Name="Pack" DependsOnTargets="Merge;Test">
+    <NuGetPack ToolPath="$(SourceFolder)\.nuget"
+               File="MSBuildTasks.nuspec"
+               OutputDirectory="$(MSBuildProjectDirectory)"
+               Version="$(PackageVersion)"
+               Symbols="true"  />
   </Target>
 
-  <Target Name="ContinueBuild">
-    <MSBuild Projects="Master-helper.proj" Targets="$(CurrentTarget)"
-             Properties="CalledFromMaster=true;MSBuildCommunityTasksPath=$(MSBuildProjectDirectory)\Bootstrap" />
+  <Target Name="Build" DependsOnTargets="Zip;Installer;Pack">
+    <Message Text="Build Complete"/>
   </Target>
+
 </Project>

Source/GlobalAssemblyInfo.cs

@@ -8,27 +8,27 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyCompany("https://github.com/loresoft/msbuildtasks/")]
 [assembly: System.Reflection.AssemblyProduct("MSBuild.Community.Tasks")]
+[assembly: System.Reflection.AssemblyCompany("https://github.com/loresoft/msbuildtasks/")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © 2014 MSBuild Community Tasks Project")]
-[assembly: System.Reflection.AssemblyConfiguration("Commit 1375350")]
-[assembly: System.Runtime.InteropServices.ComVisible(false)]
-[assembly: System.CLSCompliant(false)]
+[assembly: System.Reflection.AssemblyConfiguration("Release")]
 [assembly: System.Reflection.AssemblyVersion("1.4.0.0")]
 [assembly: System.Reflection.AssemblyFileVersion("1.4.0.0")]
 [assembly: System.Reflection.AssemblyInformationalVersion("1.4.0.0")]
+[assembly: System.Runtime.InteropServices.ComVisible(false)]
+[assembly: System.CLSCompliant(false)]
 
 
 
 internal sealed partial class ThisAssembly {
 
-    internal const string AssemblyCompany = "https://github.com/loresoft/msbuildtasks/";
-
     internal const string AssemblyProduct = "MSBuild.Community.Tasks";
 
+    internal const string AssemblyCompany = "https://github.com/loresoft/msbuildtasks/";
+
     internal const string AssemblyCopyright = "Copyright © 2014 MSBuild Community Tasks Project";
 
-    internal const string AssemblyConfiguration = "Commit 1375350";
+    internal const string AssemblyConfiguration = "Release";
 
     internal const string AssemblyVersion = "1.4.0.0";