Index: Core/Common/src/Core.Common.Version/Core.Common.Version.csproj =================================================================== diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -r08c1a9d855a1beecb7396a1e95b3bc83fe8c7065 --- Core/Common/src/Core.Common.Version/Core.Common.Version.csproj (.../Core.Common.Version.csproj) (revision 63fc151e9cf722527465c1eddfa6567a90feb5e6) +++ Core/Common/src/Core.Common.Version/Core.Common.Version.csproj (.../Core.Common.Version.csproj) (revision 08c1a9d855a1beecb7396a1e95b3bc83fe8c7065) @@ -7,7 +7,7 @@ - cmd /c $(SolutionDir)\build\svn_insert_version.cmd $(SolutionDir)\Core\Common\src\Core.Common.Version GlobalAssembly.cs.svn GlobalAssembly.cs + cmd /c $(SolutionDir)\build\git_insert_hash.cmd $(SolutionDir)\Core\Common\src\Core.Common.Version GlobalAssembly.cs.svn GlobalAssembly.cs Index: Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn =================================================================== diff -u -rad492eefc1764e94cc771a1e85a4d2d69a7c9fe9 -r08c1a9d855a1beecb7396a1e95b3bc83fe8c7065 --- Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision ad492eefc1764e94cc771a1e85a4d2d69a7c9fe9) +++ Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn (.../GlobalAssembly.cs.svn) (revision 08c1a9d855a1beecb7396a1e95b3bc83fe8c7065) @@ -35,5 +35,5 @@ [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] -[assembly: AssemblyVersion("17.3.1.SVNREV")] -[assembly: AssemblyFileVersion("17.3.1.SVNREV")] \ No newline at end of file +[assembly: AssemblyVersion("18.1.1.GITHASH")] +[assembly: AssemblyFileVersion("18.1.1.GITHASH")] \ No newline at end of file Index: build/git_insert_hash.cmd =================================================================== diff -u --- build/git_insert_hash.cmd (revision 0) +++ build/git_insert_hash.cmd (revision 08c1a9d855a1beecb7396a1e95b3bc83fe8c7065) @@ -0,0 +1,46 @@ +REM This script is used for adding the GIT (short) hash to the properties of +REM a .Net assembly. +REM It has to be positioned in the present dir, where the solution is, +REM because the this script (the pre-build-events in the .Net projects) +REM refer to $(SolutionDir) + +setlocal enabledelayedexpansion +@ECHO off + +SET SEARCHTEXT=GITHASH +SET ORG_DIR=%CD% +SET INTEXTFILE=%2 +SET OUTTEXTFILE=%3 +SET TEMPTEXTFILE= %OUTTEXTFILE%.temp + +CD %1 + +REM GET THE GIT SHORT HASH +FOR /f %%i in ('git rev-parse --short HEAD') do set GIT_HASH=%%i + +REM REMOVE PREVIOUS TEMP FILE +IF EXIST %TEMPTEXTFILE% ( + DEL %TEMPTEXTFILE% +) + +REM SUBSTITUTE THE GIT SHORT HASH IN TEMPLATE +FOR /f "tokens=1,* delims=�" %%A IN ( '"type %INTEXTFILE%"') DO ( + SET string=%%A + SET modified=!string:%SEARCHTEXT%=%GIT_HASH%! + ECHO !modified! >> %TEMPTEXTFILE% +) + +REM COMPARE TEMP FILE WITH OUTFILE +FC /A /L %TEMPTEXTFILE% %OUTTEXTFILE% + +IF %ERRORLEVEL% == 0 ( + REM IF THEY ARE IDENTICAL + DEL %TEMPTEXTFILE% +) ELSE ( + REM IF DIFFERENT + MOVE /Y %TEMPTEXTFILE% %OUTTEXTFILE% +) + +CD %ORG_DIR% + +:EOF \ No newline at end of file Fisheye: Tag 08c1a9d855a1beecb7396a1e95b3bc83fe8c7065 refers to a dead (removed) revision in file `build/svn_insert_version.cmd'. Fisheye: No comparison available. Pass `N' to diff?