Skip to content

Commit e64142e

Browse files
fabiomaulofabiomaulo
committed
Fix NH-2307
SVN: trunk@5171
1 parent e65c8b0 commit e64142e

File tree

5 files changed

+78
-36
lines changed

5 files changed

+78
-36
lines changed

‎src/NHibernate.ByteCode.Castle.Tests/NHibernate.ByteCode.Castle.Tests.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.ByteCode.Castle.Tests</RootNamespace>
1212
<AssemblyName>NHibernate.ByteCode.Castle.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkSubset>
1616
</TargetFrameworkSubset>
@@ -50,6 +50,9 @@
5050
<HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
53+
<Reference Include="System.Core">
54+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
55+
</Reference>
5356
<Reference Include="System.Data" />
5457
<Reference Include="System.Xml" />
5558
</ItemGroup>

‎src/NHibernate.ByteCode.Castle/NHibernate.ByteCode.Castle.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.ByteCode.Castle</RootNamespace>
1212
<AssemblyName>NHibernate.ByteCode.Castle</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkSubset>
1616
</TargetFrameworkSubset>
@@ -42,6 +42,9 @@
4242
<HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
45+
<Reference Include="System.Core">
46+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
47+
</Reference>
4548
</ItemGroup>
4649
<ItemGroup>
4750
<Compile Include="AssemblyInfo.cs" />

‎src/NHibernate.ByteCode.LinFu.Tests/NHibernate.ByteCode.LinFu.Tests.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.ByteCode.LinFu.Tests</RootNamespace>
1212
<AssemblyName>NHibernate.ByteCode.LinFu.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkSubset>
1616
</TargetFrameworkSubset>
@@ -50,6 +50,9 @@
5050
<HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
53+
<Reference Include="System.Core">
54+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
55+
</Reference>
5356
<Reference Include="System.Data" />
5457
<Reference Include="System.XML" />
5558
</ItemGroup>

‎src/NHibernate.Everything.sln

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iesi.Collections.Test", "Ie
7373
EndProject
7474
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "NHibernate.Example.Web\", "{C5D6EE68-1760-4F97-AD31-42343593D8C1}"
7575
ProjectSection(WebsiteProperties) = preProject
76-
TargetFramework = "2.0"
76+
TargetFramework = "3.5"
7777
ProjectReferences = "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}|NHibernate.dll;{8289D6AD-9714-42D3-A94D-D4D9814D1281}|NHibernate.ByteCode.LinFu.dll;"
7878
Debug.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
7979
Debug.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"
@@ -110,9 +110,6 @@ EndProject
110110
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ByteCode.Spring.Tests", "NHibernate.ByteCode.Spring.Tests\NHibernate.ByteCode.Spring.Tests.csproj", "{7EFC4549-3761-4B68-B81F-12AA51D78E92}"
111111
EndProject
112112
Global
113-
GlobalSection(TestCaseManagementSettings) = postSolution
114-
CategoryFile = NHibernate.vsmdi
115-
EndGlobalSection
116113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
117114
Debug|.NET = Debug|.NET
118115
Debug|Any CPU = Debug|Any CPU

‎src/NHibernate.Example.Web/Web.Config

+65-29
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
-->
1010
<configuration>
1111
<configSections>
12-
<section name="hibernate-configuration"
13-
type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"
14-
requirePermission="false" /> <!-- Important under Medium Trust -->
15-
16-
<section name="log4net"
17-
type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"
18-
requirePermission="false" /> <!-- Important under Medium Trust -->
19-
</configSections>
12+
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" requirePermission="false"/>
13+
<!-- Important under Medium Trust -->
14+
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false"/>
15+
<!-- Important under Medium Trust -->
16+
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
17+
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
18+
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
19+
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
20+
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
21+
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
22+
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
23+
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/></sectionGroup></sectionGroup></sectionGroup></configSections>
2024
<appSettings/>
2125
<connectionStrings/>
2226
<system.web>
@@ -26,7 +30,12 @@
2630
affects performance, set this value to true only
2731
during development.
2832
-->
29-
<compilation debug="true"/>
33+
<compilation debug="true">
34+
<assemblies>
35+
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
36+
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
37+
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
38+
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/></assemblies></compilation>
3039
<!--
3140
The <authentication> section enables configuration
3241
of the security authentication mode used by
@@ -45,14 +54,19 @@
4554
<error statusCode="404" redirect="FileNotFound.htm" />
4655
</customErrors>
4756
-->
48-
<pages enableViewState="false" enableViewStateMac="false" />
57+
<pages enableViewState="false" enableViewStateMac="false">
58+
<controls>
59+
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
60+
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></controls></pages>
4961
<!-- <trust level="Medium" /> -->
50-
5162
<httpModules>
52-
<add name="CurrentSessionModule" type="NHibernate.Example.Web.CurrentSessionModule" />
53-
</httpModules>
54-
</system.web>
55-
63+
<add name="CurrentSessionModule" type="NHibernate.Example.Web.CurrentSessionModule"/>
64+
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpModules>
65+
<httpHandlers>
66+
<remove verb="*" path="*.asmx"/>
67+
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
68+
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
69+
<add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></httpHandlers></system.web>
5670
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
5771
<bytecode-provider type="null"/><!-- Important under Medium Trust -->
5872
<session-factory>
@@ -66,28 +80,50 @@
6680
<property name="proxyfactory.factory_class">NHibernate.ByteCode.LinFu.ProxyFactoryFactory, NHibernate.ByteCode.LinFu</property>
6781
</session-factory>
6882
</hibernate-configuration>
69-
7083
<log4net>
7184
<!-- Define some output appenders -->
72-
<appender name="trace"
73-
type="log4net.Appender.TraceAppender, log4net">
85+
<appender name="trace" type="log4net.Appender.TraceAppender, log4net">
7486
<layout type="log4net.Layout.PatternLayout,log4net">
75-
<param name="ConversionPattern"
76-
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
87+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
7788
</layout>
7889
</appender>
79-
80-
<appender name="console"
81-
type="log4net.Appender.ConsoleAppender, log4net">
90+
<appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
8291
<layout type="log4net.Layout.PatternLayout,log4net">
83-
<param name="ConversionPattern"
84-
value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n" />
92+
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
8593
</layout>
8694
</appender>
87-
8895
<root>
89-
<priority value="WARN" />
90-
<appender-ref ref="trace" />
96+
<priority value="WARN"/>
97+
<appender-ref ref="trace"/>
9198
</root>
9299
</log4net>
93-
</configuration>
100+
<system.codedom>
101+
<compilers>
102+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
103+
<providerOption name="CompilerVersion" value="v3.5"/>
104+
<providerOption name="WarnAsError" value="false"/></compiler>
105+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
106+
<providerOption name="CompilerVersion" value="v3.5"/>
107+
<providerOption name="OptionInfer" value="true"/>
108+
<providerOption name="WarnAsError" value="false"/></compiler></compilers></system.codedom>
109+
<system.webServer>
110+
<validation validateIntegratedModeConfiguration="false"/>
111+
<modules>
112+
<remove name="ScriptModule"/>
113+
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></modules>
114+
<handlers>
115+
<remove name="WebServiceHandlerFactory-Integrated"/>
116+
<remove name="ScriptHandlerFactory"/>
117+
<remove name="ScriptHandlerFactoryAppServices"/>
118+
<remove name="ScriptResource"/>
119+
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
120+
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
121+
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></handlers></system.webServer>
122+
<runtime>
123+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
124+
<dependentAssembly>
125+
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
126+
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly>
127+
<dependentAssembly>
128+
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
129+
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly></assemblyBinding></runtime></configuration>

0 commit comments

Comments
 (0)