From 1df2c9a11e3d78d741f08a7449ae2a97cfe837bd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 11 Mar 2026 02:11:21 +0000 Subject: [PATCH 1/5] updated v2.7.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7645f45..e5a9f8d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "git-credential-manager" %} -{% set version = "2.7.0" %} +{% set version = "2.7.3" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/GitCredentialManager/{{ name }}/archive/v{{ version }}.tar.gz - sha256: 9f7fc2b95cdf82c6bebeb045a553ed27c0130f426bc840e4f2dc41cbb27b6c31 + sha256: a9c1d7a89c620bea0df65623f25c62e66122d22557583ab390ed612d544884e9 patches: - 00000-no_self_contained.patch # [not aarch64 and not arm64] From 9a3d1e07342a0bc8772fa2a6f829ea7c2ae9ee3f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 11 Mar 2026 02:11:50 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-smithy 3.56.2 and conda-forge-pinning 2026.03.10.04.02.2 --- .azure-pipelines/azure-pipelines-osx.yml | 4 +++- .ci_support/osx_64_.yaml | 4 ++-- .scripts/build_steps.sh | 1 + LICENSE.txt | 3 +-- build-locally.py | 8 +------- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d08eed2..bfe3727 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,17 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 322c73b..bd24ee5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: -- '10.13' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 780a358..be060cb 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc < Date: Wed, 11 Mar 2026 10:30:46 +0800 Subject: [PATCH 3/5] fix ambiguous call to string.Split() --- recipe/00001-fix_ambiguous_call_to_string_split.patch | 11 +++++++++++ recipe/meta.yaml | 1 + 2 files changed, 12 insertions(+) create mode 100644 recipe/00001-fix_ambiguous_call_to_string_split.patch diff --git a/recipe/00001-fix_ambiguous_call_to_string_split.patch b/recipe/00001-fix_ambiguous_call_to_string_split.patch new file mode 100644 index 0000000..6478425 --- /dev/null +++ b/recipe/00001-fix_ambiguous_call_to_string_split.patch @@ -0,0 +1,11 @@ +--- src/shared/Core/Interop/Linux/LinuxConfigParser.cs ++++ src/shared/Core/Interop/Linux/LinuxConfigParser.cs +@@ -31,7 +31,7 @@ public class LinuxConfigParser + { + var result = new Dictionary(GitConfigurationKeyComparer.Instance); + +- IEnumerable lines = content.Split(['\n'], StringSplitOptions.RemoveEmptyEntries); ++ IEnumerable lines = content.Split('\n', StringSplitOptions.RemoveEmptyEntries); + + foreach (string line in lines) + { diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e5a9f8d..a135324 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,7 @@ source: sha256: a9c1d7a89c620bea0df65623f25c62e66122d22557583ab390ed612d544884e9 patches: - 00000-no_self_contained.patch # [not aarch64 and not arm64] + - 00001-fix_ambiguous_call_to_string_split.patch build: number: 0 From 656eaca56ebba5e2a803482ef95520da8ee5ab3c Mon Sep 17 00:00:00 2001 From: Kerry Su <16837579+sshockwave@users.noreply.github.com> Date: Wed, 11 Mar 2026 10:39:06 +0800 Subject: [PATCH 4/5] disable the string.Split() fix for win --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a135324..11cc112 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: a9c1d7a89c620bea0df65623f25c62e66122d22557583ab390ed612d544884e9 patches: - 00000-no_self_contained.patch # [not aarch64 and not arm64] - - 00001-fix_ambiguous_call_to_string_split.patch + - 00001-fix_ambiguous_call_to_string_split.patch # [not win] build: number: 0 From babb627d0164f13f3c31cd47513d642d6aa9d377 Mon Sep 17 00:00:00 2001 From: Kerry Su <16837579+sshockwave@users.noreply.github.com> Date: Wed, 11 Mar 2026 10:41:28 +0800 Subject: [PATCH 5/5] explain the purpose of the patch for .NET version compatibility --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11cc112..716fd11 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,10 @@ source: sha256: a9c1d7a89c620bea0df65623f25c62e66122d22557583ab390ed612d544884e9 patches: - 00000-no_self_contained.patch # [not aarch64 and not arm64] + # This fixes the call to string.Split(), needed for .NET 8.0 but not for .net 4.7. + # When the Windows version upgrades .NET version, + # we can apply this fix to all platforms. + # This fix is also tracked in the upstream. - 00001-fix_ambiguous_call_to_string_split.patch # [not win] build: