microsoft / hcsshim

Windows - Host Compute Service Shim
MIT License
565 stars 256 forks source link

[release/0.12] Backport commits from hcsshim/main to update module versions #2237

Closed kiashok closed 4 weeks ago

kiashok commented 1 month ago

This PR backports few commits needed to update some important module versions in release/0.12 branch:

1) All commits from https://github.com/microsoft/hcsshim/pull/2235 in main branch to release/0.12 branch

a) 9b0599b0bb93f6f5b546b09bfb4cab6221ff16b4 https://github.com/microsoft/hcsshim/commit/9b0599b0bb93f6f5b546b09bfb4cab6221ff16b4

The above commit was manually applied due to merge conflicts

b) 56e8cf904ce1b0e4391ce7ca8d1ea8b80aa80d34 https://github.com/microsoft/hcsshim/commit/56e8cf904ce1b0e4391ce7ca8d1ea8b80aa80d34

This commit was a direct backport + changes to fix lint errors.

c) 008474976972163ac32a39fc12111a95c66ae428 https://github.com/microsoft/hcsshim/commit/008474976972163ac32a39fc12111a95c66ae428

This commit was a direct backport

2) Following commits from main branch were backported to release/0.12 branch. Conflicts were resolved.

https://github.com/microsoft/hcsshim/pull/2166 https://github.com/microsoft/hcsshim/pull/2039 https://github.com/microsoft/hcsshim/pull/2225 https://github.com/microsoft/hcsshim/pull/2051

3) Additional manual commit to update few other module versions.

kiashok commented 1 month ago

cc @dims