add parameters frameworkVersion and forceFrameworkVersion to the prebuild solution. First sets the version if not defined on projects, alternatively the second does override those. The comandline can still override all. Use command line override to compile for 4.8 so remove 4.4 xml and simplify main xml, still defaulting to 4.6

This commit is contained in:
UbitUmarov
2022-03-30 18:44:54 +01:00
parent 0b19ce979c
commit bf6885607e
7 changed files with 130 additions and 3665 deletions

View File

@@ -77,6 +77,7 @@ namespace Prebuild.Core.Nodes
/// </summary>
public enum FrameworkVersion: byte
{
none = 0,
/// <summary>
/// .NET 2.0
/// </summary>
@@ -140,7 +141,7 @@ namespace Prebuild.Core.Nodes
private string m_Language = "C#";
private ProjectType m_Type = ProjectType.Exe;
private ClrRuntime m_Runtime = ClrRuntime.Microsoft;
private FrameworkVersion m_Framework = FrameworkVersion.v2_0;
private FrameworkVersion m_Framework = FrameworkVersion.none;
private bool m_useFramework = true;
private string m_StartupObject = "";
private string m_RootNamespace;
@@ -529,6 +530,18 @@ namespace Prebuild.Core.Nodes
{
m_Configurations[conf.NameAndPlatform] = (ConfigurationNode)conf.Clone();
}
if(m_useFramework)
{
if(parent.ForceFramework != FrameworkVersion.none)
{
m_Framework = parent.ForceFramework;
m_useFramework = false;
}
else if(m_Framework == FrameworkVersion.none)
{
m_Framework = parent.DefaultFramework != FrameworkVersion.none ? parent.DefaultFramework : FrameworkVersion.v2_0;
}
}
}
}
}

View File

@@ -50,6 +50,8 @@ namespace Prebuild.Core.Nodes
private string m_FullPath = "";
private string m_ActiveConfig;
private string m_Version = "1.0.0";
public FrameworkVersion DefaultFramework = FrameworkVersion.none;
public FrameworkVersion ForceFramework = FrameworkVersion.none;
private OptionsNode m_Options;
private FilesNode m_Files;
@@ -302,6 +304,22 @@ namespace Prebuild.Core.Nodes
m_ActiveConfig = Helper.AttributeValue(node, "activeConfig", m_ActiveConfig);
m_Path = Helper.AttributeValue(node, "path", m_Path);
m_Version = Helper.AttributeValue(node, "version", m_Version);
string tmp = Helper.AttributeValue(node, "forceFrameworkVersion", "");
if (tmp.Length > 0)
{
if (!FrameworkVersion.TryParse(tmp, true, out ForceFramework))
ForceFramework = FrameworkVersion.none;
}
if(ForceFramework == FrameworkVersion.none)
{
tmp = Helper.AttributeValue(node, "frameworkVersion", "");
if (tmp.Length > 0)
{
if (!FrameworkVersion.TryParse(tmp, true, out DefaultFramework))
DefaultFramework = FrameworkVersion.none;
}
}
m_FullPath = m_Path;
try

Binary file not shown.

View File

@@ -1,7 +1,8 @@
<?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$">
<Configuration name="Debug" >
<!-- <Solution activeConfig="Debug" name="OpenSim" path="./" version="0.5.0-$Rev$" forceFrameworkVersion="v4_6"> -->
<Solution activeConfig="Debug" name="OpenSim" path="./" version="0.5.0-$Rev$" frameworkVersion="v4_6">
<Configuration name="Debug" >
<Options>
<CompilerDefines>TRACE;DEBUG</CompilerDefines>
<OptimizeCode>false</OptimizeCode>
@@ -36,7 +37,7 @@
<!-- Core OpenSim Projects -->
<!--
<Project frameworkVersion="v4_6" name="OpenSim.Model" path="OpenSim/Model" type="Library">
<Project name="OpenSim.Model" path="OpenSim/Model" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -57,7 +58,7 @@
</Project>
-->
<Project frameworkVersion="v4_6" name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
<Project name="SmartThreadPool" path="ThirdParty/SmartThreadPool" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -81,7 +82,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
<Project name="OpenSim.Framework" path="OpenSim/Framework" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -125,7 +126,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
<Project name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -157,7 +158,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
<Project name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -186,7 +187,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
<Project name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -218,7 +219,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
<Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -247,7 +248,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
<Project name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -277,7 +278,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Data" path="OpenSim/Data" type="Library">
<Project name="OpenSim.Data" path="OpenSim/Data" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -308,7 +309,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
<Project name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -335,7 +336,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
<Project name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -368,7 +369,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
<Project name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -404,7 +405,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
<Project name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -431,7 +432,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
<Project name="OpenSim.Region.Framework" path="OpenSim/Region/Framework" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -480,7 +481,7 @@
<!-- OGS projects -->
<Project frameworkVersion="v4_6" name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
<Project name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -517,7 +518,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
<Project name="OpenSim.Services.Base" path="OpenSim/Services/Base" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -546,7 +547,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
<Project name="OpenSim.Services.UserAccountService" path="OpenSim/Services/UserAccountService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -579,7 +580,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
<Project name="OpenSim.Services.FriendsService" path="OpenSim/Services/Friends" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -612,7 +613,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
<Project name="OpenSim.Services.Connectors" path="OpenSim/Services/Connectors" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -655,7 +656,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.SimulationService" path="OpenSim/Services/SimulationService" type="Library">
<Project name="OpenSim.Services.SimulationService" path="OpenSim/Services/SimulationService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -691,7 +692,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
<Project name="OpenSim.Services.AssetService" path="OpenSim/Services/AssetService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -725,7 +726,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.FSAssetService" path="OpenSim/Services/FSAssetService" type="Library">
<Project name="OpenSim.Services.FSAssetService" path="OpenSim/Services/FSAssetService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -761,7 +762,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
<Project name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -794,7 +795,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
<Project name="OpenSim.Services.FreeswitchService" path="OpenSim/Services/FreeswitchService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -828,7 +829,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
<Project name="OpenSim.Services.AuthenticationService" path="OpenSim/Services/AuthenticationService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -863,7 +864,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
<Project name="OpenSim.Services.GridService" path="OpenSim/Services/GridService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -899,7 +900,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.EstateService" path="OpenSim/Services/EstateService" type="Library">
<Project name="OpenSim.Services.EstateService" path="OpenSim/Services/EstateService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -930,7 +931,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
<Project name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -963,7 +964,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
<Project name="OpenSim.Services.AvatarService" path="OpenSim/Services/AvatarService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -996,7 +997,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
<Project name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1032,7 +1033,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
<Project name="OpenSim.Services.LLLoginService" path="OpenSim/Services/LLLoginService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1067,7 +1068,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
<Project name="OpenSim.Services.HypergridService" path="OpenSim/Services/HypergridService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1108,7 +1109,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
<Project name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1140,7 +1141,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.MuteListService" path="OpenSim/Services/MuteListService" type="Library">
<Project name="OpenSim.Services.MuteListService" path="OpenSim/Services/MuteListService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1170,7 +1171,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
<Project name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1207,7 +1208,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
<Project name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1248,7 +1249,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
<Project name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1290,7 +1291,7 @@
</Project>
<Project frameworkVersion="v4_6" name="Robust" path="OpenSim/Server" type="Exe">
<Project name="Robust" path="OpenSim/Server" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -1327,7 +1328,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
<Project name="OpenSim.ConsoleClient" path="OpenSim/ConsoleClient" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -1362,7 +1363,7 @@
</Project>
<!-- ClientStack Plugins -->
<Project frameworkVersion="v4_6" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
<Project name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -1406,7 +1407,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
<Project name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -1452,7 +1453,7 @@
<!-- Data Base Modules -->
<Project frameworkVersion="v4_6" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
<Project name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1492,7 +1493,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
<Project name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1530,7 +1531,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
<Project name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1571,7 +1572,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
<Project name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1641,7 +1642,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
<Project name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1700,7 +1701,7 @@
</Project>
<!-- Datastore Plugins -->
<Project frameworkVersion="v4_6" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
<Project name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -1730,7 +1731,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
<Project name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1758,7 +1759,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
<Project name="OpenSim.Region.PhysicsModule.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1793,7 +1794,7 @@
</Project>
<!-- Physics Plug-ins -->
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library">
<Project name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1820,7 +1821,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.POS" path="OpenSim/Region/PhysicsModules/POS" type="Library">
<Project name="OpenSim.Region.PhysicsModule.POS" path="OpenSim/Region/PhysicsModules/POS" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1847,7 +1848,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.Ode" path="OpenSim/Region/PhysicsModules/Ode" type="Library">
<Project name="OpenSim.Region.PhysicsModule.Ode" path="OpenSim/Region/PhysicsModules/Ode" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1879,7 +1880,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.ubOde" path="OpenSim/Region/PhysicsModules/ubOde" type="Library">
<Project name="OpenSim.Region.PhysicsModule.ubOde" path="OpenSim/Region/PhysicsModules/ubOde" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1913,7 +1914,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.ubOdeMeshing" path="OpenSim/Region/PhysicsModules/ubOdeMeshing" type="Library">
<Project name="OpenSim.Region.PhysicsModule.ubOdeMeshing" path="OpenSim/Region/PhysicsModules/ubOdeMeshing" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1948,7 +1949,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.BulletS" path="OpenSim/Region/PhysicsModules/BulletS" type="Library">
<Project name="OpenSim.Region.PhysicsModule.BulletS" path="OpenSim/Region/PhysicsModules/BulletS" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -1988,7 +1989,7 @@
</Project>
<!-- OpenSim app -->
<Project frameworkVersion="v4_6" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
<Project name="OpenSim" path="OpenSim/Region/Application" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2033,7 +2034,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
<Project name="OpenSim.ApplicationPlugins.LoadRegions" path="OpenSim/ApplicationPlugins/LoadRegions" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2068,7 +2069,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
<Project name="OpenSim.ApplicationPlugins.RegionModulesController" path="OpenSim/ApplicationPlugins/RegionModulesController" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2099,7 +2100,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
<Project name="OpenSim.ApplicationPlugins.RemoteController" path="OpenSim/ApplicationPlugins/RemoteController" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2141,7 +2142,7 @@
<!-- Scene Server API Example Apps -->
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2176,7 +2177,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" path="OpenSim/Region/ScriptEngine/Shared/Api/Runtime" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../../bin/</OutputPath>
@@ -2210,7 +2211,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Shared.Api" path="OpenSim/Region/ScriptEngine/Shared/Api/Implementation" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../../bin/</OutputPath>
@@ -2254,7 +2255,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools" path="OpenSim/Region/ScriptEngine/Shared/CodeTools" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -2285,7 +2286,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Shared.Instance" path="OpenSim/Region/ScriptEngine/Shared/Instance" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -2324,7 +2325,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
<Project name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../../bin/</OutputPath>
@@ -2359,7 +2360,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
<Project name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2406,7 +2407,7 @@
</Project>
<!-- YEngine/core XMRengine -->
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.YEngine" path="OpenSim/Region/ScriptEngine/YEngine" type="Library">
<Project name="OpenSim.Region.ScriptEngine.YEngine" path="OpenSim/Region/ScriptEngine/YEngine" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2452,7 +2453,7 @@
<!-- Addons -->
<Project frameworkVersion="v4_6" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
<Project name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2497,7 +2498,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
<Project name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2547,7 +2548,7 @@
<!-- Tools -->
<Project frameworkVersion="v4_6" name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
<Project name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2577,7 +2578,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
<Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2606,7 +2607,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
<Project name="OpenSim.Tools.Configger" path="OpenSim/Tools/Configger" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2633,7 +2634,7 @@
</Project>
<!-- Test Clients -->
<Project frameworkVersion="v4_6" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
<Project name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2663,7 +2664,7 @@
</Project>
<!-- Test assemblies -->
<Project frameworkVersion="v4_6" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
<Project name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2714,7 +2715,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
<Project name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
@@ -2737,7 +2738,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
<Project name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2780,7 +2781,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="Robust.Tests" path="OpenSim/Tests/Robust" type="Library">
<Project name="Robust.Tests" path="OpenSim/Tests/Robust" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2818,7 +2819,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
<Project name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2873,7 +2874,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
<Project name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2916,7 +2917,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
<Project name="OpenSim.Framework.Tests" path="OpenSim/Framework/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -2947,7 +2948,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
<Project name="OpenSim.Framework.Serialization.Tests" path="OpenSim/Framework/Serialization/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -2979,7 +2980,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
<Project name="OpenSim.Framework.Servers.Tests" path="OpenSim/Framework/Servers/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@@ -3009,7 +3010,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
<Project name="OpenSim.Region.CoreModules.Tests" path="OpenSim/Region/CoreModules" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3126,7 +3127,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
<Project name="OpenSim.Region.Framework.Tests" path="OpenSim/Region/Framework" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3186,7 +3187,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
<Project name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -3226,7 +3227,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
<Project name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../../bin/</OutputPath>
@@ -3260,7 +3261,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
<Project name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3326,7 +3327,7 @@
TODO: this is kind of lame, we basically build a duplicate
assembly but with tests added in, just because we can't resolve cross-bin-dir-refs.
-->
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.Ode.Tests" path="OpenSim/Region/PhysicsModules/Ode/Tests" type="Library">
<Project name="OpenSim.Region.PhysicsModule.Ode.Tests" path="OpenSim/Region/PhysicsModules/Ode/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -3359,7 +3360,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Region.PhysicsModule.BulletS.Tests" path="OpenSim/Region/PhysicsModules/BulletS/Tests" type="Library">
<Project name="OpenSim.Region.PhysicsModule.BulletS.Tests" path="OpenSim/Region/PhysicsModules/BulletS/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../../bin/</OutputPath>
@@ -3393,7 +3394,7 @@
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
<Project name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3441,7 +3442,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
<Project name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3481,7 +3482,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
<Project name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@@ -3520,7 +3521,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_6" name="OpenSim.Tests.Permissions" path="OpenSim/Tests/Permissions" type="Library">
<Project name="OpenSim.Tests.Permissions" path="OpenSim/Tests/Permissions" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
@echo OFF
bin\Prebuild.exe /target vs2019 /file prebuild48.xml
bin\Prebuild.exe /target vs2019 /targetframework v4_8
setlocal ENABLEEXTENSIONS
set VALUE_NAME=MSBuildToolsPath

View File

@@ -19,7 +19,7 @@ case "$1" in
*)
mono bin/Prebuild.exe /target vs2019 /file prebuild48.xml
mono bin/Prebuild.exe /target vs2019 /targetframework v4_8
;;