Merge branch 'postBuildChange' into versionInjection

# Conflicts:
#	.build/linuxPostBuildEvent.sh
This commit is contained in:
lukeIam committed 2018-05-04 14:25:00 +02:00
commit d9abc85427
2 files changed
+3 -11

No files matched your search

-1
View File
@@ -5,4 +5,3 @@ sed -i -r -e 's/AssemblyInformationalVersion\(".*?"\)/AssemblyInformationalVersi
sed -i -r -e 's/AssemblyVersion\(".*?"\)/AssemblyVersion("0.0.0")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -r -e 's/AssemblyFileVersion\(".*?"\)/AssemblyFileVersion("0.0.0")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -r -e 's/AssemblyTitle\(".*?"\)/AssemblyTitle("Vocaluxe '"'"'Not Versioned'"'"' 0.0.0 (NA) (0.0.0-na-notversioned)")/' $PROJECT/Properties/AssemblyInfo.cs
sed -i -e 's/var matchingServerVersion = "";/var matchingServerVersion = "'$(git describe --long)'";/' $PROJECT/../Output/Website/js/main.js
+3 -10
View File
@@ -3,18 +3,11 @@ param(
[String]$ProjectDir
)
if($Env:GIT_VERSION_TAG)
if($Env:VOCALUXE_SKIP_POSTBUILD)
{
$version = $Env:GIT_VERSION_TAG;
Write-Host "Skipping post build script (as requested)"
exit
}
else
{
$version = git describe --long;
}
(Get-Content -Encoding UTF8 "$($ProjectDir)..\Output\Website\js\main.js") `
| Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} `
| Set-Content -Encoding UTF8 "$($ProjectDir)..\Output\Website\js\main.js"
(Get-Content -Encoding UTF8 "$($ProjectDir)Properties\AssemblyInfo.cs") `
| Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\(\").*(?=\")', '0.0.0-na-notversioned'} `