Merge branch 'develop'

++version

.gitignore

@@ -362,3 +362,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+upstreamProjects/

CarbonCalculation.cs

@@ -1913,7 +1913,7 @@ namespace FarmMapsAPI.Carbon
                 var monthClimateList = new List<ClimateVariable>();
                 foreach (var month in gisSoilSet.AllMonths)
                 {
-                    var climateYear = loopYear > 2020 || loopYear < 2011 ? 2012 : loopYear;
+                    var climateYear = loopYear > 2050 || loopYear < 2011 ? 2012 : loopYear;
                     var monthData = climate.Single(x => x.Key.Item1 == farmZone && x.Key.Item2 == month && x.Key.Item3 == climateYear).Value;
                     var newMonthData = new ClimateVariable(monthData.Temperature, monthData.Precipitation, monthData.Evapotranspiration * 1.25);
                     monthClimateList.Add(newMonthData);

CarbonLib.csproj

@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net6</TargetFramework>
 	  <AssemblyName>CarbonLib</AssemblyName>
 	  <PackageId>CarbonLib</PackageId>
 	  <RuntimeIdentifiers>win10-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>1.2.0</Version>
+	  <Version>2.2.0</Version>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Base.Core.Common" Version="1.2.2.10" />
+		<PackageReference Include="Base.Core.Common" Version="2.3.0" />
-		<PackageReference Include="Base.Core.Common.Geometry" Version="1.4.0" />
+		<PackageReference Include="Base.Core.Common.Geometry" Version="2.3.0" />
-		<PackageReference Include="NetTopologySuite" Version="2.0.0" />
+		<PackageReference Include="NetTopologySuite" Version="2.5.0" />
-		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
+		<PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Jenkinsfile

@@ -1,42 +1,30 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
+  agent any;
-  environment {
+  options {
-     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()
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-     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()
+    disableConcurrentBuilds abortPrevious: true;
-     APP_VERSION="${APP_VERSION_PREFIX}"
+  }
+  triggers {
+    upstream(
+      upstreamProjects: '/FarmMaps/Base.Core.Common.Geometry/master',
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   stages {
-    stage('Dotnet Restore') {
+    stage('BaseBuildAll') {
       steps {
-        sh '''dotnet restore CarbonLib.csproj'''
+        stepBaseBuildAll();
-      }
-    }
-    stage('Dotnet Build') {
-      steps {
-        sh '''dotnet build CarbonLib.csproj'''
-      }
-    }
-	stage('Dotnet Package') {
-      steps {
-        sh '''rm -rf nuget
-              dotnet pack -c release -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 (
+      postAlways();
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
     }
   }
 }

Jenkinsfile.develop

@@ -1,42 +1,30 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
+  agent any;
-  environment {
+  options {
-     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()
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-     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()
+    disableConcurrentBuilds abortPrevious: true;
-     APP_VERSION="${APP_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+  }
+  triggers {
+    upstream(
+      upstreamProjects: '/FarmMaps.Develop/Base.Core.Common.Geometry/develop',
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   stages {
-    stage('Dotnet Restore') {
+    stage('BaseBuildAll') {
       steps {
-        sh '''dotnet restore CarbonLib.csproj'''
+        stepBaseBuildAll();
-      }
-    }
-    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 (
+      postAlways();
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
     }
   }
 }