Skip to content

NHibernate version to 4.1.0.4000 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NHibernate version to 4.1.0.4000 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Caches/MemCache.Tests/MemCacheFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class MemCacheFixture
private MemCacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
XmlConfigurator.Configure();
Expand All @@ -48,10 +48,13 @@ public void FixtureSetup()
provider.Start(props);
}

[TestFixtureTearDown]
[OneTimeSetUp]
public void FixtureStop()
{
provider.Stop();
if (provider != null)
{
provider.Stop();
}
}

[Test]
Expand Down
4 changes: 2 additions & 2 deletions Caches/MemCache.Tests/MemCacheProviderFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class MemCacheProviderFixture
private ICacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
XmlConfigurator.Configure();
Expand All @@ -56,7 +56,7 @@ public void FixtureSetup()
provider.Start(props);
}

[TestFixtureTearDown]
[OneTimeSetUp]
public void Stop()
{
provider.Stop();
Expand Down
23 changes: 16 additions & 7 deletions Caches/MemCache.Tests/NHibernate.Caches.MemCache.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,27 @@
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections">
<HintPath>..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\log4net.dll</HintPath>
</Reference>
<Reference Include="Memcached.ClientLibrary">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\Memcached.ClientLibrary.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Lib\net\3.5\nunit.framework.dll</HintPath>
<Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
<HintPath>..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down Expand Up @@ -115,6 +121,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</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.
Expand Down
6 changes: 4 additions & 2 deletions Caches/MemCache.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
<package id="Memcached.ClientLibrary" version="1.0" targetFramework="net40" />
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
<package id="NodaTime" version="1.3.2" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
</packages>
4 changes: 2 additions & 2 deletions Caches/MemCache/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
[assembly: AssemblyCompanyAttribute("")]
[assembly: AssemblyProductAttribute("NHibernate.Caches.MemCache")]
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
[assembly: AssemblyVersionAttribute("4.0.0.4000")]
[assembly: AssemblyVersionAttribute("4.1.0.4000")]
[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.0.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.1.0.4000")]
18 changes: 14 additions & 4 deletions Caches/MemCache/NHibernate.Caches.MemCache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,27 @@
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections">
<HintPath>..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\log4net.dll</HintPath>
</Reference>
<Reference Include="Memcached.ClientLibrary">
<HintPath>..\..\packages\Memcached.ClientLibrary.1.0\lib\net20\Memcached.ClientLibrary.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
<HintPath>..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
6 changes: 4 additions & 2 deletions Caches/MemCache/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
<package id="Memcached.ClientLibrary" version="1.0" targetFramework="net40" />
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
<package id="NodaTime" version="1.3.2" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
</packages>
24 changes: 17 additions & 7 deletions Caches/RtMemoryCache.Tests/NHibernate.Caches.RtMemoryCache.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,21 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections">
<HintPath>..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
<HintPath>..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -63,6 +70,9 @@
<Name>NHibernate.Caches.RtMemoryCache</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</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.
Expand All @@ -71,4 +81,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion Caches/RtMemoryCache.Tests/RtMemoryCacheFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class RtMemoryCacheFixture
private RtMemoryCacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
props = new Dictionary<string, string>();
Expand Down
2 changes: 1 addition & 1 deletion Caches/RtMemoryCache.Tests/RtMemoryCacheProviderFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void Setup()
private RtMemoryCacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
props = new Dictionary<string, string> {{"expiration", 120.ToString()}, {"priority", 2.ToString()}};
Expand Down
7 changes: 4 additions & 3 deletions Caches/RtMemoryCache.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
<package id="NodaTime" version="1.3.2" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
</packages>
6 changes: 3 additions & 3 deletions Caches/RtMemoryCache/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyCompanyAttribute("NHibernate.org")]
[assembly: AssemblyProductAttribute("NHibernate.Caches.RtMemoryCache")]
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
[assembly: AssemblyVersionAttribute("4.0.0.4000")]
[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.0.0.4000")]
[assembly: AssemblyVersionAttribute("4.1.0.4000")]
[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.1.0.4000")]
//[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")]
[assembly: AssemblyDelaySignAttribute(false)]
[assembly: AllowPartiallyTrustedCallers()]
20 changes: 15 additions & 5 deletions Caches/RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,21 @@
<AssemblyOriginatorKeyFile>..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections">
<HintPath>..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
<HintPath>..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down Expand Up @@ -77,4 +87,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 4 additions & 2 deletions Caches/RtMemoryCache/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
<package id="NodaTime" version="1.3.2" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
</packages>
24 changes: 17 additions & 7 deletions Caches/SysCache.Tests/NHibernate.Caches.SysCache.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,21 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections">
<HintPath>..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
<HintPath>..\..\packages\NodaTime.1.3.2\lib\net35-Client\NodaTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down Expand Up @@ -106,6 +113,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</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.
Expand All @@ -114,4 +124,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion Caches/SysCache.Tests/SysCacheFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class SysCacheFixture
private SysCacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
props = new Dictionary<string, string>();
Expand Down
2 changes: 1 addition & 1 deletion Caches/SysCache.Tests/SysCacheProviderFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void Setup()
private SysCacheProvider provider;
private Dictionary<string, string> props;

[TestFixtureSetUp]
[OneTimeSetUp]
public void FixtureSetup()
{
props = new Dictionary<string, string> {{"expiration", 120.ToString()}, {"priority", 2.ToString()}};
Expand Down
7 changes: 4 additions & 3 deletions Caches/SysCache.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
<package id="NodaTime" version="1.3.2" targetFramework="net40" />
<package id="NUnit" version="3.6.0" targetFramework="net40" />
</packages>
6 changes: 3 additions & 3 deletions Caches/SysCache/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyCompanyAttribute("NHibernate.org")]
[assembly: AssemblyProductAttribute("NHibernate.Caches.SysCache")]
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
[assembly: AssemblyVersionAttribute("4.0.0.4000")]
[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.0.0.4000")]
[assembly: AssemblyVersionAttribute("4.1.0.4000")]
[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")]
[assembly: AssemblyFileVersionAttribute("4.1.0.4000")]
//[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")]
[assembly: AssemblyDelaySignAttribute(false)]
[assembly: AllowPartiallyTrustedCallers()]
Loading