Permalink
Browse files

Fix example project reference issues, add missing Spring HTTP module …

…MvcQuickStart
  • Loading branch information...
1 parent 1c85f83 commit 7a7d0583764971f120c1a3cfe885bdc56acf5cf7 @lahma lahma committed Jul 16, 2012
@@ -10,12 +10,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Primes</RootNamespace>
<AssemblyName>Primes</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -50,17 +50,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+ <Reference Include="Common.Logging">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+ <HintPath>..\..\..\..\lib\net\3.5\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core.Configuration, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core.Configuration">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\bin\net\2.0\Spring.Core.Configuration.dll</HintPath>
+ <HintPath>..\..\..\..\bin\net\3.5\Spring.Core.Configuration.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SpringApp</RootNamespace>
<AssemblyName>SpringApp</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -50,17 +51,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+ <Reference Include="Common.Logging">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+ <HintPath>..\..\..\..\lib\net\3.5\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core.Configuration, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core.Configuration">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\bin\net\2.0\Spring.Core.Configuration.dll</HintPath>
+ <HintPath>..\..\..\..\bin\net\3.5\Spring.Core.Configuration.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -50,7 +50,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit\nunit.framework.dll</HintPath>
</Reference>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Primes</RootNamespace>
<AssemblyName>Primes.Tests</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -50,7 +51,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit\nunit.framework.dll</HintPath>
</Reference>
@@ -14,7 +14,7 @@
<common>
<logging>
- <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
+ <factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net1210">
<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL-->
<!-- otherwise BasicConfigurer.Configure is used -->
<!-- log4net configuration file is specified with key configFile-->
@@ -27,7 +27,7 @@
<parsers>
<!-- Equivalent to 'NamespaceParserRegistry.RegisterParser(typeof(ContextNamespaceParser));' -->
- <parser type="Spring.Context.Config.ContextNamespaceParser, Spring.Core.Configuration" />
+ <parser type="Spring.Context.Config.ContextNamespaceParser, Spring.Core.Configuration"/>
</parsers>
<context>
@@ -73,25 +73,25 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+ <Reference Include="Common.Logging">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+ <HintPath>..\..\..\lib\net\3.5\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Common.Logging.Log4Net">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
+ <HintPath>..\lib\net\3.5\Common.Logging.Log4Net1210.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+ <Reference Include="log4net">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\lib\net\3.5\log4net.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core.Configuration, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core.Configuration">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\net\2.0\Spring.Core.Configuration.dll</HintPath>
+ <HintPath>..\..\..\bin\net\3.5\Spring.Core.Configuration.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
@@ -26,8 +26,9 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -78,32 +79,34 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
+ <Reference Include="Common.Logging">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\lib\net\2.0\Common.Logging.dll</HintPath>
+ <HintPath>..\..\..\lib\net\4.0\Common.Logging.dll</HintPath>
</Reference>
- <Reference Include="Common.Logging.Log4Net, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Common.Logging.Log4Net">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net\2.0\Common.Logging.Log4Net.dll</HintPath>
+ <HintPath>..\lib\net\4.0\Common.Logging.Log4Net1210.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+ <Reference Include="log4net">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\net\2.0\log4net.dll</HintPath>
+ <HintPath>..\lib\net\4.0\log4net.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core, Version=1.3.1.20711, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\..\lib\net\4.0\Spring.Core.dll</HintPath>
</Reference>
- <Reference Include="Spring.Core.Configuration, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Spring.Core.Configuration">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\bin\net\2.0\Spring.Core.Configuration.dll</HintPath>
+ <HintPath>..\..\..\bin\net\4.0\Spring.Core.Configuration.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
</ItemGroup>
<ItemGroup>
- <None Include="App.config" />
+ <None Include="App.config">
+ <SubType>Designer</SubType>
+ </None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MovieFinder\CodeConfigBootstrap.xml" />
Binary file not shown.
Binary file not shown.
@@ -35,14 +35,17 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Spring.Core">
- <HintPath>..\..\..\..\lib\net\2.0\Spring.Core.dll</HintPath>
+ <HintPath>..\..\..\..\lib\net\3.5\Spring.Core.dll</HintPath>
</Reference>
<Reference Include="Spring.Core.Configuration, Version=1.0.0.0, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\bin\net\2.0\Spring.Core.Configuration.dll</HintPath>
+ <HintPath>..\..\..\..\bin\net\3.5\Spring.Core.Configuration.dll</HintPath>
+ </Reference>
+ <Reference Include="Spring.Web">
+ <HintPath>..\..\lib\net\3.5\Spring.Web.dll</HintPath>
</Reference>
<Reference Include="Spring.Web.Mvc">
- <HintPath>..\..\..\..\lib\net\3.5\Spring.Web.Mvc.dll</HintPath>
+ <HintPath>..\..\lib\net\3.5\Spring.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -155,6 +155,7 @@
</httpHandlers>
<httpModules>
+ <add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</httpModules>
@@ -192,6 +193,7 @@
<remove name="UrlRoutingModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="UrlRoutingModule" type="System.Web.Routing.UrlRoutingModule, System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add name="Spring" preCondition="integratedMode" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
</modules>
<handlers>

0 comments on commit 7a7d058

Please sign in to comment.