Fix CI jobs that broke as a result of windows-latest
being upgraded to Windows Server 2022#917
Merged
henrymercer merged 2 commits intomainfrom Feb 8, 2022
windows-latest
being upgraded to Windows Server 2022#917