diff options
author | Melanie | 2012-11-17 02:03:24 +0000 |
---|---|---|
committer | Melanie | 2012-11-17 02:03:24 +0000 |
commit | e4659a83f15acc85a7207a1ff60460cae0b86b78 (patch) | |
tree | d0fc79b1cbdb15ce9296f05aacf696c9ad43bc41 /prebuild.xml | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Remove old InventoryService, which has for a long time been replaced by XInve... (diff) | |
download | opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.zip opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.gz opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.bz2 opensim-SC_OLD-e4659a83f15acc85a7207a1ff60460cae0b86b78.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 8bf8cf5..cff14ce 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1245,7 +1245,9 @@ | |||
1245 | <Reference name="log4net" path="../../../bin/"/> | 1245 | <Reference name="log4net" path="../../../bin/"/> |
1246 | 1246 | ||
1247 | <Files> | 1247 | <Files> |
1248 | <Match pattern="*.cs" recurse="true"/> | 1248 | <Match pattern="*.cs" recurse="true"> |
1249 | <Exclude name="Tests" pattern="Tests"/> | ||
1250 | </Match> | ||
1249 | </Files> | 1251 | </Files> |
1250 | </Project> | 1252 | </Project> |
1251 | 1253 | ||
@@ -2843,6 +2845,48 @@ | |||
2843 | </Files> | 2845 | </Files> |
2844 | </Project> | 2846 | </Project> |
2845 | 2847 | ||
2848 | <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService.Tests" path="OpenSim/Services/InventoryService/Tests" type="Library"> | ||
2849 | <Configuration name="Debug"> | ||
2850 | <Options> | ||
2851 | <OutputPath>../../../../bin/</OutputPath> | ||
2852 | </Options> | ||
2853 | </Configuration> | ||
2854 | <Configuration name="Release"> | ||
2855 | <Options> | ||
2856 | <OutputPath>../../../../bin/</OutputPath> | ||
2857 | </Options> | ||
2858 | </Configuration> | ||
2859 | |||
2860 | <ReferencePath>../../../../bin/</ReferencePath> | ||
2861 | <Reference name="System"/> | ||
2862 | <Reference name="System.Core"/> | ||
2863 | <Reference name="System.Drawing"/> | ||
2864 | <Reference name="System.Xml"/> | ||
2865 | <Reference name="System.Web"/> | ||
2866 | <Reference name="nunit.framework" path="../../../../bin/"/> | ||
2867 | <Reference name="OpenMetaverse" path="../../../../bin/"/> | ||
2868 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
2869 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> | ||
2870 | <Reference name="OpenSim.Capabilities"/> | ||
2871 | <Reference name="OpenSim.Capabilities.Handlers"/> | ||
2872 | <Reference name="OpenSim.Framework"/> | ||
2873 | <Reference name="OpenSim.Framework.Console"/> | ||
2874 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
2875 | <Reference name="OpenSim.Region.Framework"/> | ||
2876 | <Reference name="OpenSim.Server.Base"/> | ||
2877 | <Reference name="OpenSim.Server.Handlers"/> | ||
2878 | <Reference name="OpenSim.Services.Base"/> | ||
2879 | <Reference name="OpenSim.Services.Interfaces"/> | ||
2880 | <Reference name="OpenSim.Tests.Common"/> | ||
2881 | <Reference name="Nini" path="../../../../bin/"/> | ||
2882 | <Reference name="log4net" path="../../../../bin/"/> | ||
2883 | |||
2884 | <Files> | ||
2885 | <Match pattern="*.cs" recurse="true"> | ||
2886 | </Match> | ||
2887 | </Files> | ||
2888 | </Project> | ||
2889 | |||
2846 | 2890 | ||
2847 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> | 2891 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers.Tests" path="OpenSim/Capabilities/Handlers" type="Library"> |
2848 | <Configuration name="Debug"> | 2892 | <Configuration name="Debug"> |