Code

Users/merlynop/mergenode20#20769

Code

Draft

merlynomsft wants to merge 33 commits intomastermicrosoft/azure-pipelines-tasks:masterfrom users/merlynop/mergenode20microsoft/azure-pipelines-tasks:users/merlynop/mergenode20Copy head branch name to clipboard

+145,107-1,588,602

Commits

Commits on Dec 31, 2024

• merge base wip

  merlynomsft

  committed
  1264eba

  Copy full SHA for 1264eba

• mergebase implementation

  merlynomsft

  committed
  3fc8752

  Copy full SHA for 3fc8752

• fix .tmp exists error due to double-deleting _buildconfig override files

  merlynomsft

  committed
  2d251c4

  Copy full SHA for 2d251c4

• // 1. keep version of config being merged (only bump version if needed!)

  Show description for ae4b17a
  merlynomsft

  committed
  ae4b17a

  Copy full SHA for ae4b17a

• add bugs /todos

  merlynomsft

  committed
  85fe65f

  Copy full SHA for 85fe65f

• update todo

  merlynomsft

  committed
  7bb9053

  Copy full SHA for 7bb9053

• another todo

  merlynomsft

  committed
  1d68382

  Copy full SHA for 1d68382

• Remove unneeded #ifelse to simplify merging baseconfigs

  Show description for aa625ed
  merlynomsft

  committed
  aa625ed

  Copy full SHA for aa625ed

Commits on Jan 2, 2025

• disable merges (initially)

  Show description for 0be07c6
  merlynomsft

  committed
  0be07c6

  Copy full SHA for 0be07c6

• cleanup

  merlynomsft

  committed
  718f704

  Copy full SHA for 718f704

• ensure we don't overwrite base version with a "lower" version number when merging config

  merlynomsft

  committed
  fe32f1f

  Copy full SHA for fe32f1f

• Merge branch 'master' into users/merlynop/mergebase

  merlynomsft

  authored
  95581a1

  Copy full SHA for 95581a1

Commits on Jan 3, 2025

• bump

  merlynomsft

  committed
  c396a9a

  Copy full SHA for c396a9a

• test

  merlynomsft

  committed
  e0119a6

  Copy full SHA for e0119a6

• node 20 clean up test

  merlynomsft

  committed
  51118e3

  Copy full SHA for 51118e3

• Merge remote-tracking branch 'origin/master' into users/merlynop/mergenode20

  merlynomsft

  committed
  01e39d1

  Copy full SHA for 01e39d1

• fix cfs issues

  merlynomsft

  committed
  98fcc8a

  Copy full SHA for 98fcc8a

Commits on Jan 4, 2025

• update make-options

  merlynomsft

  committed
  2a15cde

  Copy full SHA for 2a15cde

Commits on Jan 6, 2025

• Revert "update make-options"

  Show description for 3d5402a
  merlynomsft

  committed
  3d5402a

  Copy full SHA for 3d5402a

• Revert "fix cfs issues"

  Show description for e393b58
  merlynomsft

  committed
  e393b58

  Copy full SHA for e393b58

• Revert "node 20 clean up test"

  Show description for e28d681
  merlynomsft

  committed
  e28d681

  Copy full SHA for e28d681

• fix for merging tasks with multiple configs

  merlynomsft

  committed
  ba50b27

  Copy full SHA for ba50b27

• test node20 cleanup

  merlynomsft

  committed
  2746cd3

  Copy full SHA for 2746cd3

• fix verify-registries.js to handle deleted configs , update make-options

  merlynomsft

  committed
  6451ce2

  Copy full SHA for 6451ce2

• cfs fixes

  merlynomsft

  committed
  5a48ae6

  Copy full SHA for 5a48ae6

• ci

  merlynomsft

  committed
  2771c05

  Copy full SHA for 2771c05

• revert make-options.json

  merlynomsft

  committed
  80be06f

  Copy full SHA for 80be06f

• Revert "cfs fixes"

  Show description for f2bf6d6
  merlynomsft

  committed
  f2bf6d6

  Copy full SHA for f2bf6d6

• Revert "test node20 cleanup"

  Show description for 557eed7
  merlynomsft

  committed
  557eed7

  Copy full SHA for 557eed7

• Merge remote-tracking branch 'origin/master' into users/merlynop/mergenode20

  merlynomsft

  committed
  9c295bb

  Copy full SHA for 9c295bb

• Node20 test merge

  merlynomsft

  committed
  65eb1ca

  Copy full SHA for 65eb1ca

• cfs fixup

  merlynomsft

  committed
  31c122b

  Copy full SHA for 31c122b

Commits on Jan 7, 2025

• fix

  merlynomsft

  committed
  883e792

  Copy full SHA for 883e792