Revert to .props files with an import to fix build issues on non Wind…

Revert to .props files with an import to fix build issues on non Wind… #907