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

OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs

@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Framework
                 {
                     foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
                     {
-                        if (kvp.Value.AgentID == agentId)
+                        if (agentId.Equals(kvp.Value.AgentID))
                         {
                             m_scene.EventManager.TriggerOnDeregisterCaps(agentId, kvp.Value);
                             m_capsObjects.Remove(kvp.Key);

OpenSim/Region/Framework/Interfaces/ICloudModule.cs

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace OpenSim.Region.Framework.Interfaces
-{
-    public interface ICloudModule
-    {
-        /// <summary>
-        /// Retrieves the cloud density at the given region coordinates
-        /// </summary>
-        float CloudCover(int x, int y, int z);
-    }
-}

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -1454,15 +1454,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Float llCloud(LSL_Vector offset)
         {
-            ICloudModule module = World.RequestModuleInterface<ICloudModule>();
-            if (module is not null)
-            {
-                Vector3 pos = m_host.GetWorldPosition();
-                int x = (int)(pos.X + offset.x);
-                int y = (int)(pos.Y + offset.y);
-
-                return module.CloudCover(x, y, 0);
-            }
             return 0;
         }
 

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>

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:

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

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
     }
   }

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>

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

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