diff --git a/Rhino.Mocks.Tests.Model/Rhino.Mocks.Tests.Model.csproj b/Rhino.Mocks.Tests.Model/Rhino.Mocks.Tests.Model.csproj
index 5936509e..4f47b36e 100644
--- a/Rhino.Mocks.Tests.Model/Rhino.Mocks.Tests.Model.csproj
+++ b/Rhino.Mocks.Tests.Model/Rhino.Mocks.Tests.Model.csproj
@@ -1,74 +1,75 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {3078B943-10A5-41FA-A68A-7C4FC98506A0}
- Library
- Properties
- Rhino.Mocks.Tests.Model
- Rhino.Mocks.Tests.Model
- v3.5
- 512
- true
- ..\ayende-open-source.snk
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
- 3.5
-
-
- 3.5
-
-
- 3.5
-
-
-
-
-
-
-
-
-
-
-
-
- {1E8FECC7-9E9B-4275-A938-D956F5E5D4F8}
- Rhino.Mocks 3.5
-
-
-
-
- ayende-open-source.snk
-
-
-
-
+
+
+
+ Debug
+ AnyCPU
+ 9.0.30729
+ 2.0
+ {3078B943-10A5-41FA-A68A-7C4FC98506A0}
+ Library
+ Properties
+ Rhino.Mocks.Tests.Model
+ Rhino.Mocks.Tests.Model
+ v3.5
+ 512
+ true
+ ..\ayende-open-source.snk
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ 1607
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+ 3.5
+
+
+ 3.5
+
+
+ 3.5
+
+
+
+
+
+
+
+
+
+
+
+
+ {1E8FECC7-9E9B-4275-A938-D956F5E5D4F8}
+ Rhino.Mocks 3.5
+
+
+
+
+ ayende-open-source.snk
+
+
+
+
\ No newline at end of file
diff --git a/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj b/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj
index 968a81b3..734324dd 100644
--- a/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj
+++ b/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj
@@ -49,6 +49,7 @@
4
false
Full
+ 1607
..\..\Build\Tests\Release\
diff --git a/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj.orig b/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj.orig
index a210bd8b..656fa6df 100644
--- a/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj.orig
+++ b/Rhino.Mocks.Tests/Rhino.Mocks.Tests.csproj.orig
@@ -164,6 +164,7 @@
+
@@ -499,6 +500,7 @@
4
false
Full
+ 1607
..\..\Build\Tests\Release\
@@ -896,5 +898,5 @@
->>>>>>> c179d176c19eaa02dd60c1579e650517e6c7401b
+>>>>>>> ef659c075982661d6189a9fc533c2cbfb12a3700
\ No newline at end of file
diff --git a/Rhino.Mocks/Rhino.Mocks.csproj b/Rhino.Mocks/Rhino.Mocks.csproj
index e762b544..0b340d05 100644
--- a/Rhino.Mocks/Rhino.Mocks.csproj
+++ b/Rhino.Mocks/Rhino.Mocks.csproj
@@ -39,6 +39,7 @@
true
4
true
+ 1607
bin\Release\
diff --git a/Rhino.Mocks/Rhino.Mocks.csproj.orig b/Rhino.Mocks/Rhino.Mocks.csproj.orig
new file mode 100644
index 00000000..2e1450c5
--- /dev/null
+++ b/Rhino.Mocks/Rhino.Mocks.csproj.orig
@@ -0,0 +1,580 @@
+<<<<<<< HEAD
+
+
+ Local
+ 9.0.30729
+ 2.0
+ {1E8FECC7-9E9B-4275-A938-D956F5E5D4F8}
+ Debug
+ AnyCPU
+ Rhino.Mocks
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ Rhino.Mocks
+ OnBuildSuccess
+ true
+ ..\ayende-open-source.snk
+
+
+ 2.0
+
+
+ v3.5
+
+
+ bin\debug\
+ false
+ 285212672
+ false
+ TRACE;DEBUG;DOTNET35
+ bin\debug\Rhino.Mocks.XML
+ true
+ 4096
+ false
+ false
+ false
+ false
+ true
+ 4
+ true
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+ TRACE;dotNet2
+ true
+ 4096
+ false
+ true
+ false
+ false
+ false
+ 4
+ pdbonly
+ Rhino.Mocks.XML
+
+
+
+ False
+ ..\SharedLibs\Castle.Core.dll
+
+
+ False
+ ..\SharedLibs\Castle.DynamicProxy2.dll
+
+
+ System
+
+
+ 3.5
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+ ayende-open-source.snk
+
+
+
+
+
+
+
+
+
+
+
+=======
+
+
+ Local
+ 9.0.30729
+ 2.0
+ {1E8FECC7-9E9B-4275-A938-D956F5E5D4F8}
+ Debug
+ AnyCPU
+ Rhino.Mocks
+ JScript
+ Grid
+ IE50
+ false
+ Library
+ Rhino.Mocks
+ OnBuildSuccess
+ true
+ ..\ayende-open-source.snk
+
+
+ 2.0
+
+
+ v3.5
+
+
+ bin\debug\
+ false
+ 285212672
+ false
+ TRACE;DEBUG;DOTNET35
+ bin\debug\Rhino.Mocks.XML
+ true
+ 4096
+ false
+ false
+ false
+ false
+ true
+ 4
+ true
+ 1607
+
+
+ bin\Release\
+ false
+ 285212672
+ false
+ TRACE;dotNet2
+ true
+ 4096
+ false
+ true
+ false
+ false
+ false
+ 4
+ pdbonly
+ Rhino.Mocks.XML
+
+
+
+ False
+ ..\SharedLibs\Castle.Core.dll
+
+
+ False
+ ..\SharedLibs\Castle.DynamicProxy2.dll
+
+
+ System
+
+
+ 3.5
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+ Code
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+ ayende-open-source.snk
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> ef659c075982661d6189a9fc533c2cbfb12a3700
+
\ No newline at end of file
diff --git a/psake_ext.ps1 b/psake_ext.ps1
index 280c2fea..f4b3da93 100644
--- a/psake_ext.ps1
+++ b/psake_ext.ps1
@@ -1,3 +1,9 @@
+function Get-Git-Commit
+{
+ $gitLog = git log --oneline -1
+ return $gitLog.Split(' ')[0]
+}
+
function Generate-Assembly-Info
{
param(
@@ -10,7 +16,7 @@ param(
[string]$version,
[string]$file = $(throw "file is a required parameter.")
)
-
+ $commit = Get-Git-Commit
$asmInfo = "using System;
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -24,7 +30,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProductAttribute(""$product"")]
[assembly: AssemblyCopyrightAttribute(""$copyright"")]
[assembly: AssemblyVersionAttribute(""$version"")]
-[assembly: AssemblyInformationalVersionAttribute(""$version"")]
+[assembly: AssemblyInformationalVersionAttribute(""$version / $commit"")]
[assembly: AssemblyFileVersionAttribute(""$version"")]
[assembly: AssemblyDelaySignAttribute(false)]
"
@@ -36,5 +42,5 @@ using System.Runtime.InteropServices;
[System.IO.Directory]::CreateDirectory($dir)
}
Write-Host "Generating assembly info file: $file"
- Write-Output $asmInfo > $file
+ out-file -filePath $file -encoding UTF8 -inputObject $asmInfo
}
\ No newline at end of file
diff --git a/psake_ext.ps1.orig b/psake_ext.ps1.orig
new file mode 100644
index 00000000..bd1dbb6b
--- /dev/null
+++ b/psake_ext.ps1.orig
@@ -0,0 +1,88 @@
+<<<<<<< HEAD
+function Generate-Assembly-Info
+{
+param(
+ [string]$clsCompliant = "true",
+ [string]$title,
+ [string]$description,
+ [string]$company,
+ [string]$product,
+ [string]$copyright,
+ [string]$version,
+ [string]$file = $(throw "file is a required parameter.")
+)
+
+ $asmInfo = "using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: CLSCompliantAttribute($clsCompliant )]
+[assembly: ComVisibleAttribute(false)]
+[assembly: AssemblyTitleAttribute(""$title"")]
+[assembly: AssemblyDescriptionAttribute(""$description"")]
+[assembly: AssemblyCompanyAttribute(""$company"")]
+[assembly: AssemblyProductAttribute(""$product"")]
+[assembly: AssemblyCopyrightAttribute(""$copyright"")]
+[assembly: AssemblyVersionAttribute(""$version"")]
+[assembly: AssemblyInformationalVersionAttribute(""$version"")]
+[assembly: AssemblyFileVersionAttribute(""$version"")]
+[assembly: AssemblyDelaySignAttribute(false)]
+"
+
+ $dir = [System.IO.Path]::GetDirectoryName($file)
+ if ([System.IO.Directory]::Exists($dir) -eq $false)
+ {
+ Write-Host "Creating directory $dir"
+ [System.IO.Directory]::CreateDirectory($dir)
+ }
+ Write-Host "Generating assembly info file: $file"
+ Write-Output $asmInfo > $file
+=======
+function Get-Git-Commit
+{
+ $gitLog = git log --oneline -1
+ return $gitLog.Split(' ')[0]
+}
+
+function Generate-Assembly-Info
+{
+param(
+ [string]$clsCompliant = "true",
+ [string]$title,
+ [string]$description,
+ [string]$company,
+ [string]$product,
+ [string]$copyright,
+ [string]$version,
+ [string]$file = $(throw "file is a required parameter.")
+)
+ $commit = Get-Git-Commit
+ $asmInfo = "using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: CLSCompliantAttribute($clsCompliant )]
+[assembly: ComVisibleAttribute(false)]
+[assembly: AssemblyTitleAttribute(""$title"")]
+[assembly: AssemblyDescriptionAttribute(""$description"")]
+[assembly: AssemblyCompanyAttribute(""$company"")]
+[assembly: AssemblyProductAttribute(""$product"")]
+[assembly: AssemblyCopyrightAttribute(""$copyright"")]
+[assembly: AssemblyVersionAttribute(""$version"")]
+[assembly: AssemblyInformationalVersionAttribute(""$version / $commit"")]
+[assembly: AssemblyFileVersionAttribute(""$version"")]
+[assembly: AssemblyDelaySignAttribute(false)]
+"
+
+ $dir = [System.IO.Path]::GetDirectoryName($file)
+ if ([System.IO.Directory]::Exists($dir) -eq $false)
+ {
+ Write-Host "Creating directory $dir"
+ [System.IO.Directory]::CreateDirectory($dir)
+ }
+ Write-Host "Generating assembly info file: $file"
+ out-file -filePath $file -encoding UTF8 -inputObject $asmInfo
+>>>>>>> ef659c075982661d6189a9fc533c2cbfb12a3700
+}
\ No newline at end of file