From e6899ac145a06897457ed21b7f0838fe9086f1c3 Mon Sep 17 00:00:00 2001
From: Kai Kriegel <kai@kjkriegel.de>
Date: Fri, 17 Sep 2021 00:46:10 +0000
Subject: [PATCH] Update .gitlab-ci.yml,
 Borepin/Borepin.Android/Borepin.Android.csproj files

---
 .gitlab-ci.yml                                 | 2 ++
 Borepin/Borepin.Android/Borepin.Android.csproj | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1acb7a4..7ae6119 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,8 @@ variables:
   DOTNET_PATH: 'C:\Program Files\dotnet\dotnet.exe'
   MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe'
   NUNIT_PATH: 'C:\ProgramData\chocolatey\bin\nunit3-console.exe'
+  LC_ALL: 'en_US.UTF-8'
+  LANG: 'en_US.UTF-8'
 
 stages:
   - build
diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj
index 9a7f116..b6fb6d8 100644
--- a/Borepin/Borepin.Android/Borepin.Android.csproj
+++ b/Borepin/Borepin.Android/Borepin.Android.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -178,4 +178,9 @@
       <UserProperties TriggeredFromHotReload="False" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
+
+<Target Name="BeforeBuild" Condition=" '$(CI)' == 'true' ">
+    <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionCode" Value="$(CI_COMMIT_SHORT_SHA)" />
+    <XmlPoke XmlInputPath="Properties\AndroidManifest.xml" Namespaces="&lt;Namespace Prefix='android' Uri='http://schemas.android.com/apk/res/android' /&gt;" Query="manifest/@android:versionName" Value="2.0.$(CI_COMMIT_SHORT_SHA)" />
+</Target>