Added source export, new feature hierarchy in installer.

.gitattributes

@@ -0,0 +1,6 @@
+tools/SHFB export-ignore
+tools/Sandcastle export-ignore
+tools/Wix export-ignore
+
+
+

build.cmd

@@ -141,8 +141,13 @@ if (%1)==(checkinsuite) (
 )
 
 if (%1)==(archive) (
-	set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /t:Archive /p:ArchiveSuffix=%2
+	set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /t:Archive
 	shift
+	goto next
+)
+
+if (%1)==(sourcearchive) (
+	set MSBUILD_ARGUMENTS=%MSBUILD_ARGUMENTS% /t:SourceArchive
 	shift
 	goto next
 )
@@ -196,7 +201,8 @@ echo Targets can be:
 echo.
 echo  clean              Removes output files
 echo  deepclean          Removes temporary and intermediate files
-echo  archive {suffix}   Produce ZIP files for each framework
+echo  archive            Produce ZIP files for each framework
+echo  sourcearchive      Produce ZIP file of the source code
 echo  build              Compiles assemblies
 echo  buildtests         Compiles tests
 echo  runtests           Runs unit tests
@@ -205,7 +211,7 @@ echo  doc                Builds documentation
 echo  all                Full build
 echo  nightlybuild       Nightly build
 echo  installer          Installer
-echo  label {suffix}     Define build label (defaults to '(Custom Build)')
+echo  label {suffix}     Define build label (defaults to 'PrivateBuild')
 exit /b 1
 
 :build

src/NLog.proj

@@ -5,7 +5,7 @@
     <BaseOutputDirectory>$(MSBuildProjectDirectory)\..\build\</BaseOutputDirectory>
     <ProjectTarget Condition="'$(ProjectTarget)'==''">Build</ProjectTarget>
     <FrameworksPath>$(MSBuildProjectDirectory)\Frameworks</FrameworksPath>    
-    <BuildLabel>LocalBuild</BuildLabel>
+    <BuildLabel>PrivateBuild</BuildLabel>
     <BuildLabel Condition=" '$(CCNetLabel)'!='' ">$(CCNetLabel)</BuildLabel>
     <BuildVersion>0.0.0.0</BuildVersion>
     <BuildAllFrameworks>true</BuildAllFrameworks>
@@ -26,8 +26,8 @@
     <InfoZip>$(MSBuildProjectDirectory)\..\tools\zip.exe</InfoZip>
     <Tar>$(MSBuildProjectDirectory)\..\tools\tar.exe</Tar>
     <BZip2>$(MSBuildProjectDirectory)\..\tools\bzip2.exe</BZip2>
-    <Svn>svn.exe</Svn>
-    <ArchiveOutputPath>$(BaseOutputDirectory)Archive</ArchiveOutputPath>
+    <Git Condition=" '$(Git)' == '' ">git</Git>
+    <ArchiveOutputPath>$(BaseOutputDirectory)bin\$(Configuration)\Packages</ArchiveOutputPath>
     <ConfigurationSuffix Condition="'$(Configuration)' == 'Debug'">-debug</ConfigurationSuffix>
   </PropertyGroup>
 
@@ -146,8 +146,8 @@
      <PropertyGroup>
        <CommonProperties>BuildLabel=$(BuildLabel);BuildVersion=$(BuildVersion)</CommonProperties>
      </PropertyGroup>
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="DeepClean;Clean;Build;Documentation;Installer;BuildTests;RunTests" Properties="Configuration=Release;$(CommonProperties)" />
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="Clean;Build;Documentation;Installer;BuildTests;RunTests" Properties="Configuration=Debug;$(CommonProperties)" />
+     <MSBuild Projects="$(MSBuildProjectFile)" Targets="DeepClean;Clean;Build;Documentation;Archive;Installer;BuildTests;RunTests" Properties="Configuration=Release;$(CommonProperties)" />
+     <CallTarget Targets="SourceArchive" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="Clean;Build">
@@ -329,14 +329,21 @@
      <RemoveDir Directories="@(TargetFramework -> '$(BaseOutputDirectory)obj\$(Configuration)\%(Identity)')" />
   </Target>
 
-  <Target Name="Archive">
+  <Target Name="BeforeArchive">
+    <PropertyGroup>
+      <ArchiveSuffix></ArchiveSuffix>
+      <ArchiveSuffix Condition=" '$(BuildLabel)' != '' ">-$(BuildLabel)</ArchiveSuffix>
+    </PropertyGroup>
     <MakeDir Directories="$(ArchiveOutputPath)" />
-    <Exec Command='"$(InfoZip)" "$(ArchiveOutputPath)\NLog2%(TargetFramework.ProjectFileSuffix)$(ArchiveSuffix)$(ConfigurationSuffix).zip" NLog.*' 
+  </Target>
+
+  <Target Name="Archive" DependsOnTargets="BeforeArchive">
+    <Exec Command='"$(InfoZip)" "$(ArchiveOutputPath)\NLog2%(TargetFramework.ProjectFileSuffix)$(ArchiveSuffix)$(ConfigurationSuffix).zip" NLog.* -x *Test*' 
           WorkingDirectory="$(BaseOutputDirectory)\bin\$(Configuration)\%(TargetFramework.Identity)" />
-    <RemoveDir Directories="$(ArchiveOutputPath)\sources" />
-    <Exec Command='$(Svn) export . "$(ArchiveOutputPath)\sources"' WorkingDirectory=".." />
-    <Exec Command='"$(InfoZip)" -r "..\NLog2-sources$(ArchiveSuffix).zip" *.*' 
-          WorkingDirectory="$(ArchiveOutputPath)\sources" />
+  </Target>
+
+  <Target Name="SourceArchive" DependsOnTargets="BeforeArchive">
+    <Exec Command='"$(Git)" archive --format=zip --worktree-attributes -9 head -o build/bin/Release/Packages/NLog2.source$(ArchiveSuffix).zip' WorkingDirectory=".." />
   </Target>
 
   <ItemGroup>