From 14317629d0c4c3f714520012c5676c10e45254c9 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 20:50:54 +0200
Subject: [PATCH 1/8] Ordered ContainerRegister

---
 Borepin/Borepin/App.xaml.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index 69b1e29..7fcc0d7 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -35,33 +35,37 @@ namespace Borepin
 
         protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {
-            // Register Navigation
+            #region Register Basic Navigation
+            containerRegistry.RegisterForNavigation<MainPage, MainPagePageModel>();
+            containerRegistry.RegisterForNavigation<NavigationPage>();
+
             containerRegistry.RegisterForNavigation<StartUpDistributorPage, StartUpDistributorPageModel>();
 
-            containerRegistry.RegisterForNavigation<NavigationPage>();
-            containerRegistry.RegisterForNavigation<MainPage, MainPagePageModel>();
             containerRegistry.RegisterForNavigation<MachinePage, MachinePageModel>();
             containerRegistry.RegisterForNavigation<SettingsPage>();
             containerRegistry.RegisterForNavigation<MachineListPage, MachineListPageModel>();
             containerRegistry.RegisterForNavigation<ServerListPage, ServerListPageModel>();
             containerRegistry.RegisterForNavigation<ServerPage, ServerPageModel>();
-            containerRegistry.RegisterForNavigation<ListPage, ListPageModel>();
+            #endregion
 
+            #region Register Sequence Navigation
             containerRegistry.RegisterForNavigation<WelcomePage, WelcomePageModel>("SetUpProcess_WelcomePage");
             //containerRegistry.RegisterForNavigation<ScanPage, ScanPageModel>("SetUpProcess_ScanPage");
 
             containerRegistry.RegisterForNavigation<LoginPasswordPage, LoginPasswordPageModel>("AddServerProcess_LoginPasswordPage");
             containerRegistry.RegisterForNavigation<HostSelectPage, HostSelectPageModel>("AddServerProcess_HostSelectPage");
             containerRegistry.RegisterForNavigation<LoginChoosePage, LoginChoosePageModel>("AddServerProcess_LoginChoosePage");
+            #endregion
 
-            //containerRegistry.RegisterForNavigation<TestPage, TestPageModel>();
-            // Register Dialog
+            #region Register Dialog
             containerRegistry.RegisterDialog<ConfirmDialog, ConfirmDialogModel>();
+            #endregion
 
-            // Register Service
+            #region Register Service
             containerRegistry.Register<IConnectionService, ConnectionService>();
             containerRegistry.Register<ICredentialService, CredentialService>();
             containerRegistry.RegisterSingleton<IBFFHService, BFFHService>();
+            #endregion
         }
     }
 }

From cb985420720fcd9bdfa86085cfad42a609e5da3d Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 20:55:22 +0200
Subject: [PATCH 2/8] Fixed Notch Problem

---
 Borepin/Borepin/Page/MainPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Borepin/Borepin/Page/MainPage.xaml b/Borepin/Borepin/Page/MainPage.xaml
index 7d56fd9..0e4259a 100644
--- a/Borepin/Borepin/Page/MainPage.xaml
+++ b/Borepin/Borepin/Page/MainPage.xaml
@@ -5,7 +5,7 @@
                   x:Name="page">
     <FlyoutPage.Flyout>
         <ContentPage Title="FabAccess">
-            <StackLayout>
+            <StackLayout Margin="0,50,0,0">
                 <Button Text="Machines" Command="{Binding NavigateCommand}" CommandParameter="MachineListPage" />
                 <Button Text="Servers" Command="{Binding NavigateCommand}" CommandParameter="ServerListPage" />
                 <!--<Button Text="Settings" Command="{Binding NavigateCommand}" CommandParameter="SettingsPage" />-->

From f41b69cfd8d4406acfa6945d06cce9faaf28ca07 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 21:29:44 +0200
Subject: [PATCH 3/8] Added ForceFree

---
 Borepin/Borepin/Page/MachinePage.xaml         | 14 +++++++++++---
 Borepin/Borepin/PageModel/MachinePageModel.cs | 18 +++++++++++++++++-
 Borepin/Borepin/View/MachineListItemView.xaml |  4 ++--
 Borepin/Borepin/View/ServerListItemView.xaml  |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml
index c4a8201..10f3a98 100644
--- a/Borepin/Borepin/Page/MachinePage.xaml
+++ b/Borepin/Borepin/Page/MachinePage.xaml
@@ -21,9 +21,17 @@
             </StackLayout>
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
                 <Label Text="{Binding MachineItem.Name}" Style="{StaticResource LabelStyle_Title}"/>
-
-                <Button Text="Use" Command="{Binding UseMachineCommand}" IsVisible="{Binding MachineItem.CanUse}" Style="{StaticResource Style_Button_Primary}"/>
-                <Button Text="GiveBack" Command="{Binding GiveBackMachineCommand}" IsVisible="{Binding MachineItem.CanInUse}" Style="{StaticResource Style_Button_Primary}"/>
+                <Label Text="{Binding MachineItem.Description}" Style="{StaticResource Style_Label_Text}"/>
+                <StackLayout IsVisible="{Binding MachineItem.CanUse}">
+                    <Button Text="Use" Command="{Binding UseMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                </StackLayout>
+                <StackLayout IsVisible="{Binding MachineItem.CanInUse}">
+                    <Button Text="GiveBack" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                </StackLayout>
+                <StackLayout IsVisible="{Binding MachineItem.CanManage}">
+                    <Label Text="Manage Machine:" Style="{StaticResource Style_Label_Property_Title}"/>
+                    <Button Text="Force Free" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                </StackLayout>
             </StackLayout>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/PageModel/MachinePageModel.cs b/Borepin/Borepin/PageModel/MachinePageModel.cs
index c624f01..3b898ae 100644
--- a/Borepin/Borepin/PageModel/MachinePageModel.cs
+++ b/Borepin/Borepin/PageModel/MachinePageModel.cs
@@ -25,6 +25,7 @@ namespace Borepin.PageModel
 
             UseMachineCommand = new DelegateCommand(UseMachineCommandExecuted);
             GiveBackMachineCommand = new DelegateCommand(GiveBackMachineCommandExecuted);
+            ForceFreeMachineCommand = new DelegateCommand(ForceFreeMachineCommandExecuted);
         }
         #endregion
 
@@ -85,12 +86,27 @@ namespace Borepin.PageModel
             await inUseInterface.GiveBack();
             await LoadData();
         }
+
+        private ICommand _ForceFreeMachineCommand;
+        public ICommand ForceFreeMachineCommand
+        {
+            get => _ForceFreeMachineCommand;
+            set => SetProperty(ref _ForceFreeMachineCommand, value);
+        }
+
+        private async void ForceFreeMachineCommandExecuted()
+        {
+            Machine.IManageInterface manageInterface = _Machine.Manage;
+
+            await manageInterface.ForceFree();
+            await LoadData();
+        }
         #endregion
 
         #region INavigationService
         public override void OnNavigatedFrom(INavigationParameters parameters)
         {
-            
+
         }
 
         public override void OnNavigatedTo(INavigationParameters parameters)
diff --git a/Borepin/Borepin/View/MachineListItemView.xaml b/Borepin/Borepin/View/MachineListItemView.xaml
index 07bd8a1..893c341 100644
--- a/Borepin/Borepin/View/MachineListItemView.xaml
+++ b/Borepin/Borepin/View/MachineListItemView.xaml
@@ -14,9 +14,9 @@
         <Grid RowSpacing="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="5" />
-                <ColumnDefinition Width="7*" />
+                <ColumnDefinition Width="6*" />
+                <ColumnDefinition Width="2*" />
                 <ColumnDefinition Width="2*" />
-                <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="1" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
diff --git a/Borepin/Borepin/View/ServerListItemView.xaml b/Borepin/Borepin/View/ServerListItemView.xaml
index d956d40..d9b8462 100644
--- a/Borepin/Borepin/View/ServerListItemView.xaml
+++ b/Borepin/Borepin/View/ServerListItemView.xaml
@@ -9,7 +9,7 @@
                 <ColumnDefinition Width="5" />
                 <ColumnDefinition Width="7*" />
                 <ColumnDefinition Width="2*" />
-                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="2*" />
                 <ColumnDefinition Width="1" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>

From b2ec0c1a535a70f4384cb9bcdedc6b7ad12709f5 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 21:36:22 +0200
Subject: [PATCH 4/8] Fixed Server Name in Server List

---
 .../Borepin/PageModel/ServerListPageModel.cs  |  2 +-
 Borepin/Borepin/View/ServerListItemView.xaml  |  4 +--
 .../ViewModel/ServerListItemViewModel.cs      | 33 ++++++++++++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Borepin/Borepin/PageModel/ServerListPageModel.cs b/Borepin/Borepin/PageModel/ServerListPageModel.cs
index 20d7077..99d206b 100644
--- a/Borepin/Borepin/PageModel/ServerListPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerListPageModel.cs
@@ -93,7 +93,7 @@ namespace Borepin.PageModel
 
             NavigationParameters parameters = new NavigationParameters
             {
-                { "instance", viewmodel.Instance }
+                { "instance", viewmodel._Instance }
             };
 
             INavigationResult result = await _NavigationService.NavigateAsync($"ServerPage", parameters);
diff --git a/Borepin/Borepin/View/ServerListItemView.xaml b/Borepin/Borepin/View/ServerListItemView.xaml
index d9b8462..d3cced6 100644
--- a/Borepin/Borepin/View/ServerListItemView.xaml
+++ b/Borepin/Borepin/View/ServerListItemView.xaml
@@ -16,8 +16,8 @@
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="1"/>
             </Grid.RowDefinitions>
-            <Label Grid.Row="0" Grid.Column="1" Text="{Binding Instance.Address, StringFormat='{0}'}" Style="{StaticResource LabelStyle_Primary}"/>
-            <Label Grid.Row="0" Grid.Column="2" Text="{Binding Instance.Username}" Style="{StaticResource LabelStyle_Second}" HorizontalTextAlignment="End" />
+            <Label Grid.Row="0" Grid.Column="1" Text="{Binding Address, StringFormat='{0}'}" Style="{StaticResource LabelStyle_Primary}"/>
+            <Label Grid.Row="0" Grid.Column="2" Text="{Binding Username}" Style="{StaticResource LabelStyle_Second}" HorizontalTextAlignment="End" />
             <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="->" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:ServerListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}"/>
             <BoxView Grid.Row="1" Grid.ColumnSpan="5" BackgroundColor="{StaticResource FifthColor}"/>
         </Grid>
diff --git a/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs b/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
index d9ec40e..b4a26ed 100644
--- a/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
+++ b/Borepin/Borepin/ViewModel/ServerListItemViewModel.cs
@@ -1,28 +1,45 @@
 using Borepin.Model;
 using Prism.Mvvm;
+using System;
 
 namespace Borepin.ViewModel
 {
     public class ServerListItemViewModel : BindableBase
     {
+        #region Private Properties
+        public Connection _Instance { get; private set; }
+        #endregion
+
+        #region Constructors
         public ServerListItemViewModel(Connection instance)
         {
             _Instance = instance;
-            Address = instance.Address.ToString();
-        }
-
-        private Connection _Instance;
-        public Connection Instance
-        {
-            get => _Instance;
-            set => SetProperty(ref _Instance, value);
+            Address = ConvertUriToString(instance.Address);
+            Username = instance.Username;
         }
+        #endregion
 
+        #region Properties
         private string _Address;
         public string Address
         {
             get => _Address;
             set => SetProperty(ref _Address, value);
         }
+
+        private string _Username;
+        public string Username
+        {
+            get => _Username;
+            set => SetProperty(ref _Username, value);
+        }
+        #endregion
+
+        #region Methods
+        public string ConvertUriToString(Uri uri)
+        {
+            return uri.Host;
+        }
+        #endregion
     }
 }

From 8c446e76cd8813eb4b110fe7d9e2ad6e4e7e0e69 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 21:37:56 +0200
Subject: [PATCH 5/8] Foward to MachinePage after successfull login

---
 Borepin/Borepin/PageModel/ServerPageModel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Borepin/Borepin/PageModel/ServerPageModel.cs b/Borepin/Borepin/PageModel/ServerPageModel.cs
index 523f7b7..0c989fa 100644
--- a/Borepin/Borepin/PageModel/ServerPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerPageModel.cs
@@ -101,6 +101,13 @@ namespace Borepin.PageModel
                 }
 
                 IsConnected = true;
+
+                var result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/MachineListPage");
+
+                if (!result.Success)
+                {
+                    System.Diagnostics.Debugger.Break();
+                }
             }
 
             IsBusy = false;

From f954928a0de9f4faa93461a8e417a45b626143b5 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sat, 25 Sep 2021 22:50:43 +0200
Subject: [PATCH 6/8] Restructured Build Process

---
 .gitlab-ci.yml | 226 ++++++++++++++++++++++++-------------------------
 1 file changed, 109 insertions(+), 117 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95dd58e..30d008e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,16 +25,22 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   LIB_RELEASE_FOLDER: 'Borepin\Borepin\bin\Release'
+  
   UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\bin\x86\Release'
-  TEST_FOLDER: 'Tests\bin\Release'
-#   DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds'
+  ANDROID_RELEASE_FOLDER: 'Borepin/Borepin.Android/bin/Release/'
+  IOS_RELEASE_FOLDER: 'Borepin/Borepin.iOS/bin/iPhone/Debug/'
+  GTK_RELEASE_FOLDER: 'Borepin/Borepin.GTK/bin/Debug/'
+
   NUGET_PATH: 'C:\ProgramData\chocolatey\bin\nuget.exe'
   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'
+  JARSIGNER_PATH: 'C:\ProgramData\'
 
 stages:
   - build
+  - test
+  - sign
   - deploy
 
 build_base:
@@ -42,16 +48,13 @@ build_base:
   tags:
       - xamarin
       - windows
-#   only:
-#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore /target:Borepin'  # build the project
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore /target:Borepin'
   artifacts:
-    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+    expire_in: 1 week
     paths:
-      - '$env:LIB_RELEASE_FOLDER'  # saving exe to copy to deploy folder
-      # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
+      - '$env:LIB_RELEASE_FOLDER'
 
 build_UWP:
   needs:
@@ -60,16 +63,13 @@ build_UWP:
   tags:
       - xamarin
       - windows
-#   only:
-#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Debug /target:Borepin_UWP'  # build the project
-#  artifacts:
-#    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
-#    paths:
-#      - '$env:UWP_RELEASE_FOLDER'  # saving exe to copy to deploy folder
-#      - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Debug /target:Borepin_UWP'
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - '$env:UWP_RELEASE_FOLDER'
 
 build_Android:
   needs:
@@ -78,19 +78,13 @@ build_Android:
   tags:
       - xamarin
       - windows
-#   only:
-#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '[System.IO.File]::WriteAllBytes("$(pwd)/fabaccess.keystore", [System.Convert]::FromBase64String($AndroidKeyStore))'
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore="True" /p:AndroidSigningKeyStore="$(pwd)/fabaccess.keystore" /p:AndroidSigningKeyPass="$AndroidKeyStore_Password" /p:AndroidSigningKeyAlias="$AndroidKeyStore_ID" /p:AndroidSigningStorePass="$AndroidKeyStore_Password"' # build the project  
-    - rm "$(pwd)/fabaccess.keystore"
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /p:AndroidKeyStore="False"'
   artifacts:
-    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+    expire_in: 1 week 
     paths:
-      - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab  # saving apk to copy to deploy folder
-      - Borepin/Borepin.Android/bin/Release/
-      # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
+      - '$env:ANDROID_RELEASE_FOLDER'
 
 build_iOS:
   needs:
@@ -98,18 +92,14 @@ build_iOS:
   stage: build
   tags:
       - macos
-    # only:
-    #   - tags  # the build process will only be started by git tag commits
   script:
     - 'nuget restore'  # restore Nuget dependencies
     - 'msbuild /t:Restore'
-    - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true /p:BuildIpa=true'  # build the project  /p:AndroidKeyStore=True
+    - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true /p:BuildIpa=true'
   artifacts:
-    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+    expire_in: 1 week
     paths:
-      - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa
-      - Borepin/Borepin.iOS/bin/iPhone/Debug/
-      #  - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
+      - '$env:IOS_RELEASE_FOLDER'
 
 build_GTK:
   needs:
@@ -118,96 +108,98 @@ build_GTK:
   image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
   tags:
       - docker
-#   only:
-#     - tags  # the build process will only be started by git tag commits
   script:
     - 'nuget restore'  # restore Nuget dependencies
-    - 'msbuild -t:Borepin_GTK'  # build the project  /p:AndroidKeyStore=True
+    - 'msbuild -t:Borepin_GTK'
   artifacts:
-    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+    expire_in: 1 week
     paths:
-      - Borepin/Borepin.GTK/bin/Debug/
+      - '$env:GTK_RELEASE_FOLDER'
 
-# test_job:
-#   stage: test
-#   tags:
-#       - xamarin
-#       - windows
-# #   only:
-# #     - tags
-#   script:
-#     - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"'  # running NUnit tests
-#   artifacts:
-#     when: always  # save test results even when the task fails
-#     expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
-#     paths:
-#       - '.\TestResult.xml'  # saving NUnit results to copy to deploy folder
-#   dependencies:
-#     - build_job
+#sign_Android_internal:
+#  only:
+#    - alpha
+#    - beta
+#    variables:
+#        - $CI_COMMIT_REF_PROTECTED
+#  needs:
+#    - build_Android
+#  stage: sign
+#  tags:
+#      - xamarin
+#      - windows
+#  script:
+#    - '[System.IO.File]::WriteAllBytes("$(pwd)/fabaccess.keystore", [System.Convert]::FromBase64String($AndroidKeyStore))'
+#    - '& "$env:JARSIGNER_PATH" -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore "$(pwd)/fabaccess.keystore" Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess.aab "$AndroidKeyStore_ID_Internal" -storepass "$AndroidKeyStore_Password_Internal" -keypass "$AndroidKeyStore_Password_Internal"'  
+#    - rm "$(pwd)/fabaccess.keystore"
+#  artifacts:
+#    expire_in: 1 week
+#    paths:
+#      - '$env:ANDROID_RELEASE_FOLDER'
 
-deploy_Android_alpha:
-  variables:
-    LC_ALL: 'en_US.UTF-8'
-    LANG: 'en_US.UTF-8'
-  only:
-    - alpha
-  needs:
-    - build_Android
-  stage: deploy
-  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
-  tags:
-    - docker
-  before_script:
-    - 'echo $play_store_credentials > play-store-credentials.json'
-  script:
-    - 'bundle install'
-    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
-  after_script:
-    - 'rm play-store-credentials.json'
-  dependencies:
-    - build_Android
+#deploy_Android_alpha:
+#  variables:
+#    LC_ALL: 'en_US.UTF-8'
+#    LANG: 'en_US.UTF-8'
+#  only:
+#    - alpha
+#  needs:
+#    - build_Android
+#  stage: deploy
+#  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+#  tags:
+#    - docker
+#  before_script:
+#    - 'echo $play_store_credentials > play-store-credentials.json'
+#  script:
+#    - 'bundle install'
+#    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
+#  after_script:
+#    - 'rm play-store-credentials.json'
+#  dependencies:
+#    - build_Android
 
-deploy_Android_beta:
-  variables:
-    LC_ALL: 'en_US.UTF-8'
-    LANG: 'en_US.UTF-8'
-  only:
-    - beta
-  needs:
-    - build_Android
-  stage: deploy
-  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
-  tags:
-    - docker
-  before_script:
-    - 'echo $play_store_credentials > play-store-credentials.json'
-  script:
-    - 'bundle install'
-    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track beta'
-  after_script:
-    - 'rm play-store-credentials.json'
-  dependencies:
-    - build_Android
+#deploy_Android_beta:
+#  variables:
+#    LC_ALL: 'en_US.UTF-8'
+#    LANG: 'en_US.UTF-8'
+#  only:
+#    - beta
+#  needs:
+#    - build_Android
+#  stage: deploy
+#  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+#  tags:
+#    - docker
+#  before_script:
+#    - 'echo $play_store_credentials > play-store-credentials.json'
+#  script:
+#    - 'bundle install'
+#    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track beta'
+#  after_script:
+#    - 'rm play-store-credentials.json'
+#  dependencies:
+#    - build_Android
 
-deploy_iOS:
-  variables:
-    LC_ALL: 'en_US.UTF-8'
-    LANG: 'en_US.UTF-8'
-  only:
-    - alpha
-    - feature/fastlane
-  needs:
-    - build_iOS
-  stage: deploy
-  tags:
-    - macos
-  before_script:
-    - 'echo $app_store_credentials > app-store-credentials.json'
-    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
-  script:
-    - 'bundle install'
-    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa'
-  after_script:
-    - 'rm app-store-credentials.json'
-  dependencies:
-    - build_iOS
+#deploy_iOS:
+#  variables:
+#    LC_ALL: 'en_US.UTF-8'
+#    LANG: 'en_US.UTF-8'
+#  only:
+#    - alpha
+#    - feature/fastlane
+#  needs:
+#    - build_iOS
+#  stage: deploy
+#  tags:
+#    - macos
+#  before_script:
+#    - 'echo $app_store_credentials > app-store-credentials.json'
+#    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
+#  script:
+#    - 'bundle install'
+#    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa'
+#  after_script:
+#    - 'rm app-store-credentials.json'
+#  dependencies:
+#    - build_iOS
\ No newline at end of file

From 82ca6660b8c73a52a1706f696a4da24ea152cc1e Mon Sep 17 00:00:00 2001
From: TheJoKlLa <admin@MacBook-Air-06.fritz.box>
Date: Sun, 26 Sep 2021 00:31:53 +0200
Subject: [PATCH 7/8] Added Signing

---
 Borepin/Borepin.iOS/Borepin.iOS.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj
index dfc177f..7dc770f 100644
--- a/Borepin/Borepin.iOS/Borepin.iOS.csproj
+++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj
@@ -31,6 +31,8 @@
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchSdkVersion>14.5</MtouchSdkVersion>
+    <CodesignProvision>Borepin Distribution Profile 2021</CodesignProvision>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>

From df9980d9fe780477e9b31bf9bf61cd90ba2b9b11 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Sun, 26 Sep 2021 20:52:21 +0200
Subject: [PATCH 8/8] Revert "Restructured Build Process"

This reverts commit f954928a0de9f4faa93461a8e417a45b626143b5.
---
 .gitlab-ci.yml | 226 +++++++++++++++++++++++++------------------------
 1 file changed, 117 insertions(+), 109 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30d008e..95dd58e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,22 +25,16 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   LIB_RELEASE_FOLDER: 'Borepin\Borepin\bin\Release'
-  
   UWP_RELEASE_FOLDER: 'Borepin\Borepin.UWP\bin\x86\Release'
-  ANDROID_RELEASE_FOLDER: 'Borepin/Borepin.Android/bin/Release/'
-  IOS_RELEASE_FOLDER: 'Borepin/Borepin.iOS/bin/iPhone/Debug/'
-  GTK_RELEASE_FOLDER: 'Borepin/Borepin.GTK/bin/Debug/'
-
+  TEST_FOLDER: 'Tests\bin\Release'
+#   DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds'
   NUGET_PATH: 'C:\ProgramData\chocolatey\bin\nuget.exe'
   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'
-  JARSIGNER_PATH: 'C:\ProgramData\'
 
 stages:
   - build
-  - test
-  - sign
   - deploy
 
 build_base:
@@ -48,13 +42,16 @@ build_base:
   tags:
       - xamarin
       - windows
+#   only:
+#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore /target:Borepin'
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Restore /target:Borepin'  # build the project
   artifacts:
-    expire_in: 1 week
+    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
     paths:
-      - '$env:LIB_RELEASE_FOLDER'
+      - '$env:LIB_RELEASE_FOLDER'  # saving exe to copy to deploy folder
+      # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_UWP:
   needs:
@@ -63,13 +60,16 @@ build_UWP:
   tags:
       - xamarin
       - windows
+#   only:
+#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Debug /target:Borepin_UWP'
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - '$env:UWP_RELEASE_FOLDER'
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Debug /target:Borepin_UWP'  # build the project
+#  artifacts:
+#    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+#    paths:
+#      - '$env:UWP_RELEASE_FOLDER'  # saving exe to copy to deploy folder
+#      - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_Android:
   needs:
@@ -78,13 +78,19 @@ build_Android:
   tags:
       - xamarin
       - windows
+#   only:
+#     - tags  # the build process will only be started by git tag commits
   script:
     - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
-    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /p:AndroidKeyStore="False"'
+    - '[System.IO.File]::WriteAllBytes("$(pwd)/fabaccess.keystore", [System.Convert]::FromBase64String($AndroidKeyStore))'
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin_Android:PackageForAndroid /target:Borepin_Android:SignAndroidPackage /p:AndroidKeyStore="True" /p:AndroidSigningKeyStore="$(pwd)/fabaccess.keystore" /p:AndroidSigningKeyPass="$AndroidKeyStore_Password" /p:AndroidSigningKeyAlias="$AndroidKeyStore_ID" /p:AndroidSigningStorePass="$AndroidKeyStore_Password"' # build the project  
+    - rm "$(pwd)/fabaccess.keystore"
   artifacts:
-    expire_in: 1 week 
+    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
     paths:
-      - '$env:ANDROID_RELEASE_FOLDER'
+      - Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab  # saving apk to copy to deploy folder
+      - Borepin/Borepin.Android/bin/Release/
+      # - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_iOS:
   needs:
@@ -92,14 +98,18 @@ build_iOS:
   stage: build
   tags:
       - macos
+    # only:
+    #   - tags  # the build process will only be started by git tag commits
   script:
     - 'nuget restore'  # restore Nuget dependencies
     - 'msbuild /t:Restore'
-    - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true /p:BuildIpa=true'
+    - 'msbuild /t:Borepin_iOS /p:Configuration=Debug /p:Platform=iPhone /p:ArchiveOnBuild=true /p:BuildIpa=true'  # build the project  /p:AndroidKeyStore=True
   artifacts:
-    expire_in: 1 week
+    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
     paths:
-      - '$env:IOS_RELEASE_FOLDER'
+      - Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa
+      - Borepin/Borepin.iOS/bin/iPhone/Debug/
+      #  - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
 build_GTK:
   needs:
@@ -108,98 +118,96 @@ build_GTK:
   image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
   tags:
       - docker
+#   only:
+#     - tags  # the build process will only be started by git tag commits
   script:
     - 'nuget restore'  # restore Nuget dependencies
-    - 'msbuild -t:Borepin_GTK'
+    - 'msbuild -t:Borepin_GTK'  # build the project  /p:AndroidKeyStore=True
   artifacts:
-    expire_in: 1 week
+    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
     paths:
-      - '$env:GTK_RELEASE_FOLDER'
+      - Borepin/Borepin.GTK/bin/Debug/
 
-#sign_Android_internal:
-#  only:
-#    - alpha
-#    - beta
-#    variables:
-#        - $CI_COMMIT_REF_PROTECTED
-#  needs:
-#    - build_Android
-#  stage: sign
-#  tags:
-#      - xamarin
-#      - windows
-#  script:
-#    - '[System.IO.File]::WriteAllBytes("$(pwd)/fabaccess.keystore", [System.Convert]::FromBase64String($AndroidKeyStore))'
-#    - '& "$env:JARSIGNER_PATH" -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore "$(pwd)/fabaccess.keystore" Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess.aab "$AndroidKeyStore_ID_Internal" -storepass "$AndroidKeyStore_Password_Internal" -keypass "$AndroidKeyStore_Password_Internal"'  
-#    - rm "$(pwd)/fabaccess.keystore"
-#  artifacts:
-#    expire_in: 1 week
-#    paths:
-#      - '$env:ANDROID_RELEASE_FOLDER'
+# test_job:
+#   stage: test
+#   tags:
+#       - xamarin
+#       - windows
+# #   only:
+# #     - tags
+#   script:
+#     - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"'  # running NUnit tests
+#   artifacts:
+#     when: always  # save test results even when the task fails
+#     expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+#     paths:
+#       - '.\TestResult.xml'  # saving NUnit results to copy to deploy folder
+#   dependencies:
+#     - build_job
 
-#deploy_Android_alpha:
-#  variables:
-#    LC_ALL: 'en_US.UTF-8'
-#    LANG: 'en_US.UTF-8'
-#  only:
-#    - alpha
-#  needs:
-#    - build_Android
-#  stage: deploy
-#  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
-#  tags:
-#    - docker
-#  before_script:
-#    - 'echo $play_store_credentials > play-store-credentials.json'
-#  script:
-#    - 'bundle install'
-#    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
-#  after_script:
-#    - 'rm play-store-credentials.json'
-#  dependencies:
-#    - build_Android
+deploy_Android_alpha:
+  variables:
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+  only:
+    - alpha
+  needs:
+    - build_Android
+  stage: deploy
+  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+  tags:
+    - docker
+  before_script:
+    - 'echo $play_store_credentials > play-store-credentials.json'
+  script:
+    - 'bundle install'
+    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track internal'
+  after_script:
+    - 'rm play-store-credentials.json'
+  dependencies:
+    - build_Android
 
-#deploy_Android_beta:
-#  variables:
-#    LC_ALL: 'en_US.UTF-8'
-#    LANG: 'en_US.UTF-8'
-#  only:
-#    - beta
-#  needs:
-#    - build_Android
-#  stage: deploy
-#  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
-#  tags:
-#    - docker
-#  before_script:
-#    - 'echo $play_store_credentials > play-store-credentials.json'
-#  script:
-#    - 'bundle install'
-#    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track beta'
-#  after_script:
-#    - 'rm play-store-credentials.json'
-#  dependencies:
-#    - build_Android
+deploy_Android_beta:
+  variables:
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+  only:
+    - beta
+  needs:
+    - build_Android
+  stage: deploy
+  image: registry.gitlab.com/fabinfra/gtk-sharp-build:latest
+  tags:
+    - docker
+  before_script:
+    - 'echo $play_store_credentials > play-store-credentials.json'
+  script:
+    - 'bundle install'
+    - 'bundle exec fastlane supply --aab Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.aab --track beta'
+  after_script:
+    - 'rm play-store-credentials.json'
+  dependencies:
+    - build_Android
 
-#deploy_iOS:
-#  variables:
-#    LC_ALL: 'en_US.UTF-8'
-#    LANG: 'en_US.UTF-8'
-#  only:
-#    - alpha
-#    - feature/fastlane
-#  needs:
-#    - build_iOS
-#  stage: deploy
-#  tags:
-#    - macos
-#  before_script:
-#    - 'echo $app_store_credentials > app-store-credentials.json'
-#    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
-#  script:
-#    - 'bundle install'
-#    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa'
-#  after_script:
-#    - 'rm app-store-credentials.json'
-#  dependencies:
-#    - build_iOS
\ No newline at end of file
+deploy_iOS:
+  variables:
+    LC_ALL: 'en_US.UTF-8'
+    LANG: 'en_US.UTF-8'
+  only:
+    - alpha
+    - feature/fastlane
+  needs:
+    - build_iOS
+  stage: deploy
+  tags:
+    - macos
+  before_script:
+    - 'echo $app_store_credentials > app-store-credentials.json'
+    - 'export PATH="/usr/local/opt/ruby/bin:$PATH"'
+  script:
+    - 'bundle install'
+    - 'bundle exec fastlane pilot upload --api_key_path app-store-credentials.json --ipa Borepin/Borepin.iOS/bin/iPhone/Debug/Borepin.iOS.ipa'
+  after_script:
+    - 'rm app-store-credentials.json'
+  dependencies:
+    - build_iOS