diff --git a/ATxCommon/BuildDetails.cs b/ATxCommon/BuildDetails.cs index dab096d1925c34bc7225ba37ea685cf06fce4606..e9329db7bf8f20c594261bd0e7f585684a9903de 100644 --- a/ATxCommon/BuildDetails.cs +++ b/ATxCommon/BuildDetails.cs @@ -1,10 +1,13 @@ -public static class BuildDetails +namespace ATxCommon { - public const string GitCommitName = "?commit?"; - public const string GitBranch = "?branch?"; - public const string GitMajor = "1"; - public const string GitMinor = "0"; - public const string GitPatch = "0"; - public const string BuildDate = "?build time?"; - public const string GitCommit = "?sha1?"; + public static class BuildDetails + { + public const string GitCommitName = "?commit?"; + public const string GitBranch = "?branch?"; + public const string GitMajor = "1"; + public const string GitMinor = "0"; + public const string GitPatch = "0"; + public const string BuildDate = "?build time?"; + public const string GitCommit = "?sha1"; + } } diff --git a/ATxCommon/Properties/AssemblyInfo.cs b/ATxCommon/Properties/AssemblyInfo.cs index 3ffd032f4093a5fc905ed45049144a75facde834..9488ca049ea3cbceb7e727e328bae26a1b60899d 100644 --- a/ATxCommon/Properties/AssemblyInfo.cs +++ b/ATxCommon/Properties/AssemblyInfo.cs @@ -31,13 +31,13 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion(BuildDetails.GitMajor + "." + - BuildDetails.GitMinor + "." + - BuildDetails.GitPatch + ".0")] -[assembly: AssemblyFileVersion(BuildDetails.GitMajor + "." + - BuildDetails.GitMinor + "." + - BuildDetails.GitPatch + ".0")] +[assembly: AssemblyVersion(ATxCommon.BuildDetails.GitMajor + "." + + ATxCommon.BuildDetails.GitMinor + "." + + ATxCommon.BuildDetails.GitPatch + ".0")] +[assembly: AssemblyFileVersion(ATxCommon.BuildDetails.GitMajor + "." + + ATxCommon.BuildDetails.GitMinor + "." + + ATxCommon.BuildDetails.GitPatch + ".0")] -[assembly: AssemblyInformationalVersion(BuildDetails.BuildDate + - " " + BuildDetails.GitCommit + - " (" + BuildDetails.GitBranch + ")")] +[assembly: AssemblyInformationalVersion(ATxCommon.BuildDetails.BuildDate + + " " + ATxCommon.BuildDetails.GitCommit + + " (" + ATxCommon.BuildDetails.GitBranch + ")")] \ No newline at end of file diff --git a/ATxService/Properties/AssemblyInfo.cs b/ATxService/Properties/AssemblyInfo.cs index 73261ca529769bb8d98bd6e44c5c8d63b4b69878..dab30e9eb6cb8a11fff898b252f96a39e404575b 100644 --- a/ATxService/Properties/AssemblyInfo.cs +++ b/ATxService/Properties/AssemblyInfo.cs @@ -31,13 +31,13 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion(BuildDetails.GitMajor + "." + - BuildDetails.GitMinor + "." + - BuildDetails.GitPatch + ".0")] -[assembly: AssemblyFileVersion(BuildDetails.GitMajor + "." + - BuildDetails.GitMinor + "." + - BuildDetails.GitPatch + ".0")] +[assembly: AssemblyVersion(ATxCommon.BuildDetails.GitMajor + "." + + ATxCommon.BuildDetails.GitMinor + "." + + ATxCommon.BuildDetails.GitPatch + ".0")] +[assembly: AssemblyFileVersion(ATxCommon.BuildDetails.GitMajor + "." + + ATxCommon.BuildDetails.GitMinor + "." + + ATxCommon.BuildDetails.GitPatch + ".0")] -[assembly: AssemblyInformationalVersion(BuildDetails.BuildDate + - " " + BuildDetails.GitCommit + - " (" + BuildDetails.GitBranch + ")")] +[assembly: AssemblyInformationalVersion(ATxCommon.BuildDetails.BuildDate + + " " + ATxCommon.BuildDetails.GitCommit + + " (" + ATxCommon.BuildDetails.GitBranch + ")")] diff --git a/Scripts/Prepare-Build.ps1 b/Scripts/Prepare-Build.ps1 index 7fbe681a094510ec5b68f0c9e39128e410a8deee..ae669007cd26290897dbe6ac25eb5208c4b9d99a 100644 --- a/Scripts/Prepare-Build.ps1 +++ b/Scripts/Prepare-Build.ps1 @@ -5,15 +5,18 @@ Param( ) $CsTemplate = @" -public static class BuildDetails +namespace ATxCommon {{ - public const string GitCommitName = "{0}"; - public const string GitBranch = "{1}"; - public const string GitMajor = "{2}"; - public const string GitMinor = "{3}"; - public const string GitPatch = "{4}"; - public const string BuildDate = "{5}"; - public const string GitCommit = "{6}"; + public static class BuildDetails + {{ + public const string GitCommitName = "{0}"; + public const string GitBranch = "{1}"; + public const string GitMajor = "{2}"; + public const string GitMinor = "{3}"; + public const string GitPatch = "{4}"; + public const string BuildDate = "{5}"; + public const string GitCommit = "{6}"; + }} }} "@ @@ -66,6 +69,11 @@ $ErrorActionPreference = "Stop" $OldLocation = Get-Location Set-Location $SolutionDir -ErrorAction Stop +$BCommit = "$($SolutionDir)\Resources\BuildCommit.txt" +$BuildDate = "$($SolutionDir)\Resources\BuildDate.txt" +$BuildConfig = "$($SolutionDir)\Resources\BuildConfiguration.txt" +$BuildDetailsCS = "$($SolutionDir)\ATxCommon\BuildDetails.cs" + try { $CommitName = & git describe --tags --long --match "[0-9].[0-9]" if (-Not $?) { throw } @@ -96,12 +104,6 @@ $Date = Get-Date -Format 'yyyy-MM-dd HH:mm:ss' $DateShort = Get-Date -Format 'yyyy.MM.dd.HHmm' -$BCommit = "$($SolutionDir)\Resources\BuildCommit.txt" -$BuildDate = "$($SolutionDir)\Resources\BuildDate.txt" -$BuildConfig = "$($SolutionDir)\Resources\BuildConfiguration.txt" -$BuildDetailsCS = "$($SolutionDir)\ATxCommon\BuildDetails.cs" - - $Date | Out-File $BuildDate $CommitName | Out-File $BCommit $ConfigurationName | Out-File $BuildConfig