From 928d4bc0cdcddd0d068034232fa4f00886124db1 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Tue, 27 Feb 2018 09:31:24 +0100
Subject: [PATCH] Include ConfigurationName in Prepare-Build.
There is no need to have this only as a post-build event, providing it
at this stage will allow us to include it in the assembly information.
---
ATxService/ATxService.csproj | 6 +++---
Scripts/Prepare-Build.ps1 | 17 ++++++++++++-----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ATxService/ATxService.csproj b/ATxService/ATxService.csproj
index dc0462b..8085649 100644
--- a/ATxService/ATxService.csproj
+++ b/ATxService/ATxService.csproj
@@ -171,11 +171,11 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)\Scripts\Prepare-Build.ps1 $(ProjectDir)</PreBuildEvent>
+ <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)\Scripts\Prepare-Build.ps1 -ProjectDir $(ProjectDir) -ConfigurationName $(ConfigurationName)</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
- <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" > $(ProjectDir)\Resources\BuildConfiguration.txt
-</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Scripts/Prepare-Build.ps1 b/Scripts/Prepare-Build.ps1
index cb0cea6..3198e85 100644
--- a/Scripts/Prepare-Build.ps1
+++ b/Scripts/Prepare-Build.ps1
@@ -1,6 +1,7 @@
[CmdletBinding()]
Param(
- [Parameter(Mandatory=$True)][string] $ProjectDir
+ [Parameter(Mandatory=$True)][string] $ProjectDir,
+ [Parameter(Mandatory=$True)][string] $ConfigurationName
)
function Write-BuildDetails {
@@ -81,14 +82,20 @@ $Date = Get-Date -Format 'yyyy-MM-dd HH:mm:ss'
$BCommit = "$($ProjectDir)\Resources\BuildCommit.txt"
$BuildDate = "$($ProjectDir)\Resources\BuildDate.txt"
+$BuildConfig = "$($ProjectDir)\Resources\BuildConfiguration.txt"
$BuildDetailsCS = "$($ProjectDir)\..\Resources\BuildDetails.cs"
-Write-Output $CommitName > $BCommit
+
Write-Output $Date > $BuildDate
+Write-Output $CommitName > $BCommit
+Write-Output $ConfigurationName > $BuildConfig
-Write-Output "build-date: $($Date)"
-Write-Output "git-branch: $($GitBranch)"
-Write-Output "git-description: $($CommitName)$($StatusWarning)"
+Write-Output $(
+ "build-config: [$($ConfigurationName)]"
+ "build-date: [$($Date)]"
+ "git-branch: [$($GitBranch)]"
+ "git-describe: [$($CommitName)]$($StatusWarning)"
+)
Write-BuildDetails $BuildDetailsCS $DescItems $GitBranch $Date
--
GitLab