No need to try to use the old Upgrade function.You should be able to download the windows upgrade assistant from Microsoft directly (using web.archive.org). I have done this exact thing on my PC and everything stayed on the PC. Even the positions of my folders on the desktop stayed in place. If you are still worried about it you could try to backup your files before committing to the upgrade.