From b69027edf2c1b7c13863d8c93241393a336a6fae Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Oct 2023 11:59:57 +0000 Subject: [PATCH 1/9] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0893400..8334a1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { agent any; options { copyArtifactPermission projectNames: env.allProjectsArtifactPermission; - disableConcurrentBuilds abortPrevious: true; + disableConcurrentBuilds(); } triggers { upstream( From c39096ce6ffdeff479983d89ecc0e574f6ec32cc Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 20 Oct 2023 12:00:07 +0000 Subject: [PATCH 2/9] Update Jenkinsfile.develop --- Jenkinsfile.develop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop index cc02489..c1766dd 100644 --- a/Jenkinsfile.develop +++ b/Jenkinsfile.develop @@ -4,7 +4,7 @@ pipeline { agent any; options { copyArtifactPermission projectNames: env.allProjectsArtifactPermission; - disableConcurrentBuilds abortPrevious: true; + disableConcurrentBuilds(); } triggers { upstream( From 800632d20d78a348919ff1a559129d8e7ad9a12d Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 16 Nov 2023 13:21:54 +0000 Subject: [PATCH 3/9] Changed by Jenkins: 28 --- CarbonLib.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 9053ddd..2633423 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,12 +8,12 @@ false false false - 4.0.0 + 4.0.1 - - + + From aef26080ba4f23dc5452113f3785f99a5d67a379 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 16 Nov 2023 13:32:22 +0000 Subject: [PATCH 4/9] [ci skip] Changed by Jenkins: 29 --- CarbonLib.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 2633423..7d059d0 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,12 +8,12 @@ false false false - 4.0.1 + 4.0.2 - + From 90787a8fba17942cbb984a66ac4a30d3b1fcf63b Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 16 Nov 2023 13:55:25 +0000 Subject: [PATCH 5/9] Changed by Jenkins: 30 --- CarbonLib.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 7d059d0..83f7767 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,7 +8,7 @@ false false false - 4.0.2 + 4.0.3 From 4c491bd581d64c745179f8a7201f49d45c084efa Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 16 Nov 2023 14:21:14 +0000 Subject: [PATCH 6/9] [ci skip] Changed by Jenkins: 31 --- CarbonLib.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 83f7767..4668eb6 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,7 +8,7 @@ false false false - 4.0.3 + 4.0.4 From 3034bae61efebcc8432d070329f1b6241c730835 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 16 Nov 2023 15:09:49 +0000 Subject: [PATCH 7/9] [ci skip] Changed by Jenkins: 32 --- CarbonLib.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 4668eb6..1be747c 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,7 +8,7 @@ false false false - 4.0.4 + 4.0.5 From e9f35daf03314199ac3d1bd841de5fbee62d234b Mon Sep 17 00:00:00 2001 From: Francisco Salas Date: Tue, 23 Jan 2024 14:00:19 +0100 Subject: [PATCH 8/9] aw5820: fix prod: fill object even if C_input_CropRes is 0 --- CarbonCalculation.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CarbonCalculation.cs b/CarbonCalculation.cs index 37aa240..1b5fcb6 100644 --- a/CarbonCalculation.cs +++ b/CarbonCalculation.cs @@ -642,11 +642,7 @@ namespace FarmMapsAPI.Carbon foreach (var crop in cropArea.Value) { var cInputCropRes = cropPropertyConfig.SingleOrDefault(s => s.Name.ToLower() == crop.Key.ToLower())?.C_input_CropRes ?? 0.0; - if (cInputCropRes > 0) - { - carbonInputs.AddValue((cropArea.Key.Item1, cropArea.Key.Item2, crop.Key), "CarbonResidues", cInputCropRes); - - } + carbonInputs.AddValue((cropArea.Key.Item1, cropArea.Key.Item2, crop.Key), "CarbonResidues", cInputCropRes); if (cropSet.StrawCrops.Any(x => x.StrawCrop.ToLower() == crop.Key.ToLower())) { From 7cd8dd403b6efe8ef77d71235f1250b5d8394d99 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 23 Jan 2024 13:01:21 +0000 Subject: [PATCH 9/9] [ci skip] Changed by Jenkins: 32 --- CarbonLib.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CarbonLib.csproj b/CarbonLib.csproj index 1be747c..14f3241 100644 --- a/CarbonLib.csproj +++ b/CarbonLib.csproj @@ -8,7 +8,7 @@ false false false - 4.0.5 + 4.0.6