diff --git a/BUILDING.md b/BUILDING.md
index 0c612d0d12..a8b47e478b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -11,7 +11,7 @@ get or update source from git
 ## Requirements
   To building under Windows, the following is required:
 
-  * [dotnet 6.0 SDK, Runtime and Desktop Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+  * [dotnet 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 
 optionally also
 
@@ -36,7 +36,7 @@ Now just run `OpenSim.exe` from the `bin` folder, and set up the region.
 
 ## Requirements
 
- * [dotnet 6.0 SDK and Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+ * [dotnet 8.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
  * libgdiplus 
  
  if you have mono 6.x complete, you already have libgdiplus, otherwise you need to install it
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index ff54109f3b..a963f2a4ad 100755
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -120,7 +120,8 @@ namespace Prebuild.Core.Nodes
         net5_0,
         net6_0,
         net7_0,
-        net8_0
+        net8_0,
+        net9_0
     }
 
     /// <summary>
diff --git a/Prebuild/src/Core/Targets/VS2022Target.cs b/Prebuild/src/Core/Targets/VS2022Target.cs
index c15c0d997d..d3a8dab7fe 100644
--- a/Prebuild/src/Core/Targets/VS2022Target.cs
+++ b/Prebuild/src/Core/Targets/VS2022Target.cs
@@ -110,6 +110,7 @@ namespace Prebuild.Core.Targets
                 case FrameworkVersion.net6_0:
                 case FrameworkVersion.net7_0:
                 case FrameworkVersion.net8_0:
+                case FrameworkVersion.net9_0:
                     return "ToolsVersion=\"17.0\"";
                 case FrameworkVersion.netstandard2_0:
                 case FrameworkVersion.v4_8:
diff --git a/README.md b/README.md
index 4799481e40..53d94e7a21 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Please see BUILDING.md
 
 # Running OpenSim on Windows
 
-You will need dotnet 6.0 runtime (https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+You will need dotnet 8.0 runtime (https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 
 
 To run OpenSim from a command prompt
@@ -30,7 +30,7 @@ To run OpenSim from a command prompt
 
 You will need
 
- * [dotnet 6.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+ * [dotnet 8.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
  * libgdiplus 
  
  if you have mono 6.x complete, you already have libgdiplus, otherwise you need to install it
diff --git a/bin/prebuild.dll b/bin/prebuild.dll
index 14ca3d2116..235b968691 100644
Binary files a/bin/prebuild.dll and b/bin/prebuild.dll differ
diff --git a/bin/prebuild.runtimeconfig.json b/bin/prebuild.runtimeconfig.json
index 418df653a1..b0a83d62c1 100644
--- a/bin/prebuild.runtimeconfig.json
+++ b/bin/prebuild.runtimeconfig.json
@@ -1,11 +1,13 @@
 {
   "runtimeOptions": {
-    "tfm": "net6.0",
+    "tfm": "net8.0",
     "framework": {
       "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
+      "version": "8.0.0"
     },
     "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false,
       "System.Runtime.TieredCompilation": false
     }
   }
diff --git a/prebuild.xml b/prebuild.xml
index 7061d85557..63a5bdf610 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <Prebuild version="1.10" xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.10.xsd">
   <!-- <Solution activeConfig="Debug" name="OpenSim" path="./" version="0.5.0-$Rev$" forceFrameworkVersion="v4_6"> -->
-  <Solution activeConfig="Release" name="OpenSim" path="./" version="0.5.0-$Rev$" frameworkVersion="net6_0">
+  <Solution activeConfig="Release" name="OpenSim" path="./" version="0.5.0-$Rev$" frameworkVersion="net8_0">
   <Configuration name="Debug" >
       <Options>
         <CompilerDefines>TRACE</CompilerDefines>
diff --git a/runprebuild.bat b/runprebuild.bat
index 7eb3c5fa06..f00b47b80f 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -2,7 +2,7 @@
 
 copy bin\System.Drawing.Common.dll.win bin\System.Drawing.Common.dll
 
-dotnet bin\prebuild.dll /target vs2022 /targetframework net6_0 /excludedir = "obj | bin" /file prebuild.xml
+dotnet bin\prebuild.dll /target vs2022 /targetframework net8_0 /excludedir = "obj | bin" /file prebuild.xml
 
     @echo Creating compile.bat
 rem To compile in debug mode
diff --git a/runprebuild.sh b/runprebuild.sh
index 5f724617c2..4cf82ebc4d 100755
--- a/runprebuild.sh
+++ b/runprebuild.sh
@@ -19,7 +19,7 @@ case "$1" in
   *)
 
     cp bin/System.Drawing.Common.dll.linux bin/System.Drawing.Common.dll
-    dotnet bin/prebuild.dll /target vs2022 /targetframework net6_0 /excludedir = "obj | bin" /file prebuild.xml
+    dotnet bin/prebuild.dll /target vs2022 /targetframework net8_0 /excludedir = "obj | bin" /file prebuild.xml
     echo "dotnet build -c Release OpenSim.sln" > compile.sh
     chmod +x compile.sh