* 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>
* check for the presence of a compatible powershell. ensure that we always return a list of tags
* allow the script to require pshell6+
* remove the en-us from the link
---------
Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
* Update organization of the eng/common/testproxy folder
* Add merge-proxy-tags.ps1 and readme to eng/common/testproxy/scripts/tag-merge/
* Extract common assets script functionality to common-asset-functions.ps1
---------
Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
* update proxy version to 20231030.1
* update test-proxy-tool.yml to record both stderr and stdout to the proxy log
---------
Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com>
* Bump test proxy version
* move proxy transition-scripts folder to onboarding
Co-authored-by: Bill Wert <billwert@microsoft.com>
Co-authored-by: Scott Beddall <scbedd@microsoft.com>
* we encourage folks to place their assets.jsons at the package level
* update generate-assets-json.ps1 to only include src/**/session-records so as to avoid picking up the duplicated 'target' sessionrecords
---------
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
* Move migration script to eng/common
* Remove localization from link
* Ignore the improper link
---------
Co-authored-by: Timo van Veenendaal <timov@microsoft.com>
* feature/upload-proxy-artifact
* update template to ensure that having the file in use on windows doesn't break the build
* incoming PR fixes where test-proxy stores its log. as as result, we also need to update the location of where we read out the test-proxy log
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
* someone wants to reference the test-proxy startup scripts externally. to make this easy on them we're parameterizing the root of the eng/common for easy use in that scenario
* two leading $ signs on the definition of the certificate path was causing some issues!
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
* bump consumed version of test proxy. update scripting to target the fully cross-platform image tag name.
* update target version of the test-proxy to one that enforces http/1.1
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
* allow version override. update proxy-docker so that logging will work properly
* update targeted tags to common dev versioning scheme
* change to target_version.txt instead of a variable in docker-start-proxy.ps1
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
Co-authored-by: Ben Broderick Phillips <ben@benbp.net>
* tooling updates. allow install but no run of test proxy, prepending the path properly, etc
* update targeted versions of the test-proxy
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
* update docker-start-proxy to have a slightly different default parameter
* we were surrounding the value in single quotes, breaking recording load
Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>