diff --git a/Engine.sharpmake.cs b/Engine.sharpmake.cs
index a1b89e75..92229051 100644
--- a/Engine.sharpmake.cs
+++ b/Engine.sharpmake.cs
@@ -456,7 +456,7 @@ public override void ConfigureMac(Configuration conf, CommonTarget target)
         }
 
         //??
-        conf.Options.Add(new Options.XCode.Compiler.UserFrameworks("Mono"));
+        conf.XcodeUserFrameworks.Add( "Mono" );
 
         // #TODO Read path from Globals / Move to own class again
         if (Directory.Exists(Globals.MONO_macOS_Dir))
diff --git a/Source/Components/Scripting/ScriptComponent.cpp b/Source/Components/Scripting/ScriptComponent.cpp
index fc579e50..31f572b0 100644
--- a/Source/Components/Scripting/ScriptComponent.cpp
+++ b/Source/Components/Scripting/ScriptComponent.cpp
@@ -3,6 +3,7 @@
 #if USING( ME_SCRIPTING )
 #include <mono/metadata/loader.h>
 #include <mono/metadata/reflection.h>    // this should go
+#include <mono/metadata/appdomain.h>
 #endif
 
 #include "ScriptComponent.h"
@@ -16,7 +17,6 @@
 #include "Scripting/MonoUtils.h"
 #include <Web\HttpDownload.h>
 #include "File.h"
-#include <mono\metadata\appdomain.h>
 #include "Utils/HavanaUtils.h"
 #include "Engine/World.h"
 
diff --git a/Source/Scripting/Bindings/ImGui.bindings.cpp b/Source/Scripting/Bindings/ImGui.bindings.cpp
index 704609a8..64d72542 100644
--- a/Source/Scripting/Bindings/ImGui.bindings.cpp
+++ b/Source/Scripting/Bindings/ImGui.bindings.cpp
@@ -1,6 +1,8 @@
 #include "PCH.h"
 #include "ImGui.bindings.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 #include "imgui.h"
 
@@ -56,3 +58,5 @@ void Register_ImGuiBindings()
     mono_add_internal_call( "ImGui::ImGui_Checkbox", (void*)ImGui_Checkbox );
     mono_add_internal_call( "ImGui::ImGui_Button", (void*)ImGui_Button );
 }
+
+#endif
\ No newline at end of file
diff --git a/Source/Scripting/Bindings/Log.bindings.cpp b/Source/Scripting/Bindings/Log.bindings.cpp
index 7158718d..17262d98 100644
--- a/Source/Scripting/Bindings/Log.bindings.cpp
+++ b/Source/Scripting/Bindings/Log.bindings.cpp
@@ -1,6 +1,8 @@
 #include "PCH.h"
 #include "Log.bindings.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 
 static void Log( MonoString* inString )
@@ -52,3 +54,5 @@ void Register_LogBindings()
     mono_add_internal_call( "TestScript::NativeLog_Vector", (void*)NativeLog_Vector );
     mono_add_internal_call( "TestScript::Native_VectorLength", (void*)Native_VectorLength );
 }
+
+#endif
\ No newline at end of file
diff --git a/Source/Scripting/Bindings/World.bindings.cpp b/Source/Scripting/Bindings/World.bindings.cpp
index 692ad61d..84194be3 100644
--- a/Source/Scripting/Bindings/World.bindings.cpp
+++ b/Source/Scripting/Bindings/World.bindings.cpp
@@ -1,5 +1,7 @@
 #include "PCH.h"
 
+#if USING( ME_SCRIPTING )
+
 #include <mono/metadata/object.h>
 #include <Components/Transform.h>
 #include <Scripting/ScriptEngine.h>
@@ -55,3 +57,5 @@ void Register_WorldBindings()
     mono_add_internal_call( "World::World_GetTransformByName", (void*)World_GetTransformByName );
     mono_add_internal_call( "World::World_CreateEntity", (void*)World_CreateEntity );
 }
+
+#endif
\ No newline at end of file
diff --git a/Tools/BaseProject.sharpmake.cs b/Tools/BaseProject.sharpmake.cs
index 2f38ea08..aa4ab1cd 100644
--- a/Tools/BaseProject.sharpmake.cs
+++ b/Tools/BaseProject.sharpmake.cs
@@ -204,16 +204,11 @@ public virtual void ConfigureMac(Configuration conf, CommonTarget target)
         conf.Options.Add(Options.XCode.Compiler.OnlyActiveArch.Enable);
         conf.Options.Add(Options.XCode.Compiler.CppLanguageStandard.GNU17);
         conf.Options.Add(Options.XCode.Compiler.RTTI.Enable);
-        conf.Options.Add(Options.XCode.Compiler.Exceptions.Enable);
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Cocoa"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Metal"));
-        conf.Options.Add(new Options.XCode.Compiler.UserFrameworks("libiconv.tbd"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("IOKit"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("ForceFeedback"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Carbon"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("CoreVideo"));
+        conf.Options.Add(Options.XCode.Compiler.CppExceptions.Enable);
+        conf.Options.Add(Options.XCode.Compiler.ObjCExceptions.Enable);
         //conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Foundation"));
-        conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Quartz"));
+        conf.XcodeSystemFrameworks.Add("Cocoa", "Metal", "IOKit", "ForceFeedback", "Carbon", "CoreVideo", "Quartz");
+        conf.XcodeUserFrameworks.Add("libiconv.tbd");
         conf.Options.Add(new Options.XCode.Compiler.OnlyActiveArch());
 
         conf.Defines.Add("DEFINE_ME_PLATFORM_MACOS");
diff --git a/Tools/CommonTarget.sharpmake.cs b/Tools/CommonTarget.sharpmake.cs
index 56485f80..4670c60c 100644
--- a/Tools/CommonTarget.sharpmake.cs
+++ b/Tools/CommonTarget.sharpmake.cs
@@ -104,14 +104,14 @@ public static CommonTarget[] GetDefaultTargets()
                 {
                     var macOSTarget = new CommonTarget(
                         Platform.mac,
-                        DevEnv.xcode4ios,
+                        DevEnv.xcode,
                         Optimization.Debug | Optimization.Release,
                         DotNetFramework.v4_8,
                         dotNetOS: 0);
                     macOSTarget.SubPlatform = SubPlatformType.macOS;
                     var macEditor = new CommonTarget(
                         Platform.mac,
-                        DevEnv.xcode4ios,
+                        DevEnv.xcode,
                         Optimization.Debug | Optimization.Release,
                         DotNetFramework.v4_8,
                         dotNetOS: 0);
diff --git a/Tools/Sharpmake/Basic.Reference.Assemblies.Net60.dll b/Tools/Sharpmake/Basic.Reference.Assemblies.Net60.dll
new file mode 100644
index 00000000..89e5bac9
Binary files /dev/null and b/Tools/Sharpmake/Basic.Reference.Assemblies.Net60.dll differ
diff --git a/Tools/Sharpmake/Microsoft.CodeAnalysis.CSharp.dll b/Tools/Sharpmake/Microsoft.CodeAnalysis.CSharp.dll
index 581191da..87bebb0f 100644
Binary files a/Tools/Sharpmake/Microsoft.CodeAnalysis.CSharp.dll and b/Tools/Sharpmake/Microsoft.CodeAnalysis.CSharp.dll differ
diff --git a/Tools/Sharpmake/Microsoft.CodeAnalysis.dll b/Tools/Sharpmake/Microsoft.CodeAnalysis.dll
index c653dc88..69edcc9f 100644
Binary files a/Tools/Sharpmake/Microsoft.CodeAnalysis.dll and b/Tools/Sharpmake/Microsoft.CodeAnalysis.dll differ
diff --git a/Tools/Sharpmake/Microsoft.VisualStudio.Setup.Configuration.Interop.dll b/Tools/Sharpmake/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
index 6d7fa39e..fa050bb9 100644
Binary files a/Tools/Sharpmake/Microsoft.VisualStudio.Setup.Configuration.Interop.dll and b/Tools/Sharpmake/Microsoft.VisualStudio.Setup.Configuration.Interop.dll differ
diff --git a/Tools/Sharpmake/Sharpmake.Application.deps.json b/Tools/Sharpmake/Sharpmake.Application.deps.json
index 0be1c37d..8a835374 100644
--- a/Tools/Sharpmake/Sharpmake.Application.deps.json
+++ b/Tools/Sharpmake/Sharpmake.Application.deps.json
@@ -1,12 +1,12 @@
 {
   "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v5.0",
+    "name": ".NETCoreApp,Version=v6.0",
     "signature": ""
   },
   "compilationOptions": {},
   "targets": {
-    ".NETCoreApp,Version=v5.0": {
-      "Sharpmake.Application/1.0.0": {
+    ".NETCoreApp,Version=v6.0": {
+      "Sharpmake.Application/0.91.0-7-gd71d8108": {
         "dependencies": {
           "Sharpmake": "1.0.0",
           "Sharpmake.CommonPlatforms": "1.0.0",
@@ -16,170 +16,180 @@
           "Sharpmake.Application.dll": {}
         }
       },
-      "Basic.Reference.Assemblies.Net50/1.2.4": {
+      "Basic.Reference.Assemblies.Net60/1.8.0": {
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "4.0.1"
+          "Microsoft.CodeAnalysis.Common": "4.13.0"
         },
         "runtime": {
-          "lib/netstandard2.0/Basic.Reference.Assemblies.Net50.dll": {
+          "lib/netstandard2.0/Basic.Reference.Assemblies.Net60.dll": {
             "assemblyVersion": "1.0.0.0",
             "fileVersion": "1.0.0.0"
           }
         }
       },
-      "Microsoft.CodeAnalysis.Analyzers/3.3.2": {},
-      "Microsoft.CodeAnalysis.Common/4.0.1": {
+      "Microsoft.CodeAnalysis.Common/4.13.0": {
         "dependencies": {
-          "Microsoft.CodeAnalysis.Analyzers": "3.3.2",
-          "System.Collections.Immutable": "5.0.0",
-          "System.Memory": "4.5.4",
-          "System.Reflection.Metadata": "5.0.0",
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
-          "System.Text.Encoding.CodePages": "4.5.1",
-          "System.Threading.Tasks.Extensions": "4.5.4"
+          "System.Collections.Immutable": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0",
+          "System.Text.Encoding.CodePages": "7.0.0"
         },
         "runtime": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.dll": {
-            "assemblyVersion": "4.0.0.0",
-            "fileVersion": "4.0.121.55815"
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.dll": {
+            "assemblyVersion": "4.13.0.0",
+            "fileVersion": "4.1300.25.12011"
           }
         },
         "resources": {
-          "lib/netcoreapp3.1/cs/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "cs"
           },
-          "lib/netcoreapp3.1/de/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "de"
           },
-          "lib/netcoreapp3.1/es/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "es"
           },
-          "lib/netcoreapp3.1/fr/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "fr"
           },
-          "lib/netcoreapp3.1/it/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "it"
           },
-          "lib/netcoreapp3.1/ja/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "ja"
           },
-          "lib/netcoreapp3.1/ko/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "ko"
           },
-          "lib/netcoreapp3.1/pl/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "pl"
           },
-          "lib/netcoreapp3.1/pt-BR/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "pt-BR"
           },
-          "lib/netcoreapp3.1/ru/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "ru"
           },
-          "lib/netcoreapp3.1/tr/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "tr"
           },
-          "lib/netcoreapp3.1/zh-Hans/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "zh-Hans"
           },
-          "lib/netcoreapp3.1/zh-Hant/Microsoft.CodeAnalysis.resources.dll": {
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": {
             "locale": "zh-Hant"
           }
         }
       },
-      "Microsoft.CodeAnalysis.CSharp/4.0.1": {
+      "Microsoft.CodeAnalysis.CSharp/4.13.0": {
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "4.0.1"
+          "Microsoft.CodeAnalysis.Common": "4.13.0",
+          "System.Collections.Immutable": "8.0.0",
+          "System.Reflection.Metadata": "8.0.0",
+          "System.Text.Encoding.CodePages": "7.0.0"
         },
         "runtime": {
-          "lib/netcoreapp3.1/Microsoft.CodeAnalysis.CSharp.dll": {
-            "assemblyVersion": "4.0.0.0",
-            "fileVersion": "4.0.121.55815"
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.dll": {
+            "assemblyVersion": "4.13.0.0",
+            "fileVersion": "4.1300.25.12011"
           }
         },
         "resources": {
-          "lib/netcoreapp3.1/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "cs"
           },
-          "lib/netcoreapp3.1/de/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "de"
           },
-          "lib/netcoreapp3.1/es/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "es"
           },
-          "lib/netcoreapp3.1/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "fr"
           },
-          "lib/netcoreapp3.1/it/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "it"
           },
-          "lib/netcoreapp3.1/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "ja"
           },
-          "lib/netcoreapp3.1/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "ko"
           },
-          "lib/netcoreapp3.1/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "pl"
           },
-          "lib/netcoreapp3.1/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "pt-BR"
           },
-          "lib/netcoreapp3.1/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "ru"
           },
-          "lib/netcoreapp3.1/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "tr"
           },
-          "lib/netcoreapp3.1/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "zh-Hans"
           },
-          "lib/netcoreapp3.1/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": {
             "locale": "zh-Hant"
           }
         }
       },
-      "Microsoft.NETCore.Platforms/5.0.0": {},
-      "Microsoft.VisualStudio.Setup.Configuration.Interop/3.0.4492": {
+      "Microsoft.VisualStudio.Setup.Configuration.Interop/3.13.2069": {
         "runtime": {
           "lib/netstandard2.1/Microsoft.VisualStudio.Setup.Configuration.Interop.dll": {
             "assemblyVersion": "1.0.0.0",
-            "fileVersion": "3.0.4492.23473"
+            "fileVersion": "3.13.2069.59209"
           }
         }
       },
-      "Microsoft.Win32.Registry/5.0.0": {
-        "dependencies": {
-          "System.Security.AccessControl": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
+      "System.Collections.Immutable/8.0.0": {
+        "runtime": {
+          "lib/net6.0/System.Collections.Immutable.dll": {
+            "assemblyVersion": "8.0.0.0",
+            "fileVersion": "8.0.23.53103"
+          }
         }
       },
-      "System.Collections.Immutable/5.0.0": {},
-      "System.Memory/4.5.4": {},
-      "System.Reflection.Metadata/5.0.0": {},
-      "System.Runtime.CompilerServices.Unsafe/5.0.0": {},
-      "System.Security.AccessControl/5.0.0": {
+      "System.Reflection.Metadata/8.0.0": {
         "dependencies": {
-          "Microsoft.NETCore.Platforms": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
+          "System.Collections.Immutable": "8.0.0"
+        },
+        "runtime": {
+          "lib/net6.0/System.Reflection.Metadata.dll": {
+            "assemblyVersion": "8.0.0.0",
+            "fileVersion": "8.0.23.53103"
+          }
         }
       },
-      "System.Security.Principal.Windows/5.0.0": {},
-      "System.Text.Encoding.CodePages/4.5.1": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "5.0.0",
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+      "System.Text.Encoding.CodePages/7.0.0": {
+        "runtime": {
+          "lib/net6.0/System.Text.Encoding.CodePages.dll": {
+            "assemblyVersion": "7.0.0.0",
+            "fileVersion": "7.0.22.51805"
+          }
+        },
+        "runtimeTargets": {
+          "runtimes/win/lib/net6.0/System.Text.Encoding.CodePages.dll": {
+            "rid": "win",
+            "assetType": "runtime",
+            "assemblyVersion": "7.0.0.0",
+            "fileVersion": "7.0.22.51805"
+          }
         }
       },
-      "System.Threading.Tasks.Extensions/4.5.4": {},
       "Sharpmake/1.0.0": {
         "dependencies": {
-          "Basic.Reference.Assemblies.Net50": "1.2.4",
-          "Microsoft.CodeAnalysis.CSharp": "4.0.1",
-          "Microsoft.VisualStudio.Setup.Configuration.Interop": "3.0.4492",
-          "Microsoft.Win32.Registry": "5.0.0"
+          "Basic.Reference.Assemblies.Net60": "1.8.0",
+          "Microsoft.CodeAnalysis.CSharp": "4.13.0",
+          "Microsoft.VisualStudio.Setup.Configuration.Interop": "3.13.2069"
         },
         "runtime": {
-          "Sharpmake.dll": {}
+          "Sharpmake.dll": {
+            "assemblyVersion": "0.91.0.0",
+            "fileVersion": "0.91.0.0"
+          }
         }
       },
       "Sharpmake.CommonPlatforms/1.0.0": {
@@ -188,7 +198,10 @@
           "Sharpmake.Generators": "1.0.0"
         },
         "runtime": {
-          "Sharpmake.CommonPlatforms.dll": {}
+          "Sharpmake.CommonPlatforms.dll": {
+            "assemblyVersion": "0.91.0.0",
+            "fileVersion": "0.91.0.0"
+          }
         }
       },
       "Sharpmake.Generators/1.0.0": {
@@ -196,121 +209,68 @@
           "Sharpmake": "1.0.0"
         },
         "runtime": {
-          "Sharpmake.Generators.dll": {}
+          "Sharpmake.Generators.dll": {
+            "assemblyVersion": "0.91.0.0",
+            "fileVersion": "0.91.0.0"
+          }
         }
       }
     }
   },
   "libraries": {
-    "Sharpmake.Application/1.0.0": {
+    "Sharpmake.Application/0.91.0-7-gd71d8108": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "Basic.Reference.Assemblies.Net50/1.2.4": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dkLNEHjI1vkoE86PrsXfErPFkp5x3ycRO25NwDBcTmd/k354Il3eTqfarbseXKb4cRomPgjDfZwI6FMBWWEuxw==",
-      "path": "basic.reference.assemblies.net50/1.2.4",
-      "hashPath": "basic.reference.assemblies.net50.1.2.4.nupkg.sha512"
-    },
-    "Microsoft.CodeAnalysis.Analyzers/3.3.2": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-7xt6zTlIEizUgEsYAIgm37EbdkiMmr6fP6J9pDoKEpiGM4pi32BCPGr/IczmSJI9Zzp0a6HOzpr9OvpMP+2veA==",
-      "path": "microsoft.codeanalysis.analyzers/3.3.2",
-      "hashPath": "microsoft.codeanalysis.analyzers.3.3.2.nupkg.sha512"
-    },
-    "Microsoft.CodeAnalysis.Common/4.0.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-SMREwaVD5SzatlWhh9aahQAtSWdb63NcE//f+bQzgHSECU6xtDtaxk0kwV+asdFfr6HtW38UeO6jvqdfzudg3w==",
-      "path": "microsoft.codeanalysis.common/4.0.1",
-      "hashPath": "microsoft.codeanalysis.common.4.0.1.nupkg.sha512"
-    },
-    "Microsoft.CodeAnalysis.CSharp/4.0.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Q9RxxydPpUElj/x1/qykDTUGsRoKbJG8H5XUSeMGmMu54fBiuX1xyanom9caa1oQfh5JIW1BgLxobSaWs4WyHQ==",
-      "path": "microsoft.codeanalysis.csharp/4.0.1",
-      "hashPath": "microsoft.codeanalysis.csharp.4.0.1.nupkg.sha512"
-    },
-    "Microsoft.NETCore.Platforms/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==",
-      "path": "microsoft.netcore.platforms/5.0.0",
-      "hashPath": "microsoft.netcore.platforms.5.0.0.nupkg.sha512"
-    },
-    "Microsoft.VisualStudio.Setup.Configuration.Interop/3.0.4492": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-BfkqM96P8+N+cz4T+pxKrIKk2ZD1YMxCXH2ivtBDj5tx6Mc2YQLK1+3h+C6Qebper0RBipuHVn51lb9SZH6bKQ==",
-      "path": "microsoft.visualstudio.setup.configuration.interop/3.0.4492",
-      "hashPath": "microsoft.visualstudio.setup.configuration.interop.3.0.4492.nupkg.sha512"
-    },
-    "Microsoft.Win32.Registry/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
-      "path": "microsoft.win32.registry/5.0.0",
-      "hashPath": "microsoft.win32.registry.5.0.0.nupkg.sha512"
-    },
-    "System.Collections.Immutable/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
-      "path": "system.collections.immutable/5.0.0",
-      "hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
-    },
-    "System.Memory/4.5.4": {
+    "Basic.Reference.Assemblies.Net60/1.8.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
-      "path": "system.memory/4.5.4",
-      "hashPath": "system.memory.4.5.4.nupkg.sha512"
+      "sha512": "sha512-4GYI0Kn8O1eA5rnmB7lDdnYg8h3qrmQCpE6xE/ENq7XxJbP6G8cAg7NrN6qT+Na75SZPEPtfrajDzEV+iM6HUw==",
+      "path": "basic.reference.assemblies.net60/1.8.0",
+      "hashPath": "basic.reference.assemblies.net60.1.8.0.nupkg.sha512"
     },
-    "System.Reflection.Metadata/5.0.0": {
+    "Microsoft.CodeAnalysis.Common/4.13.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==",
-      "path": "system.reflection.metadata/5.0.0",
-      "hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512"
+      "sha512": "sha512-T8nRl4mAUY4mhdYM4U2ra2vP2EL+ol8Yqwo0gwC/V55vmlXq9NxdIkZJynTpTL1uX/jHijJ90AeOEx4lf7OwzQ==",
+      "path": "microsoft.codeanalysis.common/4.13.0",
+      "hashPath": "microsoft.codeanalysis.common.4.13.0.nupkg.sha512"
     },
-    "System.Runtime.CompilerServices.Unsafe/5.0.0": {
+    "Microsoft.CodeAnalysis.CSharp/4.13.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==",
-      "path": "system.runtime.compilerservices.unsafe/5.0.0",
-      "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512"
+      "sha512": "sha512-BsH7Vijbj9IL7Fj4k/ysZSVyLGFqr75wmdFGwCKWJvSjnA1xwPaQ3hkB2BQdHOt5CpEYA6Q0I6Oo5sDTDHqHsg==",
+      "path": "microsoft.codeanalysis.csharp/4.13.0",
+      "hashPath": "microsoft.codeanalysis.csharp.4.13.0.nupkg.sha512"
     },
-    "System.Security.AccessControl/5.0.0": {
+    "Microsoft.VisualStudio.Setup.Configuration.Interop/3.13.2069": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
-      "path": "system.security.accesscontrol/5.0.0",
-      "hashPath": "system.security.accesscontrol.5.0.0.nupkg.sha512"
+      "sha512": "sha512-TsAkTwdKEKGAMbxx1OSFFhWV8+cC8T75YxUyRrP5XLrqtH1XYpueSlriyvUaQirqmowpW4CWbV5imJMRe99BlQ==",
+      "path": "microsoft.visualstudio.setup.configuration.interop/3.13.2069",
+      "hashPath": "microsoft.visualstudio.setup.configuration.interop.3.13.2069.nupkg.sha512"
     },
-    "System.Security.Principal.Windows/5.0.0": {
+    "System.Collections.Immutable/8.0.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==",
-      "path": "system.security.principal.windows/5.0.0",
-      "hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
+      "sha512": "sha512-AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==",
+      "path": "system.collections.immutable/8.0.0",
+      "hashPath": "system.collections.immutable.8.0.0.nupkg.sha512"
     },
-    "System.Text.Encoding.CodePages/4.5.1": {
+    "System.Reflection.Metadata/8.0.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==",
-      "path": "system.text.encoding.codepages/4.5.1",
-      "hashPath": "system.text.encoding.codepages.4.5.1.nupkg.sha512"
+      "sha512": "sha512-ptvgrFh7PvWI8bcVqG5rsA/weWM09EnthFHR5SCnS6IN+P4mj6rE1lBDC4U8HL9/57htKAqy4KQ3bBj84cfYyQ==",
+      "path": "system.reflection.metadata/8.0.0",
+      "hashPath": "system.reflection.metadata.8.0.0.nupkg.sha512"
     },
-    "System.Threading.Tasks.Extensions/4.5.4": {
+    "System.Text.Encoding.CodePages/7.0.0": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
-      "path": "system.threading.tasks.extensions/4.5.4",
-      "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
+      "sha512": "sha512-LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==",
+      "path": "system.text.encoding.codepages/7.0.0",
+      "hashPath": "system.text.encoding.codepages.7.0.0.nupkg.sha512"
     },
     "Sharpmake/1.0.0": {
       "type": "project",
diff --git a/Tools/Sharpmake/Sharpmake.Application.dll b/Tools/Sharpmake/Sharpmake.Application.dll
index e771f182..381d4b82 100644
Binary files a/Tools/Sharpmake/Sharpmake.Application.dll and b/Tools/Sharpmake/Sharpmake.Application.dll differ
diff --git a/Tools/Sharpmake/Sharpmake.Application.exe b/Tools/Sharpmake/Sharpmake.Application.exe
index a4c69345..b79642e8 100644
Binary files a/Tools/Sharpmake/Sharpmake.Application.exe and b/Tools/Sharpmake/Sharpmake.Application.exe differ
diff --git a/Tools/Sharpmake/Sharpmake.Application.runtimeconfig.json b/Tools/Sharpmake/Sharpmake.Application.runtimeconfig.json
index c285e30f..6fc15583 100644
--- a/Tools/Sharpmake/Sharpmake.Application.runtimeconfig.json
+++ b/Tools/Sharpmake/Sharpmake.Application.runtimeconfig.json
@@ -1,12 +1,15 @@
 {
   "runtimeOptions": {
-    "tfm": "net5.0",
+    "tfm": "net6.0",
+    "rollForward": "Major",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "configProperties": {
+      "System.GC.Server": true,
       "System.Globalization.Invariant": true,
+      "System.Globalization.PredefinedCulturesOnly": true,
       "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
     }
   }
diff --git a/Tools/Sharpmake/Sharpmake.CommonPlatforms.dll b/Tools/Sharpmake/Sharpmake.CommonPlatforms.dll
index 6debecb4..3114a45e 100644
Binary files a/Tools/Sharpmake/Sharpmake.CommonPlatforms.dll and b/Tools/Sharpmake/Sharpmake.CommonPlatforms.dll differ
diff --git a/Tools/Sharpmake/Sharpmake.Generators.dll b/Tools/Sharpmake/Sharpmake.Generators.dll
index 2ca05c6f..501b6a19 100644
Binary files a/Tools/Sharpmake/Sharpmake.Generators.dll and b/Tools/Sharpmake/Sharpmake.Generators.dll differ
diff --git a/Tools/Sharpmake/Sharpmake.dll b/Tools/Sharpmake/Sharpmake.dll
index cd5392b5..5bcebb5a 100644
Binary files a/Tools/Sharpmake/Sharpmake.dll and b/Tools/Sharpmake/Sharpmake.dll differ
diff --git a/Tools/Sharpmake/System.Collections.Immutable.dll b/Tools/Sharpmake/System.Collections.Immutable.dll
new file mode 100644
index 00000000..ed5fa050
Binary files /dev/null and b/Tools/Sharpmake/System.Collections.Immutable.dll differ
diff --git a/Tools/Sharpmake/System.Reflection.Metadata.dll b/Tools/Sharpmake/System.Reflection.Metadata.dll
new file mode 100644
index 00000000..42627c59
Binary files /dev/null and b/Tools/Sharpmake/System.Reflection.Metadata.dll differ
diff --git a/Tools/Sharpmake/System.Text.Encoding.CodePages.dll b/Tools/Sharpmake/System.Text.Encoding.CodePages.dll
new file mode 100644
index 00000000..78383ad6
Binary files /dev/null and b/Tools/Sharpmake/System.Text.Encoding.CodePages.dll differ
diff --git a/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.CSharp.resources.dll
index d0282cc6..fbe4fae1 100644
Binary files a/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.resources.dll
index fd3063e1..91006eb5 100644
Binary files a/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/cs/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/de/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/de/Microsoft.CodeAnalysis.CSharp.resources.dll
index e079e05a..0f3b7fc9 100644
Binary files a/Tools/Sharpmake/de/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/de/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/de/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/de/Microsoft.CodeAnalysis.resources.dll
index 54aa47dd..c85b4878 100644
Binary files a/Tools/Sharpmake/de/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/de/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/es/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/es/Microsoft.CodeAnalysis.CSharp.resources.dll
index 4afd9fad..6429030c 100644
Binary files a/Tools/Sharpmake/es/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/es/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/es/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/es/Microsoft.CodeAnalysis.resources.dll
index 2d6218e8..8d189a07 100644
Binary files a/Tools/Sharpmake/es/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/es/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.CSharp.resources.dll
index 93a31c11..35336df9 100644
Binary files a/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.resources.dll
index a22b8d5b..4ef1114c 100644
Binary files a/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/fr/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/it/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/it/Microsoft.CodeAnalysis.CSharp.resources.dll
index 7f9325d6..1cbb09ec 100644
Binary files a/Tools/Sharpmake/it/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/it/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/it/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/it/Microsoft.CodeAnalysis.resources.dll
index e71779fa..626460c3 100644
Binary files a/Tools/Sharpmake/it/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/it/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.CSharp.resources.dll
index 58a375d8..de1f71b4 100644
Binary files a/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.resources.dll
index 8c8510d8..8c29a437 100644
Binary files a/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/ja/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.CSharp.resources.dll
index 3b3f0ed8..31419ddf 100644
Binary files a/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.resources.dll
index 66458d52..3f275e1b 100644
Binary files a/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/ko/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.CSharp.resources.dll
index 0c6175e1..331dac4f 100644
Binary files a/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.resources.dll
index 82ff47c2..0f32d3f2 100644
Binary files a/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/pl/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll
index 2d2ccbe3..e2962f0d 100644
Binary files a/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.resources.dll
index b583d8ef..d0171a0c 100644
Binary files a/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/pt-BR/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.CSharp.resources.dll
index 08d18ade..7b850747 100644
Binary files a/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.resources.dll
index 0d0a62d5..4fd6ee5d 100644
Binary files a/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/ru/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/runtimes/win/lib/net6.0/System.Text.Encoding.CodePages.dll b/Tools/Sharpmake/runtimes/win/lib/net6.0/System.Text.Encoding.CodePages.dll
new file mode 100644
index 00000000..73b2d024
Binary files /dev/null and b/Tools/Sharpmake/runtimes/win/lib/net6.0/System.Text.Encoding.CodePages.dll differ
diff --git a/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.CSharp.resources.dll
index 56f6a165..52a01895 100644
Binary files a/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.resources.dll
index 81ce1fcf..6955ac45 100644
Binary files a/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/tr/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll
index ffe26824..c61a69d1 100644
Binary files a/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.resources.dll
index d17ccb3c..38de8bbc 100644
Binary files a/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/zh-Hans/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll b/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll
index 2efe8782..f29b70fb 100644
Binary files a/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll and b/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll differ
diff --git a/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.resources.dll b/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.resources.dll
index 62c7b50e..bec1e3fb 100644
Binary files a/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.resources.dll and b/Tools/Sharpmake/zh-Hant/Microsoft.CodeAnalysis.resources.dll differ
diff --git a/Tools/SharpmakeProject.sharpmake.cs b/Tools/SharpmakeProject.sharpmake.cs
index 62305094..db7448ee 100644
--- a/Tools/SharpmakeProject.sharpmake.cs
+++ b/Tools/SharpmakeProject.sharpmake.cs
@@ -6,11 +6,26 @@ public SharpmakeProjectBase()
         : base(typeof(CommonTarget))
     {
         Name = "SharpmakeProject";
-        SourceRootPath = @"./";
+        RootPath = @"[project.SharpmakeCsPath]";
+        SourceRootPath = @"[project.SharpmakeCsPath]";
 
         ProjectSchema = CSharpProjectSchema.NetFramework;
-        string[] things = { ".xml", ".map", ".config", ".bat", ".txt", ".xsd", ".h.template", ".resx", ".cur" };
-        NoneExtensions.Remove(things);
+
+        SourceFilesExcludeRegex.Add(@".*\.xml");
+        SourceFilesExcludeRegex.Add(@".*\.map");
+        SourceFilesExcludeRegex.Add(@".*\.config");
+        SourceFilesExcludeRegex.Add(@".*\.bat");
+        SourceFilesExcludeRegex.Add(@".*\.txt");
+        SourceFilesExcludeRegex.Add(@".*\.xsd");
+        SourceFilesExcludeRegex.Add(@".*\.h\.template");
+        SourceFilesExcludeRegex.Add(@".*\.template");
+        SourceFilesExcludeRegex.Add(@".*\.resx");
+        SourceFilesExcludeRegex.Add(@".*\.cur");
+        SourceFilesExcludeRegex.Add(@".*\.proto");
+        SourceFilesExcludeRegex.Add(@".*\.vsct");
+        SourceFilesExcludeRegex.Add(@".*\.settings");
+        SourceFilesExcludeRegex.Add(@".*\.manifest");
+
         SourceFilesExtensions = new Strings("Engine.sharpmake.cs");
 
         ContentExtension.Add("GenerateSolution.bat", "macOS.yml", "Windows.yml", "UWP.yml");