diff options
author | lbsa71 | 2009-02-19 18:01:33 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-19 18:01:33 +0000 |
commit | 06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38 (patch) | |
tree | 876de8f4db442a7822c73d97a20ef86ca8842e19 /Prebuild/src/Core/Nodes/FilesNode.cs | |
parent | * Fix http://opensimulator.org/mantis/view.php?id=3193 (diff) | |
download | opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.zip opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.gz opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.bz2 opensim-SC_OLD-06ece33bee0f046ea5f4b8590cfd9b13dd2e4a38.tar.xz |
* Okay, so finally got my head around this. Problem is that upstream Prebuild copied dlls promiscuously, and this led to the references being all mixed up (/bin dlls overwritten by different versions on every csc)
* Something that thus needs fixing is the fact that ProjectReferences has to be marked
<ProjectReference>
<Private>False</Private>
</ProjectReference>
but that is not configurable in the upstream Xml Schema. I've hardcoded it in our repo for now.
Diffstat (limited to 'Prebuild/src/Core/Nodes/FilesNode.cs')
-rw-r--r-- | Prebuild/src/Core/Nodes/FilesNode.cs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Prebuild/src/Core/Nodes/FilesNode.cs b/Prebuild/src/Core/Nodes/FilesNode.cs index 7c1dd19..dc306c2 100644 --- a/Prebuild/src/Core/Nodes/FilesNode.cs +++ b/Prebuild/src/Core/Nodes/FilesNode.cs | |||
@@ -23,15 +23,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
23 | */ | 23 | */ |
24 | #endregion | 24 | #endregion |
25 | 25 | ||
26 | #region CVS Information | ||
27 | /* | ||
28 | * $Source$ | ||
29 | * $Author: borrillis $ | ||
30 | * $Date: 2007-05-25 01:03:16 +0900 (Fri, 25 May 2007) $ | ||
31 | * $Revision: 243 $ | ||
32 | */ | ||
33 | #endregion | ||
34 | |||
35 | using System; | 26 | using System; |
36 | using System.Collections; | 27 | using System.Collections; |
37 | using System.Collections.Specialized; | 28 | using System.Collections.Specialized; |
@@ -39,6 +30,7 @@ using System.Xml; | |||
39 | 30 | ||
40 | using Prebuild.Core.Attributes; | 31 | using Prebuild.Core.Attributes; |
41 | using Prebuild.Core.Interfaces; | 32 | using Prebuild.Core.Interfaces; |
33 | using System.IO; | ||
42 | 34 | ||
43 | namespace Prebuild.Core.Nodes | 35 | namespace Prebuild.Core.Nodes |
44 | { | 36 | { |
@@ -224,8 +216,8 @@ namespace Prebuild.Core.Nodes | |||
224 | if (!m_Files.Contains(file)) | 216 | if (!m_Files.Contains(file)) |
225 | { | 217 | { |
226 | m_Files.Add(file); | 218 | m_Files.Add(file); |
227 | m_BuildActions[ file ] = matchNode.BuildAction; | 219 | m_BuildActions[ file ] = matchNode.BuildAction == null ? GetBuildActionByFileName(file) : matchNode.BuildAction; |
228 | m_SubTypes[ file ] = matchNode.SubType; | 220 | m_SubTypes[file] = matchNode.SubType == null ? GetSubTypeByFileName(file) : matchNode.SubType.Value; |
229 | m_ResourceNames[ file ] = matchNode.ResourceName; | 221 | m_ResourceNames[ file ] = matchNode.ResourceName; |
230 | this.m_PreservePaths[ file ] = matchNode.PreservePath; | 222 | this.m_PreservePaths[ file ] = matchNode.PreservePath; |
231 | this.m_Links[ file ] = matchNode.IsLink; | 223 | this.m_Links[ file ] = matchNode.IsLink; |