port-msc: this should fix the build

Author: andreasdr

Makefile

@@ -862,7 +862,6 @@ EXT_MINISCRIPT_SRCS = \
 	ext/miniscript/src/miniscript/utilities/Base64.cpp \
 	ext/miniscript/src/miniscript/utilities/Console.cpp \
 	ext/miniscript/src/miniscript/utilities/ExceptionBase.cpp \
-	ext/miniscript/src/miniscript/utilities/FileSystem.cpp \
 	ext/miniscript/src/miniscript/utilities/Float.cpp \
 	ext/miniscript/src/miniscript/utilities/Hex.cpp \
 	ext/miniscript/src/miniscript/utilities/Integer.cpp \

Makefile.nmake

@@ -730,7 +730,6 @@ EXT_MINISCRIPT_SRCS = \
 	ext/miniscript/src/miniscript/utilities/Base64.cpp \
 	ext/miniscript/src/miniscript/utilities/Console.cpp \
 	ext/miniscript/src/miniscript/utilities/ExceptionBase.cpp \
-	ext/miniscript/src/miniscript/utilities/FileSystem.cpp \
 	ext/miniscript/src/miniscript/utilities/Float.cpp \
 	ext/miniscript/src/miniscript/utilities/Hex.cpp \
 	ext/miniscript/src/miniscript/utilities/Integer.cpp \

ext/miniscript/src/miniscript/utilities/FileSystem.cpp

@@ -1,20 +1,22 @@
 #include <miniscript/utilities/Properties.h>
 
-#include <map>
+#include <algorithm>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include <miniscript/miniscript.h>
-#include <miniscript/utilities/FileSystem.h>
+#include <miniscript/os/filesystem/FileSystem.h>
 #include <miniscript/utilities/StringTools.h>
 
-using std::map;
+using std::sort;
 using std::string;
+using std::unordered_map;
 using std::vector;
 
 using miniscript::utilities::Properties;
 
-using miniscript::utilities::FileSystem;
+using miniscript::os::filesystem::FileSystem;
 using miniscript::utilities::StringTools;
 
 void Properties::load(const string& pathName, const string& fileName)
@@ -39,5 +41,6 @@ void Properties::store(const string& pathName, const string& fileName) const {
 	for (const auto& [key, value]: properties) {
 		result.push_back(key + "=" + value);
 	}
+	sort(result.begin(), result.end());
 	FileSystem::setContentFromStringArray(pathName, fileName, result);
 }