From 56cfcfc19fded2059210b6e1fddb93c660006bc9 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Wed, 13 Dec 2017 14:19:15 +0100
Subject: [PATCH] Report build configuration, automatically use it for
 Make-Package.

---
 AutoTx/ATXProject.csproj    |  4 ++++
 AutoTx/Resources/.gitignore |  1 +
 Scripts/Make-Package.ps1    | 23 ++++++++++++++---------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj
index d1a9b28..3281374 100644
--- a/AutoTx/ATXProject.csproj
+++ b/AutoTx/ATXProject.csproj
@@ -150,6 +150,10 @@
   <PropertyGroup>
     <PreBuildEvent>PowerShell -Command "Get-Date -Format 'yyyy-MM-dd HH:mm:ss' &gt; $(ProjectDir)\Resources\BuildDate.txt ; Get-Content $(ProjectDir)\Resources\BuildDate.txt"
 </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" &gt; $(ProjectDir)\Resources\BuildConfiguration.txt
+</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/AutoTx/Resources/.gitignore b/AutoTx/Resources/.gitignore
index 8caf53c..8b0d5a6 100644
--- a/AutoTx/Resources/.gitignore
+++ b/AutoTx/Resources/.gitignore
@@ -1 +1,2 @@
 BuildDate.txt
+BuildConfiguration.txt
diff --git a/Scripts/Make-Package.ps1 b/Scripts/Make-Package.ps1
index a285907..5e93d62 100644
--- a/Scripts/Make-Package.ps1
+++ b/Scripts/Make-Package.ps1
@@ -1,12 +1,5 @@
-[CmdletBinding()]
-Param(
-    [ValidateSet("Debug", "Release")][String] $Target = "Debug"
-)
-
-
 $ResourceDir = "..\AutoTx\Resources"
 $TemplateDir = "$($ResourceDir)\Mail-Templates"
-$BinariesDir = "..\AutoTx\bin\$($Target)"
 
 try {
     $BuildDate = Get-Content "$($ResourceDir)\BuildDate.txt" -EA Stop
@@ -15,14 +8,23 @@ catch {
     Write-Host "Error reading build-date, stopping."
     Exit
 }
+try {
+    $BuildConfiguration = Get-Content "$($ResourceDir)\BuildConfiguration.txt" -EA Stop
+}
+catch {
+    Write-Host "Error reading build configuration, stopping."
+    Exit
+}
+
 
 $PkgDir = $BuildDate -replace ':','-' -replace ' ','_'
 $PkgDir = "build_" + $PkgDir
+$BinariesDir = "..\AutoTx\bin\$($BuildConfiguration)"
 
 Write-Host "Creating package [$($PkgDir)] using binaries from [$($BinariesDir)]"
 
 if (Test-Path $PkgDir) {
-    Write-Host "Removing existing package dir..."
+    Write-Host "Removing existing package dir [$($PkgDir)]..."
     Remove-Item -Recurse -Force $PkgDir
 }
 
@@ -38,6 +40,9 @@ Copy-Item "$($ResourceDir)\configuration-example.xml" $tgt
 Copy-Item "$($ResourceDir)\configuration-example.xml" "$($PkgDir)\configuration.xml"
 Copy-Item "$($ResourceDir)\status-example.xml" "$($PkgDir)\status.xml"
 Copy-Item "$($ResourceDir)\BuildDate.txt" "$($PkgDir)\service.log"
+Copy-Item "$($ResourceDir)\BuildConfiguration.txt" $($PkgDir)
 
 Copy-Item "ScriptsConfig.ps1" $PkgDir
-Copy-Item "Install-Service.ps1" $PkgDir
\ No newline at end of file
+Copy-Item "Install-Service.ps1" $PkgDir
+
+Write-Host "Done creating package [$($PkgDir)] (config: $($BuildConfiguration))"
\ No newline at end of file
-- 
GitLab