Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update Spring.Messaging.Ems.2010.csproj to reference 2010 versions of Core, Aop, and Data

Browse Source
This commit is contained in:
sbohlen
2010-08-17 13:43:22 +00:00
parent 85a6c2266b
commit 3466cdf3b2
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs
View File

@@ -1,19 +1,19 @@
#region License
/*
* Copyright 2002-2005 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
/*
* Copyright 2002-2005 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
@@ -65,8 +65,8 @@ namespace Spring.Objects.Factory.Xml
{ }
}
#if !NET_2_0
private class ValidationEventHandlerWrapper
#if !NET_2_0
private class ValidationEventHandlerWrapper
{
private XmlReader _sender;
private XmlObjectDefinitionReader _owner;
@@ -85,7 +85,7 @@ namespace Spring.Objects.Factory.Xml
{
_owner.HandleValidation(_sender,args);
}
}
}
#endif
#endregion
@@ -360,9 +360,9 @@ namespace Spring.Objects.Factory.Xml
#if !NET_2_0
// only because 1.0/1.1 don't pass the sender into the handler callback...
ValidationEventHandlerWrapper validationEventHandlerWrapper = new ValidationEventHandlerWrapper(this);
reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(),
new ValidationEventHandler(validationEventHandlerWrapper.HandleValidation));
validationEventHandlerWrapper.Reader = reader;
reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(),
new ValidationEventHandler(validationEventHandlerWrapper.HandleValidation));
validationEventHandlerWrapper.Reader = reader;
#else
reader = XmlUtils.CreateValidatingReader(stream, Resolver, NamespaceParserRegistry.GetSchemas(), HandleValidation);
#endif
@@ -403,12 +403,12 @@ namespace Spring.Objects.Factory.Xml
throw new RetryParseException();
}
}
#if !NET_2_0
// ignore validation errors for well-known 'xml' namespace. This seems to be a bug in net 1.0 + 1.1
if (ex.Message.IndexOf("http://www.w3.org/XML/1998/namespace:") > -1)
#if !NET_2_0
// ignore validation errors for well-known 'xml' namespace. This seems to be a bug in net 1.0 + 1.1
if (ex.Message.IndexOf("http://www.w3.org/XML/1998/namespace:") > -1)
{
return;
}
}
#endif
throw ex;
}

12
src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.2010.csproj
View File

@@ -159,17 +159,17 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spring.Aop\Spring.Aop.2008.csproj">
<ProjectReference Include="..\Spring.Aop\Spring.Aop.2010.csproj">
<Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
<Name>Spring.Aop.2008</Name>
<Name>Spring.Aop.2010</Name>
</ProjectReference>
<ProjectReference Include="..\Spring.Core\Spring.Core.2008.csproj">
<ProjectReference Include="..\Spring.Core\Spring.Core.2010.csproj">
<Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
<Name>Spring.Core.2008</Name>
<Name>Spring.Core.2010</Name>
</ProjectReference>
<ProjectReference Include="..\Spring.Data\Spring.Data.2008.csproj">
<ProjectReference Include="..\Spring.Data\Spring.Data.2010.csproj">
<Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
<Name>Spring.Data.2008</Name>
<Name>Spring.Data.2010</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

2
test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj
View File

@@ -97,6 +97,7 @@
</Compile>
<Compile Include="Caching\AspNetCacheTests.cs" />
<Compile Include="Context\Support\HttpApplicationConfigurerTests.cs" />
<Compile Include="Context\Support\WebApplicationContextArgsTests.cs" />
<Compile Include="Context\Support\WebApplicationContextTests.cs" />
<Compile Include="Core\IO\WebResourceTests.cs" />
<Compile Include="Data\Spring\Objects\Factory\Support\TestForm.aspx.cs">
@@ -161,6 +162,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Context\Support\HttpApplicationConfigurerTests.xml" />
<EmbeddedResource Include="Context\Support\HttpApplicationConfigurerMergablePropertiesTests.xml" />
<Content Include="Data\Spring\Context\Support\WebApplicationContextTests\Dummy.aspx" />
<Content Include="Data\Spring\Objects\Factory\Support\TestForm.aspx" />
<Content Include="Data\Spring\Web\Support\LocalResourceManagerTests\WithoutResources.aspx" />