Skip to content

Commit 7cf829f

Browse files
alexander.kot@gmail.comfredericDelaporte
alexander.kot@gmail.com
authored and
fredericDelaporte
committed
NHV-128 - Upgrade Validators to NH 5.0
* Retargeted to Framework 4.6.1 * All except ASP.NET MVC example switched to use Nhib 5.0.0 * All tests are green
1 parent 1b96e1b commit 7cf829f

File tree

28 files changed

+178
-66
lines changed

28 files changed

+178
-66
lines changed

‎Examples/EntityValidator/NHibernate.Validator.Demo.Ev/NHibernate.Validator.Demo.Ev/NHibernate.Validator.Demo.Ev.csproj‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.Validator.Demo.Ev</RootNamespace>
1212
<AssemblyName>NHibernate.Validator.Demo.Ev</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -55,16 +55,28 @@
5555
<Prefer32Bit>false</Prefer32Bit>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
58+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
6064
<Private>True</Private>
6165
</Reference>
6266
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
6367
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
6468
<Private>True</Private>
6569
</Reference>
66-
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
67-
<HintPath>..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
70+
<Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
71+
<HintPath>..\packages\NHibernate.5.0.0\lib\net461\NHibernate.dll</HintPath>
72+
<Private>True</Private>
73+
</Reference>
74+
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
76+
<Private>True</Private>
77+
</Reference>
78+
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
79+
<HintPath>..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
6880
<Private>True</Private>
6981
</Reference>
7082
<Reference Include="System" />

‎Examples/EntityValidator/NHibernate.Validator.Demo.Ev/NHibernate.Validator.Demo.Ev/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎Examples/EntityValidator/NHibernate.Validator.Demo.Ev/NHibernate.Validator.Demo.Ev/packages.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net451" />
3+
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
4+
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
45
<package id="log4net" version="2.0.8" targetFramework="net451" />
5-
<package id="NHibernate" version="4.1.1.4000" targetFramework="net451" />
6+
<package id="NHibernate" version="5.0.0" targetFramework="net461" />
7+
<package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
8+
<package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />
69
</packages>

‎Examples/Integration/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.Model/NHibernate.Validator.Demo.Model.csproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -55,12 +55,24 @@
5555
<Prefer32Bit>false</Prefer32Bit>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
58+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63-
<HintPath>..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
62+
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
66+
<Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
67+
<HintPath>..\packages\NHibernate.5.0.0\lib\net461\NHibernate.dll</HintPath>
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
72+
<Private>True</Private>
73+
</Reference>
74+
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
6476
<Private>True</Private>
6577
</Reference>
6678
<Reference Include="System" />

‎Examples/Integration/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.Model/packages.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
4-
<package id="NHibernate" version="4.1.1.4000" targetFramework="net45" />
3+
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
4+
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
5+
<package id="NHibernate" version="5.0.0" targetFramework="net461" />
56
<package id="NHibernate.Validator" version="1.3.2.4000" targetFramework="net35" />
7+
<package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
8+
<package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />
69
</packages>

‎Examples/Integration/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.NHI.csproj‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +15,7 @@
1515
<OldToolsVersion>3.5</OldToolsVersion>
1616
<UpgradeBackupLocation>
1717
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1919
<PublishUrl>publish\</PublishUrl>
2020
<Install>true</Install>
2121
<InstallFrom>Disk</InstallFrom>
@@ -55,12 +55,24 @@
5555
<Prefer32Bit>false</Prefer32Bit>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
58+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63-
<HintPath>..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
62+
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
66+
<Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
67+
<HintPath>..\packages\NHibernate.5.0.0\lib\net461\NHibernate.dll</HintPath>
68+
<Private>True</Private>
69+
</Reference>
70+
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
72+
<Private>True</Private>
73+
</Reference>
74+
<Reference Include="Remotion.Linq.EagerFetching, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
6476
<Private>True</Private>
6577
</Reference>
6678
<Reference Include="System" />

‎Examples/Integration/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.NHI/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎Examples/Integration/NHibernate.Validator.Demo.NHI/NHibernate.Validator.Demo.NHI/packages.config‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
4-
<package id="NHibernate" version="4.1.1.4000" targetFramework="net45" />
3+
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
4+
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
5+
<package id="NHibernate" version="5.0.0" targetFramework="net461" />
56
<package id="NHibernate.Validator" version="1.3.2.4000" targetFramework="net35" />
7+
<package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
8+
<package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />
69
</packages>

‎Examples/IoC/NHibernate.Validator.Demo.IoC.Windsor/NHibernate.Validator.Demo.IoC.Windsor/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
</property>
1212
</nhv-configuration>
1313

14-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
14+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎Examples/IoC/NHibernate.Validator.Demo.IoC.Windsor/NHibernate.Validator.Demo.IoC.Windsor/NHibernate.Validator.Demo.IoC.Windsor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>NHibernate.Validator.Demo.IoC.Windsor</RootNamespace>
1212
<AssemblyName>NHibernate.Validator.Demo.IoC.Windsor</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>

0 commit comments

Comments
 (0)