Skip to content

Commit

Permalink
Merge from remote repo
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown authored and serialseb committed Oct 25, 2010
1 parent 1c2a3a5 commit d986871
Show file tree
Hide file tree
Showing 49 changed files with 161 additions and 164 deletions.
4 changes: 2 additions & 2 deletions src/CommonInfo.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4927
// Runtime Version:2.0.50727.4200
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand Down
4 changes: 2 additions & 2 deletions src/core/OpenRasta.Net30/OpenRasta.Net30.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -81,4 +81,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/core/OpenRasta.Net35/OpenRasta.Net35.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -95,4 +95,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/core/OpenRasta.Testing/OpenRasta.Testing.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -67,4 +67,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -108,4 +108,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/core/OpenRasta.Tests.Integration/Regressions/148.1.cs
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
Expand Down
4 changes: 2 additions & 2 deletions src/core/OpenRasta.Tests.Unit/OpenRasta.Tests.Unit.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -213,4 +213,4 @@
<UserProperties Notes="&lt;Notes Project=&quot;562ec958-6078-4dbd-b536-6e9fe1228867&quot; xmlns=&quot;clr-namespace:StickyNotes.Model;assembly=StickyNotes&quot;&gt;&lt;Notes.StickyNotes&gt;&lt;Note FilePath=&quot;&quot; Content=&quot;&quot; Date=&quot;2008-09-22T22:04:18.7172242+01:00&quot; /&gt;&lt;/Notes.StickyNotes&gt;&lt;/Notes&gt;" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/core/OpenRasta/OpenRasta.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand Down Expand Up @@ -516,4 +516,4 @@
</ItemGroup>
<Import Project="..\..\..\build\defaults.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/core/OpenRasta/Pipeline/PipelineRunner.cs
Expand Up @@ -111,7 +111,7 @@ void RunCallGraph(ICommunicationContext context, PipelineStage stage)
goto case PipelineContinuation.RenderNow;
case PipelineContinuation.RenderNow:
RenderNow(context, stage);
return;
break;
case PipelineContinuation.Finished:
FinishPipeline(context);
return;
Expand Down Expand Up @@ -356,4 +356,4 @@ public IPipelineExecutionOrderAnd Before(Type contributorType)
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endregion
#endregion
11 changes: 4 additions & 7 deletions src/core/core.4.5.resharper
@@ -1,7 +1,6 @@
<Configuration>
<CodeStyleSettings>
<ExternalPath IsNull="False">
</ExternalPath>
<ExternalPath IsNull="False" />
<Sharing>SOLUTION</Sharing>
<AgentSmithCSharpStyleSettings version="1">
<CodeStyleSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
Expand Down Expand Up @@ -802,8 +801,7 @@ Markup</UserWords>
</KeepImports>
</UsingsSettings>
<Naming2>
<ExceptionName IsNull="False">
</ExceptionName>
<ExceptionName IsNull="False" />
<PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
<PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
<PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
Expand Down Expand Up @@ -1073,8 +1071,7 @@ Markup</UserWords>
</VB>
<GenerateMemberBody />
<Naming2>
<ExceptionName IsNull="False">
</ExceptionName>
<ExceptionName IsNull="False" />
<PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />
<PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
<PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
Expand All @@ -1096,4 +1093,4 @@ Markup</UserWords>
<Abbreviation Text="OK" />
</Naming2>
</CodeStyleSettings>
</Configuration>
</Configuration>
2 changes: 1 addition & 1 deletion src/core/core.sln
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRasta", "OpenRasta\OpenRasta.csproj", "{C3ED9CCE-A140-4D0F-AE00-FBBF4CD27647}"
Expand Down
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -85,4 +85,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand All @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("OpenRasta.DI.Unity.Tests.Unit")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Linq;
using InternalDependencyResolver_Specification;
using Microsoft.Practices.Unity;
Expand Down
2 changes: 1 addition & 1 deletion src/unity/OpenRasta.DI.Unity.sln
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRasta.DI.Unity", "OpenRasta.DI.Unity\OpenRasta.DI.Unity.csproj", "{F87AD4E8-6877-4010-9D90-FEB442D6FEFB}"
Expand Down
2 changes: 1 addition & 1 deletion src/unity/OpenRasta.DI.Unity/Extensions/CycleDetector.cs
@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity.ObjectBuilder;
using OpenRasta.DI.Unity.Extensions.Strategies;
Expand Down
4 changes: 2 additions & 2 deletions src/unity/OpenRasta.DI.Unity/Extensions/InjectionPolicies.cs
@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.Unity;
using OpenRasta.DI.Unity.Extensions.Policies;
Expand Down Expand Up @@ -38,4 +38,4 @@ void ApplyPolicies(Type type)
Context.Policies.Set<IPropertySelectorPolicy>(new PropertySelectorPolicy(), key);
}
}
}
}
Expand Up @@ -103,4 +103,4 @@ static int Rate(MethodBase constructor, TypeTracker typeTracker)
return score;
}
}
}
}
@@ -1,4 +1,4 @@
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.ObjectBuilder2;

namespace OpenRasta.DI.Unity.Extensions.Policies
{
Expand Down
Expand Up @@ -73,4 +73,4 @@ static IDependencyResolverPolicy GetResolver(PropertyInfo property)
return new NamedTypeDependencyResolverPolicy(property.PropertyType, null);
}
}
}
}
@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.Unity;

Expand Down
@@ -1,4 +1,4 @@
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.ObjectBuilder2;

namespace OpenRasta.DI.Unity.Extensions.Policies
{
Expand Down
Expand Up @@ -42,4 +42,4 @@ public override void PostBuildUp(IBuilderContext context)
throw new DependencyResolutionException("Circular dependency detected.");
}
}
}
}
@@ -1,4 +1,4 @@
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.ObjectBuilder2;
using OpenRasta.DI.Unity.Extensions.Policies;

namespace OpenRasta.DI.Unity.Extensions.Strategies
Expand Down
@@ -1,4 +1,4 @@
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity.ObjectBuilder;
using OpenRasta.DI.Unity.Extensions.Strategies;

Expand Down
4 changes: 2 additions & 2 deletions src/unity/OpenRasta.DI.Unity/Extensions/TypeTracker.cs
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using Microsoft.Practices.Unity;
using OpenRasta.DI.Unity.Extensions.Policies;
Expand Down Expand Up @@ -115,4 +115,4 @@ public IEnumerable<Type> GetAllConcreteTypes(Type serviceType)
return types;
}
}
}
}
4 changes: 2 additions & 2 deletions src/unity/OpenRasta.DI.Unity/OpenRasta.DI.Unity.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -84,4 +84,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/unity/OpenRasta.DI.Unity/PerRequestLifetimeManager.cs
@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Practices.Unity;
using OpenRasta.Pipeline;

Expand Down
4 changes: 2 additions & 2 deletions src/unity/OpenRasta.DI.Unity/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand All @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("OpenRasta.DI.Unity")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
2 changes: 1 addition & 1 deletion src/unity/OpenRasta.DI.Unity/UnityContainerExtensions.cs
@@ -1,4 +1,4 @@
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity;
using OpenRasta.DI.Unity.Extensions;

namespace OpenRasta.DI.Unity
Expand Down
@@ -1,4 +1,4 @@
<%@ Page Language="C#" Inherits="OpenRasta.Codecs.WebForms.ResourceView" MasterPageFile="" %>
<%@ Page Language="C#" Inherits="OpenRasta.Codecs.WebForms.ResourceView" MasterPageFile="" %>

<asp:Content ContentPlaceHolderID="body" ID="content" runat="server">

Expand Down
Expand Up @@ -18,4 +18,4 @@
</References>
<ProjectItem SubType="" TargetFileName="$fileinputname$.aspx" ReplaceParameters="true">item-contentview.aspx</ProjectItem>
</TemplateContent>
</VSTemplate>
</VSTemplate>
@@ -1,4 +1,4 @@
<%@ Master Language="C#" Inherits="OpenRasta.Codecs.WebForms.MasterPageView" %>
<%@ Master Language="C#" Inherits="OpenRasta.Codecs.WebForms.MasterPageView" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Expand Down
Expand Up @@ -18,4 +18,4 @@
</References>
<ProjectItem SubType="" TargetFileName="$fileinputname$.Master" ReplaceParameters="true">item-masterpage.Master</ProjectItem>
</TemplateContent>
</VSTemplate>
</VSTemplate>
2 changes: 1 addition & 1 deletion src/vside/templates/aspnet35-item-view/item-view.aspx
@@ -1,4 +1,4 @@
<%@ Page Language="C#" Inherits="OpenRasta.Codecs.WebForms.ResourceView" %>
<%@ Page Language="C#" Inherits="OpenRasta.Codecs.WebForms.ResourceView" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Expand Down
Expand Up @@ -18,4 +18,4 @@
</References>
<ProjectItem SubType="" TargetFileName="$fileinputname$.aspx" ReplaceParameters="true">item-view.aspx</ProjectItem>
</TemplateContent>
</VSTemplate>
</VSTemplate>
2 changes: 1 addition & 1 deletion src/vside/templates/aspnet35/Configuration.cs
Expand Up @@ -61,4 +61,4 @@ public void Configure()
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
#endregion
2 changes: 1 addition & 1 deletion src/vside/templates/aspnet35/Handlers/HomeHandler.cs
Expand Up @@ -43,4 +43,4 @@ public object Get()
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
#endregion
4 changes: 2 additions & 2 deletions src/vside/templates/aspnet35/OpenRasta.AspNet35.csproj
@@ -1,4 +1,4 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -122,4 +122,4 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/vside/templates/aspnet35/OpenRasta.AspNet35.vstemplate
Expand Up @@ -37,4 +37,4 @@
<ProjectItem ReplaceParameters="true" TargetFileName="Web.config" OpenInEditor="true">Web.config</ProjectItem>
</Project>
</TemplateContent>
</VSTemplate>
</VSTemplate>
2 changes: 1 addition & 1 deletion src/vside/templates/aspnet35/Properties/AssemblyInfo.cs
Expand Up @@ -34,4 +34,4 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#endregion
#endregion

0 comments on commit d986871

Please sign in to comment.