fixes to build mono

clean up some extraneous TODO's
This commit is contained in:
markpollack
2009-06-20 01:36:54 +00:00
parent 8d5c858dde
commit d4a1ea8194
12 changed files with 22 additions and 15 deletions

View File

@@ -26,7 +26,6 @@ using System.Data.SqlClient;
using System.Drawing.Printing;
using System.IO;
using System.Net;
//using System.Net.Mail;
using System.Runtime.InteropServices;
using System.Security;
using System.Security.Permissions;
@@ -260,6 +259,7 @@ namespace Spring
return null;
}
#if !MONO
/// <summary>
/// Loads the policy configuration from app.config configuration section
/// </summary>
@@ -311,7 +311,7 @@ namespace Spring
PolicyLevel domainPolicy = LoadDomainPolicyFromUri(new Uri(policyFileExpanded), appDirectory, trustSection.OriginUrl);
return domainPolicy;
}
#endif
/// <summary>
/// Loads a policy from a file (<see cref="SecurityManager.LoadPolicyLevelFromFile"/>),
/// replacing placeholders
@@ -398,7 +398,7 @@ namespace Spring
}
return SecurityManager.LoadPolicyLevelFromString(strXmlPolicy, PolicyLevelType.AppDomain);
}
#if !MONO
private static string GetPolicyFilenameExpanded(TrustLevel trustLevel)
{
bool isRelative = true;
@@ -424,7 +424,7 @@ namespace Spring
}
return trustLevel.PolicyFile;
}
#endif
[DllImport("mscorwks.dll", CharSet = CharSet.Unicode)]
private static extern int GetCachePath(int dwCacheFlags, StringBuilder pwzCachePath, ref int pcchPath);

View File

@@ -648,6 +648,7 @@
<Compile Include="Reflection\Dynamic\DynamicPropertyTests.cs" />
<Compile Include="Reflection\Dynamic\SafeFieldTests.cs" />
<Compile Include="Reflection\Dynamic\SafePropertyTests.cs" />
<Compile Include="SecurityTemplate.cs" />
<Compile Include="StandardsComplianceTest.cs">
<SubType>Code</SubType>
</Compile>
@@ -655,6 +656,7 @@
<Compile Include="StreamHelperDecorator.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="TestResourceLoader.cs" />
<Compile Include="Threading\AsyncTestMethod.cs" />
<Compile Include="Threading\AsyncTestTask.cs" />
<Compile Include="Threading\CallContextStorageTests.cs" />
@@ -671,6 +673,7 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="Util\CollectionUtilsTests.cs" />
<Compile Include="Util\ConfigXmlDocumentTests.cs" />
<Compile Include="Util\ObjectUtilsTests.cs" />
<Compile Include="Util\PatternMatchUtilsTests.cs" />
<Compile Include="Util\DefensiveEventRaiserTests.cs">
@@ -710,9 +713,6 @@
<Compile Include="Validation\ExclusiveValidatorGroupTests.cs" />
<Compile Include="Validation\HelperClasses.cs" />
<Compile Include="Validation\ValidationExceptionTests.cs" />
<Compile Include="Validation\ValidationConfigParserTests.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Validation\ValidationErrorsTests.cs">
<SubType>Code</SubType>
</Compile>
@@ -827,6 +827,7 @@
<EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
<EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
<Content Include="Spring.Core.Tests.dll.config" />
<Content Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
<EmbeddedResource Include="Context\contextlifecycle.xml" />
<EmbeddedResource Include="Context\Support\objects.xml" />
<EmbeddedResource Include="Objects\Factory\TestResource.txt" />

View File

@@ -19,6 +19,7 @@
doc="${current.bin.dir}/${project::get-name()}.xml">
<nowarn>
<warning number="${nowarn.numbers.test},0219,0169,0612" /> <!-- add 0414 for mono 2.0 -->
<warning number="${nowarn.numbers},1574" if="${nant.settings.currentframework=='mono-2.0'}"/>
</nowarn>
<sources failonempty="true">
<include name="**/*.cs" />
@@ -48,6 +49,7 @@
<include name="System.Data.dll" />
<include name="System.Configuration.dll" />
<include name="System.Web.Services.dll" />
<include name="System.Web.dll" />
<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
<include name="System.Windows.Forms.dll" />
<include name="Rhino.Mocks.dll" />