yup more or less I did the same but I am horrible at upgrading I always mess up and spend a couple hours trying to fix the things I mess up even with detailed instructions like that
Got through it but feel like its really hogging resources compared to older versions ... o.O ... though it is faster loading sites, other resource hungry programs I have running will lock from time to time now might be unrelated to XAMPP though this system is aging lol