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

fix Spring.Calculator example project

Browse Source
This commit is contained in:
Marko Lahma
2013-12-24 10:05:07 +02:00
parent 0dfc0bc57b
commit 25029d3398
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Spring.Calculator.Web.2010.csproj
View File

@@ -50,7 +50,7 @@
<HintPath>..\..\..\..\..\lib\Net\2.0\Common.Logging.Log4Net1211.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\lib\net\2.0\log4net.dll</HintPath>
<HintPath>..\..\..\..\..\lib\Net\4.0\log4net.dll</HintPath>
</Reference>
<Reference Include="Spring.Aop">
<HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
@@ -96,6 +96,9 @@
<Name>Spring.Calculator.Services.2010</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

15
examples/Spring/Spring.Calculator/src/Spring.Calculator.Web/Web.config
View File

@@ -13,7 +13,7 @@
<common>
<logging>
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net">
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net1211">
<!-- choices are INLINE, FILE, FILE-WATCH, EXTERNAL -->
<!-- otherwise BasicConfigurer.Configure is used -->
<!-- log4net configuration file is specified with key configFile -->
@@ -100,5 +100,16 @@
<level value="INFO"/>
</logger>
</log4net>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<modules>
<add name="Spring" type="Spring.Context.Support.WebSupportModule, Spring.Web"/>
</modules>
<handlers>
<add name="SpringPageHandlerFactory" verb="*" path="*.aspx" type="Spring.Web.Support.PageHandlerFactory, Spring.Web"/>
<add name="SpringWebServiceHandlerFactory" verb="*" path="*.asmx" type="Spring.Web.Services.WebServiceHandlerFactory, Spring.Web"/>
<add name="SpringContextMonitor" verb="*" path="ContextMonitor.ashx" type="Spring.Web.Support.ContextMonitor, Spring.Web"/>
</handlers>
</system.webServer>
</configuration>

2
src/Spring/CommonAssemblyInfo.cs
View File

@@ -31,7 +31,7 @@ using System.Reflection;
//note that this #if #elif #endif contstruct requires NET_#_# values be checked in DESCENDING order to work properly
// (e.g., add any new ones at the TOP of this construct!)
#if NET_4_0
#if NET_4_5
[assembly: AssemblyVersion("2.0.0.45001")]
#elif NET_4_0
[assembly: AssemblyVersion("2.0.0.40001")]