From e310d2689bf6b5aea185f43914b90cbc35cbd7e6 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Wed, 28 Feb 2018 14:50:27 +0100
Subject: [PATCH] Specify a namespace for generated BuildDetails.
---
ATxCommon/BuildDetails.cs | 19 ++++++++++-------
ATxCommon/Properties/AssemblyInfo.cs | 18 ++++++++--------
ATxService/Properties/AssemblyInfo.cs | 18 ++++++++--------
Scripts/Prepare-Build.ps1 | 30 ++++++++++++++-------------
4 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/ATxCommon/BuildDetails.cs b/ATxCommon/BuildDetails.cs
index dab096d..e9329db 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 3ffd032..9488ca0 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 73261ca..dab30e9 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 7fbe681..ae66900 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
--
GitLab