Skip to content

Commit

Permalink
Flattened the script engine project hierarchy, there are now 2 dlls. …
Browse files Browse the repository at this point in the history
…A Shared implementation and YEngine. In the future we can add something like Phlox in as its own project and reuse the bits in Shared
mdickson committed Jan 10, 2024
1 parent 10837f1 commit 5fef83b
Showing 79 changed files with 89 additions and 302 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion OpenSim/Tools/Compiler/OpenSim.Tools.lslc.csproj
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Framework\OpenSim.Framework.csproj" />
<ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj" />
<ProjectReference Include="..\..\Region\ScriptEngine\Shared\CodeTools\OpenSim.Region.ScriptEngine.Shared.CodeTools.csproj" />
<ProjectReference Include="..\..\..\Soorce\OpenSim.Region.ScriptEngine.Shared\OpenSim.Region.ScriptEngine.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.ScriptEngine.Shared</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
<Copyright>OpenSimulator developers</Copyright>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenMetaverse">
<HintPath>..\..\bin\OpenMetaverse.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenMetaverseTypes">
<HintPath>..\..\bin\OpenMetaverseTypes.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenMetaverse.StructredData">
<HintPath>..\..\bin\OpenMetaverse.StructuredData.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\OpenSim\Region\Application\OpenSim.csproj" />
<ProjectReference Include="..\..\Source\OpenSim.Framework\OpenSim.Framework.csproj" />
<ProjectReference Include="..\..\\Source\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj" />
<ProjectReference Include="..\..\OpenSim\Region\CoreModules\OpenSim.Region.CoreModules.csproj" />
<ProjectReference Include="..\..\OpenSim\Region\Framework\OpenSim.Region.Framework.csproj" />
<ProjectReference Include="..\..\OpenSim\Services\Interfaces\OpenSim.Services.Interfaces.csproj" />
<ProjectReference Include="..\..\ThirdParty\SmartThreadPool\SmartThreadPool.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="RawScape.Nini" Version="1.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AssemblyTitle>OpenSim.Region.ScriptEngine.YEngine</AssemblyTitle>
<Company>http://opensimulator.org</Company>
<Product>OpenSim</Product>
<Copyright>OpenSimulator developers</Copyright>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="RawScape.Nini" Version="1.0.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="OpenMetaverse">
<HintPath>..\..\bin\OpenMetaverse.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenMetaverse.StructuredData">
<HintPath>..\..\bin\OpenMetaverse.StructuredData.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenMetaverseTypes">
<HintPath>..\..\bin\OpenMetaverseTypes.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Source\OpenSim.Framework\OpenSim.Framework.csproj" />
<ProjectReference Include="..\..\Source\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj" />
<ProjectReference Include="..\..\Source\OpenSim.Framework.Monitoring\OpenSim.Framework.Monitoring.csproj" />
<ProjectReference Include="..\..\OpenSim\Region\ClientStack\Linden\Caps\OpenSim.Region.ClientStack.LindenCaps.csproj" />
<ProjectReference Include="..\..\OpenSim\Region\CoreModules\OpenSim.Region.CoreModules.csproj" />
<ProjectReference Include="..\..\OpenSim\Region\Framework\OpenSim.Region.Framework.csproj" />
<ProjectReference Include="..\..\Source\OpenSim.Region.ScriptEngine.Shared\OpenSim.Region.ScriptEngine.Shared.csproj" />
<ProjectReference Include="..\..\OpenSim\Services\Interfaces\OpenSim.Services.Interfaces.csproj" />
</ItemGroup>
</Project>
12 changes: 7 additions & 5 deletions Source/OpenSim.Server.MoneyServer/Program.cs
Original file line number Diff line number Diff line change
@@ -76,14 +76,14 @@ private static void StartMoneyServer(string console, List<string> inifile)
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.ConfigureAppConfiguration(configuration =>
{
configuration.AddIniFile("MoneyServer.ini", optional: true, reloadOnChange: true);
configuration.AddIniFile("MoneyServer.ini", optional: true, reloadOnChange: false);

foreach (var item in inifile)
{
configuration.AddIniFile(item, optional: true, reloadOnChange: true);
configuration.AddIniFile(item, optional: true, reloadOnChange: false);
}

configuration.EnableSubstitutions("$(", ")");
// configuration.EnableSubstitutions("$(", ")");
})
.ConfigureContainer<ContainerBuilder>(builder =>
{
@@ -107,8 +107,10 @@ private static void StartMoneyServer(string console, List<string> inifile)
services.AddHostedService<PidFileService>();
});

IHost host = builder.Build();
host.Run();
using var host = builder.Build();
{
host.Run();
}
}
}
}
Loading

0 comments on commit 5fef83b

Please sign in to comment.