Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
267 changes: 18 additions & 249 deletions Spring.build

Large diffs are not rendered by default.

Binary file removed lib/Mono/2.0/DotNetMock.Framework.dll
Binary file not shown.
Binary file removed lib/Mono/2.0/DotNetMock.dll
Binary file not shown.
Binary file removed lib/Mono/2.0/Rhino.Mocks.dll
Binary file not shown.
5,624 changes: 0 additions & 5,624 deletions lib/Mono/2.0/Rhino.Mocks.xml

This file was deleted.

9 changes: 7 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<NeutralLanguage>en-US</NeutralLanguage>
<WarningsAsErrors>True</WarningsAsErrors>

<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/spring-projects/spring-net</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<TreatWarningsAsErrors>True</TreatWarningsAsErrors>

Expand All @@ -46,8 +46,13 @@
<LangVersion>latest</LangVersion>

</PropertyGroup>

<ItemGroup Condition="'$(SourceLinkEnabled)' != 'false'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>Full</DebugType>
<DefineConstants>DEBUG;TRACE;DEBUG_DYNAMIC;$(DefineConstants)</DefineConstants>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

/*
* Copyright © 2002-2011 the original author or authors.
* Copyright © 2002-2011 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.
Expand Down
12 changes: 6 additions & 6 deletions src/Spring/Spring.Aop/Aop/Framework/AopContext.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

/*
* Copyright 2002-2011 the original author or authors.
* Copyright © 2002-2011 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.
Expand Down Expand Up @@ -41,7 +41,7 @@ namespace Spring.Aop.Framework
/// advice configuration.
/// </p>
/// <p>
/// To expose the current proxy, set the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/>
/// To expose the current proxy, set the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/>
/// property on the controlling proxy to <see langword="true"/>.
/// The default value for the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
/// is <see langword="false"/>, for performance reasons.
Expand Down Expand Up @@ -70,7 +70,7 @@ public sealed class AopContext
/// </summary>
private static Stack ProxyStack
{
get
get
{
if (tls_ProxyStack == null)
{
Expand All @@ -90,7 +90,7 @@ private static Stack ProxyStack
/// on the controlling proxy has been set to <see langword="true"/>.
/// </p>
/// <p>
/// The default value for the
/// The default value for the
/// <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
/// is <see langword="false"/>, for performance reasons.
/// </p>
Expand All @@ -99,7 +99,7 @@ public static bool IsActive
{
get
{
return (tls_ProxyStack != null && tls_ProxyStack.Count > 0);
return (tls_ProxyStack != null && tls_ProxyStack.Count > 0);
}
}

Expand All @@ -125,7 +125,7 @@ public static object CurrentProxy
}

/// <summary>
/// Sets the current proxy by pushing it to the proxy stack.
/// Sets the current proxy by pushing it to the proxy stack.
/// </summary>
/// <remarks>
/// <p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

/*
* Copyright 2002-2011 the original author or authors.
* Copyright © 2002-2011 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.
Expand Down Expand Up @@ -109,13 +109,13 @@ public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwar
/// Indicates whether to mark the create proxy as immutable.
/// </summary>
/// <remarks>
/// Setting this to true effectively disables modifying the generated
/// Setting this to true effectively disables modifying the generated
/// proxy's advisor configuration
/// </remarks>
private bool freezeProxy = false;

/// <summary>
/// Names of common interceptors.
/// Names of common interceptors.
/// We must use object name rather than object references
/// to handle prototype advisors/interceptors.
/// Default is the empty array: no common interceptors.
Expand All @@ -142,7 +142,7 @@ public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwar
#region Properties

/// <summary>
/// Sets the AdvisorAdapterRegistry to use.
/// Sets the AdvisorAdapterRegistry to use.
/// </summary>
/// <remarks>
/// Default is the global AdvisorAdapterRegistry.
Expand Down Expand Up @@ -170,19 +170,19 @@ public IList CustomTargetSourceCreators
set { customTargetSourceCreators = value; }
}

/// <summary>
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <summary>
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
/// </summary>
/// <remarks>
/// <para>
/// If this property isn't set, there will be zero common interceptors.
/// If this property isn't set, there will be zero common interceptors.
/// This is perfectly valid, if "specific" interceptors such as
/// matching Advisors are all we want.
/// </para>
/// </remarks>
/// <value>
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
/// </value>
/// <seealso cref="AopAlliance.Aop.IAdvice"/>
Expand All @@ -194,7 +194,7 @@ public string[] InterceptorNames

/// <summary>
/// Sets whether the common interceptors should be applied before
/// object-specific ones.
/// object-specific ones.
/// </summary>
/// <remarks>
/// Default is true; else, object-specific interceptors will get applied first.
Expand Down Expand Up @@ -683,7 +683,7 @@ public bool PostProcessAfterInstantiation(object objectInstance, string objectNa
/// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
/// <param name="pis">he relevant property infos for the target object (with ignored
/// dependency types - which the factory handles specifically - already filtered out)</param>
/// <param name="objectInstance">The object instance created, but whose properties have not yet
/// <param name="objectInstance">The object instance created, but whose properties have not yet
/// been set.</param>
/// <param name="objectName">Name of the object.</param>
/// <returns>The passed in PropertyValues</returns>
Expand Down
6 changes: 3 additions & 3 deletions src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

/*
* Copyright © 2002-2011 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

/*
* Copyright 2002-2011 the original author or authors.
* Copyright © 2002-2011 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.
Expand Down Expand Up @@ -236,7 +236,7 @@ protected AbstractApplicationContext(string name, bool caseSensitive,
/// processors being added to the underlying <see cref="IConfigurableObjectFactory"/>
/// </summary>
/// <remarks>
/// Each time <see cref="Refresh()"/> is called on this context, the context ensures, that
/// Each time <see cref="Refresh()"/> is called on this context, the context ensures, that
/// all default <see cref="IObjectPostProcessor"/>s are registered with the underlying <see cref="IConfigurableObjectFactory"/>.
/// </remarks>
/// <param name="defaultObjectPostProcessor">The <see cref="IObjectPostProcessor"/> instance.</param>
Expand Down Expand Up @@ -268,7 +268,7 @@ public virtual void Dispose()

#endregion

// Closed event is raised before destroying objectfactory to enable registered IApplicationEventListeners
// Closed event is raised before destroying objectfactory to enable registered IApplicationEventListeners
// to handle the event before they get disposed.
PublishEvent(this, new ContextClosedEventArgs());

Expand Down Expand Up @@ -1046,7 +1046,7 @@ public void Refresh()
}

/// <summary>
/// Registers well-known <see cref="IObjectPostProcessor"/>s and
/// Registers well-known <see cref="IObjectPostProcessor"/>s and
/// preregisters well-known dependencies using <see cref="IConfigurableListableObjectFactory.RegisterResolvableDependency"/>
/// </summary>
/// <param name="objectFactory">the raw object factory as returned from <see cref="RefreshObjectFactory"/></param>
Expand Down Expand Up @@ -1370,14 +1370,14 @@ public IList<string> GetObjectDefinitionNames()
{
return GetObjectDefinitionNames(false);
}

/// <summary>
/// Return the names of all objects defined in this factory, if <code>includeAncestors</code>is <code>true</code>
/// includes all parent factories.
/// </summary>
/// <param name="includeAncestors">to include parent factories into result</param>
/// <returns>
/// The names of all objects defined in this factory, if <code>includeAncestors</code> is <code>true</code> includes all
/// The names of all objects defined in this factory, if <code>includeAncestors</code> is <code>true</code> includes all
/// objects defined in parent factories, or an empty array if none are defined.
/// </returns>
public IList<string> GetObjectDefinitionNames(bool includeAncestors)
Expand All @@ -1401,7 +1401,7 @@ public IList<string> GetObjectDefinitionNames(bool includeAncestors)
/// </exception>
/// <exception cref="Spring.Objects.ObjectsException">
/// In the case of errors.
/// </exception>
/// </exception>
public virtual IObjectDefinition GetObjectDefinition(string name)
{
return SafeGetObjectFactory().GetObjectDefinition(name);
Expand All @@ -1425,7 +1425,7 @@ public virtual IObjectDefinition GetObjectDefinition(string name)
/// </exception>
/// <exception cref="Spring.Objects.ObjectsException">
/// In the case of errors.
/// </exception>
/// </exception>
public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
{
return SafeGetObjectFactory().GetObjectDefinition(name, includeAncestors);
Expand Down Expand Up @@ -2099,7 +2099,7 @@ public IObjectFactory ParentObjectFactory
/// of the given name from an ancestor object factory.
/// </summary>
/// <remarks>
///
///
/// </remarks>
/// <param name="name">The name of the object to query.</param>
/// <returns>
Expand All @@ -2115,8 +2115,8 @@ public bool ContainsLocalObject(string name)
#region IObjectDefinitionRegistry Members

/// <summary>
/// Determine whether the given object name is already in use within this context,
/// i.e. whether there is a local object. May be override by subclasses, the default
/// Determine whether the given object name is already in use within this context,
/// i.e. whether there is a local object. May be override by subclasses, the default
/// implementation simply returns <see cref="ContainsLocalObject"/>
/// </summary>
public virtual bool IsObjectNameInUse(string objectName)
Expand Down Expand Up @@ -2496,7 +2496,7 @@ public void Unsubscribe(object subscriber, Type targetSourceType)
/// </summary>
/// <remarks>
/// <p>
///
///
/// </p>
/// </remarks>
/// <param name="sender">
Expand Down
8 changes: 4 additions & 4 deletions src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#region License

/*
* Copyright 2002-2011 the original author or authors.
* Copyright © 2002-2011 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.
Expand Down Expand Up @@ -36,7 +36,7 @@ public class LambdaExpressionNode : BaseNode
/// caches argumentNames of this instance
/// </summary>
private string[] argumentNames;

/// <summary>
/// caches body expression of this lambda function
/// </summary>
Expand All @@ -56,7 +56,7 @@ protected LambdaExpressionNode(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}

/// <summary>
/// Gets argument names for this lambda expression.
/// </summary>
Expand Down Expand Up @@ -107,7 +107,7 @@ protected override object Get(object context, EvaluationContext evalContext, obj
arguments[argNames[i]] = argValues[i];
}

EvaluationContext ec = (EvaluationContext)evalContext;
EvaluationContext ec = evalContext;
using (ec.SwitchLocalVariables(arguments))
{
object result = Get(context, ec);
Expand Down
Loading