Mono.Addins is gone. Its not fully supported on dotnet6+ anyway. Swit…

…ching to use the Host Container in dotnet core with Autofac as the underlying DI engine, This allow instantiating what were traditionally plugins using DI features. Each DLL supplying plugins also supplies its own initialization, registering plugins with the DI system. This is a milestone but more needs to be completed and all of it needs testing.
OpenSim-NGC · Nov 8, 2023 · 754ee54 · 754ee54
1 parent 62c6f61
commit 754ee54
Show file tree

Hide file tree

Showing 316 changed files with 4,233 additions and 5,007 deletions.
diff --git a/OpenSim.sln b/OpenSim.sln
@@ -133,8 +133,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Services.UserProfil
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Tools.Configger", "OpenSim\Tools\Configger\OpenSim.Tools.Configger.csproj", "{2F0C334A-0000-0000-0000-000000000000}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSimMutelist.Modules", "addon-modules\OpenSimMutelist\Modules\OpenSimMutelist.Modules.csproj", "{87C4E6E3-0000-0000-0000-000000000000}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSimSearch.Modules", "addon-modules\OpenSimSearch\Modules\OpenSimSearch.Modules.csproj", "{BE5D1132-0000-0000-0000-000000000000}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pCampBot", "OpenSim\Tools\pCampBot\pCampBot.csproj", "{AF52AEDC-0000-0000-0000-000000000000}"
@@ -149,7 +147,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Region.OptionalModu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Server.MoneyServer", "OpenSim\Server\MoneyServer\OpenSim.Server.MoneyServer.csproj", "{C3AEE6AC-BE40-4003-A7A3-E8AA039E4451}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Server.RegionServer", "OpenSim\Server\RegionServer\OpenSim.Server.RegionServer.csproj", "{03E1D988-8F42-44E2-B42A-6952090AEC88}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSim.Server.RegionServer", "OpenSim\Server\RegionServer\OpenSim.Server.RegionServer.csproj", "{03E1D988-8F42-44E2-B42A-6952090AEC88}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -417,10 +415,6 @@ Global
 		{2F0C334A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F0C334A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F0C334A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87C4E6E3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87C4E6E3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87C4E6E3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87C4E6E3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE5D1132-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BE5D1132-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE5D1132-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/OpenSim/Addons/Groups/GroupsAddonModule.cs b/OpenSim/Addons/Groups/GroupsAddonModule.cs
@@ -0,0 +1,37 @@
+using Autofac;
+using OpenSim.Groups;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Groups
+{
+    public class GroupsAddonModule : Module
+    {
+        protected override void Load(ContainerBuilder builder)
+        {
+            builder.RegisterType<GroupsMessagingModule>()
+                .Named<ISharedRegionModule>("GroupsMessagingModule")
+                .AsImplementedInterfaces()
+                .SingleInstance();
+
+            builder.RegisterType<GroupsModule>()
+                .Named<ISharedRegionModule>("GroupsModule")
+                .AsImplementedInterfaces()
+                .SingleInstance();
+
+            builder.RegisterType<GroupsServiceHGConnectorModule>()
+                .Named<ISharedRegionModule>("GroupsServiceHGConnectorModule")
+                .AsImplementedInterfaces()
+                .SingleInstance();
+
+            builder.RegisterType<GroupsServiceLocalConnectorModule>()
+                .Named<ISharedRegionModule>("GroupsServiceLocalConnectorModule")
+                .AsImplementedInterfaces()
+                .SingleInstance();
+
+            builder.RegisterType<GroupsServiceRemoteConnectorModule>()
+                .Named<ISharedRegionModule>("GroupsServiceRemoteConnectorModule")
+                .AsImplementedInterfaces()
+                .SingleInstance();
+        }
+    }
+}
diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -25,19 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 

diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs
@@ -25,19 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Timers;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+
 using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Groups

diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -25,11 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
@@ -39,7 +35,6 @@
 using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
-using Mono.Addins;
 using log4net;
 using Nini.Config;
 

diff --git a/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs b/OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs
@@ -25,19 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
-using Mono.Addins;
 using log4net;
 using Nini.Config;
 

diff --git a/OpenSim/Addons/Groups/OpenSim.Addons.Groups.csproj b/OpenSim/Addons/Groups/OpenSim.Addons.Groups.csproj
@@ -7,8 +7,8 @@
     <Copyright>Copyright (c) OpenSimulator.org Developers</Copyright>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="RawScape.Nini" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
@@ -36,6 +36,7 @@
     <ProjectReference Include="..\..\Server\Handlers\OpenSim.Server.Handlers.csproj" />
     <ProjectReference Include="..\..\Services\Base\OpenSim.Services.Base.csproj" />
     <ProjectReference Include="..\..\Services\Interfaces\OpenSim.Services.Interfaces.csproj" />
+    <ProjectReference Include="..\OfflineIM\OpenSim.Addons.OfflineIM.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\OpenSim.Addons.Groups.addin.xml" />

diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs
@@ -25,21 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Threading;
-using System.Text;
 
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
-using Mono.Addins;
 using log4net;
 using Nini.Config;
 

diff --git a/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs b/OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs
@@ -24,16 +24,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;

diff --git a/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj b/OpenSim/Addons/OfflineIM/OpenSim.Addons.OfflineIM.csproj
@@ -10,8 +10,8 @@
     <EmbeddedResource Include="Resources\OpenSim.Addons.OfflineIM.addin.xml" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Mono.Addins" Version="1.4.1" />
     <PackageReference Include="RawScape.Nini" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/EstateLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/EstateLoaderFileSystem.cs
@@ -25,14 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.Framework;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
 {
@@ -42,9 +40,9 @@ public class EstateLoaderFileSystem : IEstateLoader
 
         private IConfigSource m_configSource;
 
-        private OpenSimBase m_application;
+        private IOpenSimBase m_application;
 
-        public EstateLoaderFileSystem(OpenSimBase openSim)
+        public EstateLoaderFileSystem(IOpenSimBase openSim)
         {
             m_application = openSim;
         }