From e95e29a96af320022407f21c4c066d1b9ed212a5 Mon Sep 17 00:00:00 2001
From: Peter Bastiani <peter.bastiani@akkerweb.nl>
Date: Mon, 26 Jun 2023 16:48:44 +0200
Subject: [PATCH 1/3] jenkins

---
 .gitignore          |  1 +
 Jenkinsfile.develop | 49 +++++++++++++++++----------------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index c73a921..7dadc3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -362,3 +362,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+upstreamProjects/
\ No newline at end of file
diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop
index f163ccc..e54cfc5 100644
--- a/Jenkinsfile.develop
+++ b/Jenkinsfile.develop
@@ -1,42 +1,29 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
-  environment {
-     APP_VERSION_PREFIX=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/Version" -v . -n|awk -v def="1.0.0" "{print} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_NAME=sh(script: ' cat *.csproj| xmlstarlet sel -t -m "/Project/PropertyGroup/AssemblyName" -v . -n|awk -v def="App" "{print tolower(\\$0)} END { if(NR==0) {print def} }"', returnStdout: true).trim()
-     APP_VERSION="${APP_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+  agent any;
+  options {
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
+  }
+  triggers {
+    upstream(
+      upstreamProjects: '/FarmMaps.Develop/Base.Core.Common.Geometry/develop',
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   stages {
-    stage('Dotnet Restore') {
+    stage('TaskBuildAll') {
       steps {
-        sh '''dotnet restore CarbonLib.csproj'''
+        stepTaskBuildAll();
       }
     }
-    stage('Dotnet Build'){
-      steps {
-        sh '''dotnet build CarbonLib.csproj'''
-      }
-    }
-	  stage('Dotnet Package') {
-      steps {
-        sh '''rm -rf nuget
-              dotnet pack -c debug -o nuget -p:PackageVersion=${APP_VERSION} CarbonLib.csproj'''
-      }
-     }
-	stage('Dotnet Publish') {
-      steps {
-        sh '''dotnet nuget push nuget/*.nupkg -k 0c3e3afc-935b-3db1-b023-e0d4799e674d -s https://repository.akkerweb.nl/repository/nuget-hosted/'''
-      }
-    }
-  }  
+  }
   post {
+    success {
+      postSuccess();
+    }
     always {
-      emailext (
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
+      postAlways();
     }
   }
 }
\ No newline at end of file

From 1810b0005a7e08ed293b344f5e6560cc5de1585d Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@build.akkerweb.nl>
Date: Mon, 26 Jun 2023 14:49:31 +0000
Subject: [PATCH 2/3] [ci skip] Changed by Jenkins: 33

---
 CarbonLib.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CarbonLib.csproj b/CarbonLib.csproj
index 2e84cb2..51a9283 100644
--- a/CarbonLib.csproj
+++ b/CarbonLib.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Base.Core.Common" Version="2.0.0" />
-		<PackageReference Include="Base.Core.Common.Geometry" Version="2.0.0" />
+		<PackageReference Include="Base.Core.Common" Version="2.2.0-prerelease.2050" />
+		<PackageReference Include="Base.Core.Common.Geometry" Version="2.1.0-prerelease.2051" />
 		<PackageReference Include="NetTopologySuite" Version="2.5.0" />
 		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
 	</ItemGroup>

From 96906d57cf45aa211f8b801238b3b487f733df59 Mon Sep 17 00:00:00 2001
From: Peter Bastiani <peter.bastiani@akkerweb.nl>
Date: Mon, 26 Jun 2023 16:53:40 +0200
Subject: [PATCH 3/3] Fix jenkins

---
 Jenkinsfile.develop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop
index e54cfc5..93b96b0 100644
--- a/Jenkinsfile.develop
+++ b/Jenkinsfile.develop
@@ -12,9 +12,9 @@ pipeline {
     )
   }
   stages {
-    stage('TaskBuildAll') {
+    stage('BaseBuildAll') {
       steps {
-        stepTaskBuildAll();
+        stepBaseBuildAll();
       }
     }
   }