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

change to support compilation under .NET Core

Browse Source
This commit is contained in:
Jeffrey Schultz
2017-11-05 04:35:48 +02:00
committed by Marko Lahma
parent 3bdc793c72
commit fda8281874
12 changed files with 109 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs
View File

@@ -114,7 +114,7 @@ namespace Spring.Aop.Framework.DynamicProxy
}
Type proxyType;
proxyType = typeBuilder.CreateType();
proxyType = typeBuilder.CreateTypeInfo();
// set target method references
foreach (DictionaryEntry entry in targetMethods)

2
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs
View File

@@ -149,7 +149,7 @@ namespace Spring.Aop.Framework.DynamicProxy
ImplementIAopProxy(typeBuilder);
Type proxyType;
proxyType = typeBuilder.CreateType();
proxyType = typeBuilder.CreateTypeInfo();
// set target method references
foreach (DictionaryEntry entry in targetMethods)

2
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs
View File

@@ -168,7 +168,7 @@ namespace Spring.Aop.Framework.DynamicProxy
ImplementIAopProxy(typeBuilder);
Type proxyType;
proxyType = typeBuilder.CreateType();
proxyType = typeBuilder.CreateTypeInfo();
// set target method references
foreach (DictionaryEntry entry in targetMethods)

2
src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs
View File

@@ -44,7 +44,7 @@ namespace Spring.Aop
/// examples would include the ubiquitous logging of any such exceptions,
/// monitoring the number and type of exceptions and sending emails to
/// a support desk once certain criteria have been met, wrapping generic
/// exceptions such as <see cref="System.Data.SqlClient.SqlException"/> in
/// exceptions such as System.Data.SqlClient.SqlException in
/// exceptions that are more meaningful to your business logic, etc.
/// </p>
/// </remarks>

153
src/Spring/Spring.Core/ContextClassDiagram.cd
View File

@@ -1,153 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClassDiagram MajorVersion="1" MinorVersion="1">
<Class Name="Spring.Context.Support.AbstractApplicationContext" Collapsed="true">
<Position X="2.75" Y="8.75" Width="2" />
<TypeIdentifier>
<HashCode>SHQRYAEIiGBAtMBASYTEWAQkWBAiChEMaAACCAFBXMg=</HashCode>
<FileName>Context\Support\AbstractApplicationContext.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Class Name="Spring.Context.Support.AbstractXmlApplicationContext" Collapsed="true">
<Position X="1" Y="10.25" Width="2.25" />
<TypeIdentifier>
<HashCode>AAQACAAAAABAAACBAAQAAQAAABAAAAAAABAAAAACAEA=</HashCode>
<FileName>Context\Support\AbstractXmlApplicationContext.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Spring.Context.Support.GenericApplicationContext" Collapsed="true">
<Position X="4" Y="10.25" Width="2.25" />
<TypeIdentifier>
<HashCode>AAQAAAAAAAAAAAAAAAQAAAAAABAAIAAAAAAAAAAEAAA=</HashCode>
<FileName>Context\Support\GenericApplicationContext.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Spring.Context.Support.XmlApplicationContext" Collapsed="true">
<Position X="1.25" Y="11.75" Width="2" />
<TypeIdentifier>
<HashCode>AAAACAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAIAEAAA=</HashCode>
<FileName>Context\Support\XmlApplicationContext.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Spring.Context.Support.StaticApplicationContext" Collapsed="true">
<Position X="4.25" Y="11.75" Width="2" />
<TypeIdentifier>
<HashCode>AAEAAAAAAAAAAAAIAAQAAAAAAgAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Context\Support\StaticApplicationContext.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="Spring.Core.IO.ConfigurableResourceLoader" Collapsed="true">
<Position X="2.5" Y="7.5" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAggAAAQAAAAAABAAAAAAAAAAASAAAAAA=</HashCode>
<FileName>Core\IO\ConfigurableResourceLoader.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
<Interface Name="Spring.Context.IConfigurableApplicationContext" Collapsed="true">
<Position X="9.5" Y="5.5" Width="2.5" />
<TypeIdentifier>
<HashCode>AAQAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEA=</HashCode>
<FileName>Context\IConfigurableApplicationContext.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Context.IApplicationContext" Collapsed="true">
<Position X="10" Y="3.5" Width="1.75" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAEAAAAACAAAQAAAAAAAAAAAAAAAAACAA=</HashCode>
<FileName>Context\IApplicationContext.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Context.ILifecycle" Collapsed="true">
<Position X="13" Y="4.25" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAACAAAAAAAAAAQAAAAAAAAAAAIAAAAAAAAAA=</HashCode>
<FileName>Context\ILifecycle.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.IObjectFactory" Collapsed="true">
<Position X="6.5" Y="0.5" Width="1.5" />
<TypeIdentifier>
<HashCode>ABAAAAAAAAAAIIAACIAACAAAAAAAAgEMAAAAAAAAAIA=</HashCode>
<FileName>Objects\Factory\IObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.Config.IAutowireCapableObjectFactory" Collapsed="true">
<Position X="3.25" Y="2" Width="2.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAACAAAAAAAAIAAQAAAAgEAAAAAAAAAA=</HashCode>
<FileName>Objects\Factory\Config\IAutowireCapableObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.IHierarchicalObjectFactory" Collapsed="true">
<Position X="6.5" Y="2" Width="2" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAA=</HashCode>
<FileName>Objects\Factory\IHierarchicalObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.IListableObjectFactory" Collapsed="true">
<Position X="9.25" Y="2" Width="1.75" />
<TypeIdentifier>
<HashCode>CAAAAAAAAAAAAAAAQABAEAAAAAAAAAAACAAAAAAAAAA=</HashCode>
<FileName>Objects\Factory\IListableObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.Config.IConfigurableListableObjectFactory" Collapsed="true">
<Position X="5.75" Y="3.5" Width="2.75" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAIAAAIAEAAAgAAAAAAAAAAAACABAAAA=</HashCode>
<FileName>Objects\Factory\Config\IConfigurableListableObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.Config.IConfigurableObjectFactory" Collapsed="true">
<Position X="6.5" Y="5.5" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAABCAAAAAAAAACAAAAQAAEAAAAAAAAAQAAEAA=</HashCode>
<FileName>Objects\Factory\Config\IConfigurableObjectFactory.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.Config.ISingletonObjectRegistry" Collapsed="true">
<Position X="2.5" Y="4" Width="2" />
<TypeIdentifier>
<HashCode>AAAAAAAAEAAAABAIAAAAAAAAAAAAAAAAAAAAAgAAAIA=</HashCode>
<FileName>Objects\Factory\Config\ISingletonObjectRegistry.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Context.IMessageSource" Collapsed="true">
<Position X="12.25" Y="2" Width="1.5" />
<TypeIdentifier>
<HashCode>ACAAAAAAAAAAAAAAAAAAAAAACAAAABAAAAAAAAAAAAA=</HashCode>
<FileName>Context\IMessageSource.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Context.IApplicationEventPublisher" Collapsed="true">
<Position X="14.5" Y="2" Width="2.25" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
<FileName>Context\IApplicationEventPublisher.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Core.IO.IResourceLoader" Collapsed="true">
<Position X="17.5" Y="2" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAA=</HashCode>
<FileName>Core\IO\IResourceLoader.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Events.IEventRegistry" Collapsed="true">
<Position X="19.75" Y="2" Width="1.5" />
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAQAAAAAAAAIA=</HashCode>
<FileName>Objects\Events\IEventRegistry.cs</FileName>
</TypeIdentifier>
</Interface>
<Interface Name="Spring.Objects.Factory.Support.IObjectDefinitionRegistry">
<Position X="0.5" Y="0.75" Width="2.25" />
<TypeIdentifier>
<HashCode>CBAAAAAAAAAAAAAAQAAEEAAgABAAAAAAAAAAAAAAEAA=</HashCode>
<FileName>Objects\Factory\Support\IObjectDefinitionRegistry.cs</FileName>
</TypeIdentifier>
</Interface>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>

112
src/Spring/Spring.Core/Expressions/OpLike.cs
View File

@@ -20,10 +20,8 @@
using System;
using System.Runtime.Serialization;
#if !MONO_2_0
using Microsoft.VisualBasic;
using Microsoft.VisualBasic.CompilerServices;
#endif
using System.Text;
using System.Text.RegularExpressions;
namespace Spring.Expressions
{
@@ -37,7 +35,7 @@ namespace Spring.Expressions
/// <summary>
/// Create a new instance
/// </summary>
public OpLike():base()
public OpLike()
{
}
@@ -48,7 +46,7 @@ namespace Spring.Expressions
: base(info, context)
{
}
/// <summary>
/// Returns a value for the logical LIKE operator node.
/// </summary>
@@ -59,14 +57,100 @@ namespace Spring.Expressions
/// </returns>
protected override object Get(object context, EvaluationContext evalContext)
{
#if !MONO_2_0
string text = GetLeftValue( context, evalContext ) as string;
string pattern = GetRightValue( context, evalContext ) as string;
string text = GetLeftValue(context, evalContext) as string;
string pattern = GetRightValue(context, evalContext) as string;
return LikeOperator.LikeString(text, pattern, CompareMethod.Text);
#else
throw new NotSupportedException("'like' operator is only supported in .NET 2.0 or higher.");
#endif
return LikeString(text, pattern);
}
private static bool LikeString(string Source, string Pattern)
{
if (string.IsNullOrEmpty(Source) && string.IsNullOrEmpty(Pattern))
{
return true;
// LAMESPEC : MSDN states "if either string or pattern is an empty string, the result is False."
// but "" Like "[]" returns True
}
if ((string.IsNullOrEmpty(Source) || string.IsNullOrEmpty(Pattern)) && string.Compare(Pattern, "[]") != 0)
{
return false;
}
RegexOptions options = RegexOptions.Singleline | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase;
string regexString = ConvertLikeExpression(Pattern);
Regex regexpr = new Regex(regexString, options);
//Console.WriteLine("{0} --> {1}", Pattern, regexString)
return regexpr.IsMatch(Source);
}
private static string ConvertLikeExpression(string expression)
{
StringBuilder sb = new StringBuilder();
sb.Append("^");
for (int pos = 0; pos <= expression.Length - 1; pos++)
{
switch (expression[pos])
{
case '?':
sb.Append('.');
break;
case '*':
sb.Append('.').Append('*');
break;
case '#':
sb.Append("\\d{1}");
break;
case '[':
StringBuilder gsb = ConvertGroupSubexpression(expression, ref pos);
// skip groups of form [], i.e. empty strings
if (gsb.Length > 2)
{
sb.Append(gsb);
}
break;
default:
sb.Append(Regex.Escape(expression[pos].ToString()));
break;
}
}
sb.Append("$");
return sb.ToString();
}
private static StringBuilder ConvertGroupSubexpression(string carr, ref int pos)
{
StringBuilder sb = new StringBuilder();
bool negate = false;
while (carr[pos] != ']')
{
if (negate)
{
sb.Append('^');
negate = false;
}
if (carr[pos] == '!')
{
sb.Remove(1, sb.Length - 1);
negate = true;
}
else
{
sb.Append(carr[pos]);
}
pos = pos + 1;
}
sb.Append(']');
return sb;
}
}
}
}

2
src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs
View File

@@ -293,7 +293,7 @@ namespace Spring.Objects.Factory.Support
DefineConstructors(typeBuilder);
DefineProperties(typeBuilder);
DefineMethods(typeBuilder);
return typeBuilder.CreateType();
return typeBuilder.CreateTypeInfo();
}
private Type BaseType

88
src/Spring/Spring.Core/Objects/Factory/Xml/spring-objects-2.0.xsx
View File

@@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
<XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="0" zoom="100">
<identifiedType_XmlComplexType left="1317" top="167061" width="5292" height="3757" selected="0" zOrder="8" index="0" expanded="1" />
<nonNullString_XmlSimpleType left="1317" top="1254" width="5292" height="3625" selected="0" zOrder="5" index="1" expanded="1" />
<description_XmlSimpleType left="1317" top="5387" width="5292" height="3625" selected="0" zOrder="6" index="2" expanded="1" />
<valueObject_XmlComplexType left="1317" top="9520" width="5292" height="3625" selected="0" zOrder="7" index="3" expanded="1" />
<expression_XmlComplexType left="1317" top="13653" width="5292" height="3625" selected="0" zOrder="9" index="4" expanded="1">
<property_XmlElement left="7243" top="13653" width="5292" height="3625" selected="0" zOrder="10" index="0" expanded="0" />
</expression_XmlComplexType>
<objectReference_XmlComplexType left="1317" top="17786" width="5292" height="3757" selected="0" zOrder="12" index="5" expanded="1" />
<objectOrClassReference_XmlComplexType left="1317" top="22051" width="5292" height="3757" selected="0" zOrder="13" index="6" expanded="1" />
<objectList_XmlGroup left="1317" top="43376" width="5292" height="3757" selected="0" zOrder="14" index="7" expanded="1">
<_x0028_group1_x0029__XmlChoice left="7243" top="43376" width="5292" height="3757" selected="0" zOrder="15" index="1" expanded="1">
<object_XmlElement left="13169" top="26316" width="5292" height="3757" selected="0" zOrder="17" index="0" expanded="0" />
<ref_XmlElement left="13169" top="30581" width="5292" height="3757" selected="0" zOrder="19" index="1" expanded="0" />
<idref_XmlElement left="13169" top="34846" width="5292" height="3757" selected="0" zOrder="21" index="2" expanded="0" />
<list_XmlElement left="13169" top="39111" width="5292" height="3757" selected="0" zOrder="23" index="3" expanded="1">
<_x0028_group1_x0029__XmlChoice left="19095" top="39111" width="5292" height="3757" selected="0" zOrder="25" index="1" expanded="0" />
</list_XmlElement>
<set_XmlElement left="13169" top="43376" width="5292" height="3757" selected="0" zOrder="27" index="4" expanded="1">
<_x0028_group1_x0029__XmlChoice left="19095" top="43376" width="5292" height="3757" selected="0" zOrder="29" index="1" expanded="0" />
</set_XmlElement>
<dictionary_XmlElement left="13169" top="47641" width="5292" height="3757" selected="0" zOrder="31" index="5" expanded="0" />
<name-values_XmlElement left="13169" top="51906" width="5292" height="3757" selected="0" zOrder="33" index="6" expanded="0" />
<value_XmlElement left="13169" top="56171" width="5292" height="3757" selected="0" zOrder="35" index="7" expanded="0" />
<expression_XmlElement left="13169" top="60436" width="5292" height="3757" selected="0" zOrder="37" index="8" expanded="0" />
</_x0028_group1_x0029__XmlChoice>
</objectList_XmlGroup>
<objectNameValues_XmlComplexType left="1317" top="64701" width="5292" height="3757" selected="0" zOrder="39" index="8" expanded="1">
<add_XmlElement left="7243" top="64701" width="5292" height="3757" selected="0" zOrder="40" index="0" expanded="1" />
</objectNameValues_XmlComplexType>
<importElement_XmlComplexType left="1317" top="68966" width="5292" height="3757" selected="0" zOrder="42" index="9" expanded="1" />
<aliasElement_XmlComplexType left="1317" top="73231" width="5292" height="3757" selected="0" zOrder="43" index="10" expanded="1" />
<objectMap_XmlComplexType left="1317" top="77496" width="5292" height="3757" selected="0" zOrder="44" index="11" expanded="1">
<entry_XmlElement left="7243" top="77496" width="5292" height="3757" selected="0" zOrder="45" index="0" expanded="0" />
</objectMap_XmlComplexType>
<mapEntryElement_XmlComplexType left="1317" top="83893" width="5292" height="3757" selected="0" zOrder="47" index="12" expanded="1">
<key_XmlElement left="7243" top="81761" width="5292" height="3757" selected="0" zOrder="48" index="0" expanded="0" />
<ref_x003D_objectList_XmlGroup left="7243" top="86026" width="5292" height="3757" selected="0" zOrder="50" index="1" expanded="0" />
</mapEntryElement_XmlComplexType>
<mapKeyElement_XmlComplexType left="1317" top="90291" width="5292" height="3757" selected="0" zOrder="52" index="13" expanded="1">
<_x0028_group1_x0029__XmlChoice left="7243" top="90291" width="5292" height="3757" selected="0" zOrder="53" index="1" expanded="0" />
</mapKeyElement_XmlComplexType>
<lookupMethod_XmlComplexType left="1317" top="94556" width="5292" height="3757" selected="0" zOrder="55" index="14" expanded="1" />
<constructorArgument_XmlComplexType left="1317" top="98821" width="5292" height="3757" selected="0" zOrder="56" index="15" expanded="1">
<_x0028_group1_x0029__XmlChoice left="7243" top="98821" width="5292" height="3757" selected="0" zOrder="57" index="1" expanded="0" />
</constructorArgument_XmlComplexType>
<property_XmlComplexType left="1317" top="103086" width="5292" height="3757" selected="0" zOrder="59" index="16" expanded="1">
<_x0028_group1_x0029__XmlChoice left="7243" top="103086" width="5292" height="3757" selected="0" zOrder="60" index="1" expanded="0" />
</property_XmlComplexType>
<vanillaObject_XmlComplexType left="1317" top="123716" width="5292" height="3757" selected="0" zOrder="62" index="17" expanded="1">
<constructor-arg_XmlElement left="7243" top="107351" width="5292" height="3757" selected="0" zOrder="63" index="1" expanded="0" />
<property_XmlElement left="7243" top="111616" width="5292" height="3757" selected="0" zOrder="65" index="2" expanded="0" />
<lookup-method_XmlElement left="7243" top="115881" width="5292" height="3757" selected="0" zOrder="67" index="3" expanded="0" />
<replaced-method_XmlElement left="7243" top="120146" width="5292" height="3757" selected="0" zOrder="69" index="4" expanded="1">
<arg-type_XmlElement left="13169" top="120146" width="5292" height="3757" selected="0" zOrder="71" index="0" expanded="1" />
</replaced-method_XmlElement>
<listener_XmlElement left="7243" top="124411" width="5292" height="3757" selected="0" zOrder="73" index="5" expanded="1">
<ref_XmlElement left="13169" top="124411" width="5292" height="3757" selected="0" zOrder="75" index="0" expanded="0" />
</listener_XmlElement>
<scope_XmlAttribute left="7243" top="130065" width="5292" height="979" selected="0" zOrder="77" index="12" expanded="1">
<_x0028_scope_x0029__XmlSimpleType left="13169" top="128676" width="5292" height="3757" selected="0" zOrder="79" index="0" expanded="1" />
</scope_XmlAttribute>
<lazy-init_XmlAttribute left="7243" top="134330" width="5292" height="979" selected="0" zOrder="81" index="13" expanded="1">
<_x0028_lazy-init_x0029__XmlSimpleType left="13169" top="132941" width="5292" height="3757" selected="0" zOrder="83" index="0" expanded="1" />
</lazy-init_XmlAttribute>
<autowire_XmlAttribute left="7243" top="138595" width="5292" height="979" selected="0" zOrder="85" index="14" expanded="1">
<_x0028_autowire_x0029__XmlSimpleType left="13169" top="137206" width="5292" height="3757" selected="0" zOrder="87" index="0" expanded="1" />
</autowire_XmlAttribute>
<dependency-check_XmlAttribute left="7243" top="142860" width="5292" height="979" selected="0" zOrder="89" index="15" expanded="1">
<_x0028_dependency-check_x0029__XmlSimpleType left="13169" top="141471" width="5292" height="3757" selected="0" zOrder="91" index="0" expanded="1" />
</dependency-check_XmlAttribute>
</vanillaObject_XmlComplexType>
<objects_XmlElement left="1317" top="155704" width="5292" height="3757" selected="0" zOrder="93" index="18" expanded="1">
<_x0028_group1_x0029__XmlChoice left="7243" top="150001" width="5292" height="3757" selected="0" zOrder="94" index="1" expanded="1">
<import_XmlElement left="13169" top="145736" width="5292" height="3757" selected="0" zOrder="96" index="0" expanded="0" />
<alias_XmlElement left="13169" top="150001" width="5292" height="3757" selected="0" zOrder="98" index="1" expanded="0" />
<object_XmlElement left="13169" top="154266" width="5292" height="3757" selected="0" zOrder="100" index="2" expanded="0" />
</_x0028_group1_x0029__XmlChoice>
<default-dependency-check_XmlAttribute left="7243" top="159920" width="5292" height="979" selected="0" zOrder="102" index="3" expanded="1">
<_x0028_default-dependency-check_x0029__XmlSimpleType left="13169" top="158531" width="5292" height="3757" selected="0" zOrder="104" index="0" expanded="1" />
</default-dependency-check_XmlAttribute>
<default-autowire_XmlAttribute left="7243" top="164185" width="5292" height="979" selected="0" zOrder="106" index="4" expanded="1">
<_x0028_default-autowire_x0029__XmlSimpleType left="13169" top="162796" width="5292" height="3757" selected="0" zOrder="108" index="0" expanded="1" />
</default-autowire_XmlAttribute>
</objects_XmlElement>
</XSDDesignerLayout>

2
src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs
View File

@@ -127,7 +127,7 @@ namespace Spring.Proxy
ImplementCustom(typeBuilder);
return typeBuilder.CreateType();
return typeBuilder.CreateTypeInfo();
}
/// <summary>

2
src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs
View File

@@ -122,7 +122,7 @@ namespace Spring.Proxy
new BaseProxyMethodBuilder(typeBuilder, this, false),
BaseType, declaredMembersOnly);
return typeBuilder.CreateType();
return typeBuilder.CreateTypeInfo();
}
#endregion

3
test/Spring/Spring.Core.Tests/Context/Support/testobject.xsx
View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
<XSDDesignerLayout Style="LeftRight" />

5
test/Spring/Spring.Core.Tests/Objects/Factory/Xml/ReadOnlyXmlTestResource.cs
View File

@@ -56,7 +56,10 @@ namespace Spring.Objects.Factory.Xml
ConfigurableResourceLoader loader = new ConfigurableResourceLoader();
underlyingResource = loader.GetResource(fileName);
}
underlyingResource = new FileSystemResource(fileName);
else
{
underlyingResource = new FileSystemResource(fileName);
}
}
/// <summary>