Get version numbers from SemVerHarvester.

5 files changed, 21 insertions, 31 deletions

diff --git a/OATH.Net/OATH.Net.csproj b/OATH.Net/OATH.Net.csproj
index 1531105..d913a84 100644
--- a/OATH.Net/OATH.Net.csproj
+++ b/OATH.Net/OATH.Net.csproj
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>1</VersionMinor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GitDescribeCommand><![CDATA[
-        public static string ScriptMain()
-        {
-            System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo()
-            {
-                FileName = @"$(MSBuildProgramFiles32)\Git\bin\git.exe",
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                Arguments = "describe --always --long --dirty=-modified"
-            };
-            System.Diagnostics.Process process = System.Diagnostics.Process.Start(psi);
-            process.WaitForExit();
-            string result = process.StandardOutput.ReadToEnd();
-            int length = result.Length;
-            return result.Substring(0,length-1);
-        }    
-      ]]></GitDescribeCommand>
-  </PropertyGroup>
-  <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -78,15 +55,21 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildProjectDirectory)\..\packages\StyleCop\Microsoft.StyleCop.Targets" />
   <Import Project="$(MSBuildProjectDirectory)\..\packages\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\packages\SemVerHarvester.0.3.0\msbuild\SemVerHarvester.Targets" />
   <Target Name="BeforeBuild">
-    <Script Language="C#" Code="$(GitDescribeCommand)">
-      <Output TaskParameter="ReturnValue" PropertyName="GitDescribeResult" />
-    </Script>
-    <Version BuildType="Automatic" RevisionType="Automatic">
-      <Output TaskParameter="Build" PropertyName="VersionBuild" />
-      <Output TaskParameter="Revision" PropertyName="VersionRevision" />
-    </Version>
-    <AssemblyInfo OutputFile="Properties\VersionAssemblyInfo.cs" CodeLanguage="CS" AssemblyVersion="$(VersionMajor).$(VersionMinor).0.0" AssemblyFileVersion="$(VersionMajor).$(VersionMinor).$(VersionBuild).$(VersionRevision)" AssemblyInformationalVersion="$(GitDescribeResult)" />
+    <SemVerGitHarvester GitPath="C:\Program Files (x86)\Git\bin\git.exe">
+      <Output TaskParameter="MajorVersion" PropertyName="MajorVersion" />
+      <Output TaskParameter="MinorVersion" PropertyName="MinorVersion" />
+      <Output TaskParameter="PatchVersion" PropertyName="PatchVersion" />
+      <Output TaskParameter="RevisionVersion" PropertyName="RevisionVersion" />
+      <Output TaskParameter="ModifiedString" PropertyName="ModifiedString" />
+      <Output TaskParameter="CommitId" PropertyName="CommitId" />
+    </SemVerGitHarvester>
+    <AssemblyInfo OutputFile="Properties\VersionAssemblyInfo.cs"
+                  CodeLanguage="CS"
+                  AssemblyVersion="$(MajorVersion).$(MinorVersion).0.0"
+                  AssemblyFileVersion="$(MajorVersion).$(MinorVersion).$(PatchVersion).$(RevisionVersion)"
+                  AssemblyInformationalVersion="$(MajorVersion).$(MinorVersion).$(PatchVersion).$(RevisionVersion) ($(CommitId))$(ModifiedString)" />
   </Target>
   <Target Name="AfterBuild">
   </Target>
diff --git a/packages/SemVerHarvester.0.3.0/SemVerHarvester.0.3.0.nupkg b/packages/SemVerHarvester.0.3.0/SemVerHarvester.0.3.0.nupkg
new file mode 100644
index 0000000..78d6a71
--- /dev/null
+++ b/packages/SemVerHarvester.0.3.0/SemVerHarvester.0.3.0.nupkg
diff --git a/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net20.dll b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net20.dll
new file mode 100644
index 0000000..ba6c0ea
--- /dev/null
+++ b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net20.dll
diff --git a/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net40.dll b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net40.dll
new file mode 100644
index 0000000..b5b18ea
--- /dev/null
+++ b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Net40.dll
diff --git a/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Targets b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Targets
new file mode 100644
index 0000000..1b30a45
--- /dev/null
+++ b/packages/SemVerHarvester.0.3.0/msbuild/SemVerHarvester.Targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask AssemblyFile="SemVerHarvester.Net40.dll" TaskName="SemVerHarvester.SemVerGitHarvester" Condition=" $(TargetFrameworkVersion) == 'v4.0' " />
+  <UsingTask AssemblyFile="SemVerHarvester.Net20.dll" TaskName="SemVerHarvester.SemVerGitHarvester" Condition=" $(TargetFrameworkVersion) != 'v4.0' " />
+  <UsingTask AssemblyFile="SemVerHarvester.Net40.dll" TaskName="SemVerHarvester.SemVerHgHarvester" Condition=" $(TargetFrameworkVersion) == 'v4.0' " />
+  <UsingTask AssemblyFile="SemVerHarvester.Net20.dll" TaskName="SemVerHarvester.SemVerHgHarvester" Condition=" $(TargetFrameworkVersion) != 'v4.0' " />
+</Project>