diff options
author | Jeff Ames | 2008-03-17 20:55:21 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-17 20:55:21 +0000 |
commit | 79209c429705beb57ad9b787718856ab2c9fd37c (patch) | |
tree | 6f459e172985bce8ffbfc09a5b9a4594dd881a62 /Prebuild/src/Core/Targets/MonoDevelopTarget.cs | |
parent | * More almost completely unproductive log message fiddling (diff) | |
download | opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.zip opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.gz opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.bz2 opensim-SC_OLD-79209c429705beb57ad9b787718856ab2c9fd37c.tar.xz |
Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.
Hopefully this should make merging upstream easier.
Building with NAnt should still work, but Visual Studio is untested.
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Targets/MonoDevelopTarget.cs | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs index 7c0a1e2..af3341f 100644 --- a/Prebuild/src/Core/Targets/MonoDevelopTarget.cs +++ b/Prebuild/src/Core/Targets/MonoDevelopTarget.cs | |||
@@ -26,9 +26,9 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
26 | #region CVS Information | 26 | #region CVS Information |
27 | /* | 27 | /* |
28 | * $Source$ | 28 | * $Source$ |
29 | * $Author: jendave $ | 29 | * $Author: cjcollier $ |
30 | * $Date: 2007-02-13 22:07:07 +0100 (ti, 13 feb 2007) $ | 30 | * $Date: 2007-04-11 07:10:35 +0900 (Wed, 11 Apr 2007) $ |
31 | * $Revision: 206 $ | 31 | * $Revision: 231 $ |
32 | */ | 32 | */ |
33 | #endregion | 33 | #endregion |
34 | 34 | ||
@@ -106,9 +106,24 @@ namespace Prebuild.Core.Targets | |||
106 | ret += " refto=\""; | 106 | ret += " refto=\""; |
107 | try | 107 | try |
108 | { | 108 | { |
109 | //Assembly assem = Assembly.Load(refr.Name); | 109 | /* |
110 | //ret += assem.FullName; | 110 | Day changed to 28 Mar 2007 |
111 | ret += refr.Name; | 111 | ... |
112 | 08:09 < cj> is there anything that replaces Assembly.LoadFromPartialName() ? | ||
113 | 08:09 < jonp> no | ||
114 | 08:10 < jonp> in their infinite wisdom [sic], microsoft decided that the | ||
115 | ability to load any assembly version by-name was an inherently | ||
116 | bad idea | ||
117 | 08:11 < cj> I'm thinking of a bunch of four-letter words right now... | ||
118 | 08:11 < cj> security through making it difficult for the developer!!! | ||
119 | 08:12 < jonp> just use the Obsolete API | ||
120 | 08:12 < jonp> it should still work | ||
121 | 08:12 < cj> alrighty. | ||
122 | 08:12 < jonp> you just get warnings when using it | ||
123 | */ | ||
124 | Assembly assem = Assembly.LoadWithPartialName(refr.Name); | ||
125 | ret += assem.FullName; | ||
126 | //ret += refr.Name; | ||
112 | } | 127 | } |
113 | catch (System.NullReferenceException e) | 128 | catch (System.NullReferenceException e) |
114 | { | 129 | { |