azure-sdk-for-cpp/eng
Azure SDK Bot 84f000c7c6
Sync eng/common directory with azure-sdk-tools for PR 7537 (#5278)
* Add ConflictedFile to git-helpers.ps1, add git-helpers.tests.ps1 to exercise basic functionality.
* Add `resolve-asset-conflict.ps1` a script that can autoresolve an assets.json file.

---------

Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
2024-01-17 14:08:35 -08:00
..
common Sync eng/common directory with azure-sdk-tools for PR 7537 (#5278) 2024-01-17 14:08:35 -08:00
docs/api/assets Upgrade Doxygen (#4724) 2023-06-22 22:58:56 +00:00
pipelines Re-enable UWP CI pipeline (#5226) 2024-01-17 10:41:20 -08:00
scripts Initial cut at snippet generation tool. Also updated KeyVault Secrets readme to use snippets as a working proof of concept. (#5213) 2023-11-30 19:40:30 +00:00
CredScanSuppression.json Fixed credscan error (#4417) 2023-03-08 15:15:45 -08:00
ignore-links.txt Sync eng/common directory with azure-sdk-tools for PR 5291 (#4308) 2023-02-01 16:56:42 -08:00