Permalink
Browse files

Merge branch 'experimental'

  • Loading branch information...
lcranf committed Aug 7, 2011
2 parents bfba37f + 230d8e6 commit ae5694c3123048aaf9ffde114a9f4b377cd2ef32
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using MyMvcSample.Common.Domain;
+using MyMvcSample.Common.Extensions;
-namespace MyMvcSample.Common.Extensions
+namespace MyMvcSample.Common.Mvc.Extensions
{
public static class SelectListItemExtensions
{
@@ -1,10 +1,10 @@
-using System;
+using System;
using System.Web.Mvc;
using Microsoft.Practices.ServiceLocation;
using MyMvcSample.Common.Domain;
using MyMvcSample.Common.Repository;
-namespace MyMvcSample.Common.ModelBinders
+namespace MyMvcSample.Common.Mvc.ModelBinders
{
public class EntityModelBinder : IFilteredModelBinder
{
@@ -1,7 +1,7 @@
-using System;
+using System;
using System.Web.Mvc;
-namespace MyMvcSample.Common.ModelBinders
+namespace MyMvcSample.Common.Mvc.ModelBinders
{
public interface IFilteredModelBinder : IModelBinder
{
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Web.Mvc;
-namespace MyMvcSample.Common.ModelBinders
+namespace MyMvcSample.Common.Mvc.ModelBinders
{
public class SmartModelBinder : DefaultModelBinder
{
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{085AF89B-B319-422C-9760-FE08AEAE2BC6}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MyMvcSample.Common.Mvc</RootNamespace>
+ <AssemblyName>MyMvcSample.Common.Mvc</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Microsoft.Practices.ServiceLocation">
+ <HintPath>..\MyMvcSample.Web\bin\Microsoft.Practices.ServiceLocation.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="BaseController.cs" />
+ <Compile Include="ModelBinders\EntityModelBinder.cs" />
+ <Compile Include="ModelBinders\IFilteredModelBinder.cs" />
+ <Compile Include="ModelBinders\SmartModelBinder.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Extensions\SelectListItemExtensions.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="ActionResults\" />
+ <Folder Include="HtmlHelpers\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MyMvcSample.Common\MyMvcSample.Common.csproj">
+ <Project>{60C975EB-D0B2-4D3F-B517-426F52190436}</Project>
+ <Name>MyMvcSample.Common</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MyMvcSample.Common.Mvc")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MyMvcSample.Common.Mvc")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("4111d7e7-1798-4b63-9998-2d32b41c5baa")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -44,7 +44,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Entity" />
- <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -61,32 +60,22 @@
<Compile Include="Extensions\MapEntityToModelExtensions.cs" />
<Compile Include="Extensions\MapModelToEntityExtensions.cs" />
<Compile Include="Extensions\MonadExtensions.cs" />
- <Compile Include="Extensions\SelectListItemExtensions.cs" />
<Compile Include="Extensions\StringExtensions.cs" />
<Compile Include="Mappings\EntityToIdTypeConverter.cs" />
<Compile Include="Mappings\IdToEntityTypeConverter.cs" />
- <Compile Include="ModelBinders\EntityModelBinder.cs" />
- <Compile Include="ModelBinders\IFilteredModelBinder.cs" />
- <Compile Include="ModelBinders\SmartModelBinder.cs" />
- <Compile Include="Mvc\BaseController.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repository\IAttachableRepository.cs" />
<Compile Include="Repository\IReadOnlyRepository.cs" />
<Compile Include="Repository\Repository.cs" />
<Compile Include="Repository\IRepository.cs" />
- <Compile Include="Service\BaseService.cs" />
<Compile Include="Service\CrudService.cs" />
<Compile Include="Service\ICrudService.cs" />
- <Compile Include="Service\IService.cs" />
<Compile Include="ViewModels\BaseEditModel.cs" />
<Compile Include="ViewModels\ICreateModel.cs" />
<Compile Include="ViewModels\IEditModel.cs" />
<Compile Include="ViewModels\IViewModel.cs" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="ActionResults\" />
- <Folder Include="HtmlHelpers\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
@@ -1,6 +0,0 @@
-namespace MyMvcSample.Common.Service
-{
- public class BaseService : IService
- {
- }
-}
@@ -1,6 +0,0 @@
-namespace MyMvcSample.Common.Service
-{
- public interface IService
- {
- }
-}
@@ -1,4 +1,4 @@
-using MyMvcSample.Common.ModelBinders;
+using MyMvcSample.Common.Mvc.ModelBinders;
using MyMvcSample.Common.Repository;
using Ninject.Modules;
@@ -72,6 +72,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\MyMvcSample.Common.Mvc\MyMvcSample.Common.Mvc.csproj">
+ <Project>{085AF89B-B319-422C-9760-FE08AEAE2BC6}</Project>
+ <Name>MyMvcSample.Common.Mvc</Name>
+ </ProjectReference>
<ProjectReference Include="..\MyMvcSample.Domain\MyMvcSample.Domain.csproj">
<Project>{E6CFC0B8-2062-4745-80E0-88EC0C71A575}</Project>
<Name>MyMvcSample.Domain</Name>
@@ -2,6 +2,7 @@
using System.Web.Mvc;
using MyMvcSample.Common.Extensions;
using MyMvcSample.Common.Mvc;
+using MyMvcSample.Common.Mvc.Extensions;
using MyMvcSample.Core.Services;
using MyMvcSample.Domain.Entities;
using MyMvcSample.ViewModels;
@@ -3,7 +3,7 @@
using System.Web.Mvc;
using System.Web.Routing;
using Microsoft.Practices.ServiceLocation;
-using MyMvcSample.Common.ModelBinders;
+using MyMvcSample.Common.Mvc.ModelBinders;
using MyMvcSample.Domain.Db;
namespace MyMvcSample.Infrastructure
@@ -201,6 +201,10 @@
<Folder Include="Models\" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\MyMvcSample.Common.Mvc\MyMvcSample.Common.Mvc.csproj">
+ <Project>{085AF89B-B319-422C-9760-FE08AEAE2BC6}</Project>
+ <Name>MyMvcSample.Common.Mvc</Name>
+ </ProjectReference>
<ProjectReference Include="..\MyMvcSample.Domain\MyMvcSample.Domain.csproj">
<Project>{E6CFC0B8-2062-4745-80E0-88EC0C71A575}</Project>
<Name>MyMvcSample.Domain</Name>
View
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMvcSample.Common", "MyMvc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMvcSample.Infrastructure", "MyMvcSample.Infrastructure\MyMvcSample.Infrastructure.csproj", "{9EAC25C9-C38A-4189-96E1-90FC3BE0AE28}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMvcSample.Common.Mvc", "MyMvcSample.Common.Mvc\MyMvcSample.Common.Mvc.csproj", "{085AF89B-B319-422C-9760-FE08AEAE2BC6}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -37,6 +39,10 @@ Global
{9EAC25C9-C38A-4189-96E1-90FC3BE0AE28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EAC25C9-C38A-4189-96E1-90FC3BE0AE28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EAC25C9-C38A-4189-96E1-90FC3BE0AE28}.Release|Any CPU.Build.0 = Release|Any CPU
+ {085AF89B-B319-422C-9760-FE08AEAE2BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {085AF89B-B319-422C-9760-FE08AEAE2BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {085AF89B-B319-422C-9760-FE08AEAE2BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {085AF89B-B319-422C-9760-FE08AEAE2BC6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

0 comments on commit ae5694c

Please sign in to comment.