Skip to content

Commit

Permalink
Updates to latest version, llblgen pro v5.3.3 latest hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
@FransBouma
FransBouma committed Feb 5, 2018
1 parent 3f8c6af commit 703023e
Show file tree
Hide file tree
Showing 16 changed files with 145 additions and 136 deletions.
6 changes: 3 additions & 3 deletions EFCore2.0/Persistence/EFCore20.Bencher.Persistence.csproj
View file
Expand Up @@ -82,7 +82,7 @@
<HintPath>..\..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Annotations, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
<HintPath>..\..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -91,8 +91,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.SqlClient, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll</HintPath>
<Reference Include="System.Data.SqlClient, Version=4.2.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Data.SqlClient.4.4.2\lib\net461\System.Data.SqlClient.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
Expand Down
10 changes: 9 additions & 1 deletion EFCore2.0/Persistence/app.config
View file
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<connectionStrings>
<!-- please adjust the connection string embedded in the element below to target the proper catalog / server using the proper user / password combination -->
<add name="EF.ConnectionString.SQL Server (SqlClient)" connectionString="data source=win2008sql2012\sqlexpress;initial catalog=AdventureWorks;integrated security=SSPI;persist security info=False;packet size=4096" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Data.SqlClient" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
6 changes: 3 additions & 3 deletions EFCore2.0/Persistence/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CSharp" version="4.4.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.4.1" targetFramework="net462" />
<package id="Microsoft.EntityFrameworkCore" version="2.0.1" targetFramework="net462" />
<package id="Microsoft.EntityFrameworkCore.Relational" version="2.0.1" targetFramework="net462" />
<package id="Microsoft.EntityFrameworkCore.SqlServer" version="2.0.1" targetFramework="net462" />
Expand All @@ -16,8 +16,8 @@
<package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net462" />
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net462" />
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net462" />
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net462" />
<package id="System.Data.SqlClient" version="4.4.2" targetFramework="net462" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net462" />
<package id="System.Interactive.Async" version="3.1.1" targetFramework="net462" />
Expand Down
4 changes: 2 additions & 2 deletions LINQ2DB/DAL/LINQ2DB.Bencher.csproj
View file
Expand Up @@ -31,8 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="linq2db, Version=1.10.1.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e, processorArchitecture=MSIL">
<HintPath>..\..\packages\linq2db.1.10.1\lib\net45\linq2db.dll</HintPath>
<Reference Include="linq2db, Version=1.10.2.0, Culture=neutral, PublicKeyToken=f19f8aed7feff67e">
<HintPath>..\..\packages\linq2db.1.10.2\lib\net45\linq2db.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion LINQ2DB/DAL/packages.config
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="linq2db" version="1.10.1" targetFramework="net462" />
<package id="linq2db" version="1.10.2" targetFramework="net462" />
</packages>
2 changes: 1 addition & 1 deletion LLBLGen53/AdventureWorks.Dal.Adapter.v53.csproj
View file
Expand Up @@ -38,7 +38,7 @@
</Reference>
<Reference Include="SD.LLBLGen.Pro.ORMSupportClasses, Version=5.3.0.0, Culture=neutral, PublicKeyToken=ca73b74ba4e3ff27, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.3.2-hotfix-20171127\lib\net452\SD.LLBLGen.Pro.ORMSupportClasses.dll</HintPath>
<HintPath>..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.3.3-hotfix-20180129\lib\net452\SD.LLBLGen.Pro.ORMSupportClasses.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
9 changes: 4 additions & 5 deletions LLBLGen53/AdventureWorks.Dal.Adapter.v53DBSpecific.csproj
View file
Expand Up @@ -36,13 +36,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ReferencedAssemblies\Microsoft.SqlServer.Types.dll</HintPath>
</Reference>
<Reference Include="SD.LLBLGen.Pro.DQE.SqlServer, Version=5.3.0.0, Culture=neutral, PublicKeyToken=ca73b74ba4e3ff27, processorArchitecture=MSIL">
<HintPath>..\packages\SD.LLBLGen.Pro.DQE.SqlServer.5.3.2-hotfix-20171127\lib\net452\SD.LLBLGen.Pro.DQE.SqlServer.dll</HintPath>
<Private>True</Private>
<Reference Include="SD.LLBLGen.Pro.DQE.SqlServer, Version=5.3.0.0, Culture=neutral, PublicKeyToken=ca73b74ba4e3ff27">
<HintPath>..\packages\SD.LLBLGen.Pro.DQE.SqlServer.5.3.3-hotfix-20180129\lib\net452\SD.LLBLGen.Pro.DQE.SqlServer.dll</HintPath>
</Reference>
<Reference Include="SD.LLBLGen.Pro.ORMSupportClasses, Version=5.3.0.0, Culture=neutral, PublicKeyToken=ca73b74ba4e3ff27, processorArchitecture=MSIL">
<HintPath>..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.3.2-hotfix-20171127\lib\net452\SD.LLBLGen.Pro.ORMSupportClasses.dll</HintPath>
<Private>True</Private>
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.3.3-hotfix-20180129\lib\net452\SD.LLBLGen.Pro.ORMSupportClasses.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions LLBLGen53/packages.config
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SD.LLBLGen.Pro.DQE.SqlServer" version="5.3.2-hotfix-20171127" targetFramework="net462" />
<package id="SD.LLBLGen.Pro.ORMSupportClasses" version="5.3.2-hotfix-20171127" targetFramework="net462" />
<package id="SD.LLBLGen.Pro.DQE.SqlServer" version="5.3.3-hotfix-20180129" targetFramework="net462" />
<package id="SD.LLBLGen.Pro.ORMSupportClasses" version="5.3.3-hotfix-20180129" targetFramework="net462" />
</packages>
5 changes: 2 additions & 3 deletions NH/DAL/Model/NH.Bencher.Model.csproj
View file
Expand Up @@ -32,9 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.2\lib\net461\Iesi.Collections.dll</HintPath>
<Private>True</Private>
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.3\lib\net461\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="Microsoft.SqlServer.Types, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion NH/DAL/Model/packages.config
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
<package id="Iesi.Collections" version="4.0.3" targetFramework="net462" />
</packages>
12 changes: 7 additions & 5 deletions NH/DAL/Persistence/NH.Bencher.Persistence.csproj
View file
Expand Up @@ -35,12 +35,11 @@
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f">
<HintPath>..\..\..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll</HintPath>
<Private>True</Private>
<Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.3\lib\net461\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4">
<HintPath>..\..\..\packages\NHibernate.5.0.1\lib\net461\NHibernate.dll</HintPath>
<Reference Include="NHibernate, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NHibernate.5.0.3\lib\net461\NHibernate.dll</HintPath>
</Reference>
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b">
<HintPath>..\..\..\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
Expand All @@ -49,7 +48,10 @@
<HintPath>..\..\..\packages\Remotion.Linq.EagerFetching.2.1.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
Expand Down
4 changes: 2 additions & 2 deletions NH/DAL/Persistence/packages.config
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr3.Runtime" version="3.5.1" targetFramework="net462" />
<package id="Iesi.Collections" version="4.0.2" targetFramework="net45" requireReinstallation="true" />
<package id="NHibernate" version="5.0.1" targetFramework="net462" />
<package id="Iesi.Collections" version="4.0.3" targetFramework="net462" />
<package id="NHibernate" version="5.0.3" targetFramework="net462" />
<package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
<package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net462" />
</packages>
18 changes: 11 additions & 7 deletions RawBencher/App.config
View file
Expand Up @@ -49,15 +49,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.DotNet.PlatformAbstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" />
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down Expand Up @@ -85,19 +85,23 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Tortuga.Chain.Core" publicKeyToken="8769fd32a2872cf0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.6536.42705" newVersion="1.2.6536.42705" />
<bindingRedirect oldVersion="0.0.0.0-1.2.6563.39725" newVersion="1.2.6563.39725" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="CSScriptLibrary" publicKeyToken="70fcc3d18c749033" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.27.2.0" newVersion="3.27.2.0" />
<bindingRedirect oldVersion="0.0.0.0-3.28.0.0" newVersion="3.28.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.SqlClient" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
28 changes: 14 additions & 14 deletions RawBencher/OriginalController.cs
View file
Expand Up @@ -44,39 +44,39 @@ public static void Run(string[] args)

CacheController.RegisterCache(ConnectionString, new ResultsetCache());
RegisteredBenchers.Add(new HandCodedBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new NHibernateNormalBencher());
RegisteredBenchers.Add(new HandCodedBencherUsingBoxing() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new RawDbDataReaderBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
// RegisteredBenchers.Add(new NHibernateNormalBencher());
//RegisteredBenchers.Add(new HandCodedBencherUsingBoxing() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
//RegisteredBenchers.Add(new RawDbDataReaderBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new EntityFrameworkCoreNoChangeTrackingBencher() {ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new EntityFrameworkCoreNormalBencher() {ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new NPocoBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
// RegisteredBenchers.Add(new NPocoBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new LINQ2DBCompiledBencher(ConnectionString));
RegisteredBenchers.Add(new LINQ2DBNormalBencher(ConnectionString));
// RegisteredBenchers.Add(new LINQ2DBNormalBencher(ConnectionString));
RegisteredBenchers.Add(new LLBLGenProNoChangeTrackingRawSQLPocoBencher() {CommandText = SqlSelectCommandText});
RegisteredBenchers.Add(new LLBLGenProNoChangeTrackingQuerySpecPocoBencher());
RegisteredBenchers.Add(new LLBLGenProNoChangeTrackingLinqPocoBencher());
RegisteredBenchers.Add(new LLBLGenProNoChangeTrackingBencher());
RegisteredBenchers.Add(new LLBLGenProResultsetCachingBencher());
RegisteredBenchers.Add(new LLBLGenProNormalBencher());
RegisteredBenchers.Add(new DapperBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new ChainBencher() { CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString });
RegisteredBenchers.Add(new ChainCompiledBencher() { CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString });
// RegisteredBenchers.Add(new ChainBencher() { CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString });
// RegisteredBenchers.Add(new ChainCompiledBencher() { CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString });
RegisteredBenchers.Add(new LinqToSqlNoChangeTrackingBencher());
RegisteredBenchers.Add(new LinqToSqlNormalBencher());
RegisteredBenchers.Add(new EntityFrameworkNoChangeTrackingBencher());
RegisteredBenchers.Add(new EntityFrameworkNormalBencher());
RegisteredBenchers.Add(new PetaPocoBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new PetaPocoFastBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new OrmLiteBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
// RegisteredBenchers.Add(new EntityFrameworkNormalBencher());
// RegisteredBenchers.Add(new PetaPocoBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
// RegisteredBenchers.Add(new PetaPocoFastBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
// RegisteredBenchers.Add(new OrmLiteBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new DataTableBencher() {CommandText = SqlSelectCommandText, ConnectionStringToUse = ConnectionString});
RegisteredBenchers.Add(new MassiveBencher());
// RegisteredBenchers.Add(new MassiveBencher());

OriginalController.DisplayHeader();
OriginalController.WarmupDB();
OriginalController.FetchKeysForIndividualFetches();

// Uncomment the line below if you want to profile a bencher. Specify the bencher instance and follow the guides on the screen.
//ProfileBenchers(RegisteredBenchers.FirstOrDefault(b => b.GetType() == typeof(NHibernateNormalBencher)));
//ProfileBenchers(RegisteredBenchers.FirstOrDefault(b => b.GetType() == typeof(LLBLGenProNoChangeTrackingLinqPocoBencher)));
OriginalController.RunRegisteredBenchers();
OriginalController.ReportResultStatistics(autoExit);
}
Expand Down Expand Up @@ -137,7 +137,7 @@ private static void ProfileBenchers(params IBencher[] benchersToProfile)
return;
}
Console.WriteLine("Running set benchmark for bencher '{0}' before profiling to warm up constructs", b.CreateFrameworkName());
b.PerformSetBenchmark();
//b.PerformSetBenchmark();
b.PerformIndividualBenchMark(KeysForIndividualFetches);
if(b.SupportsEagerLoading)
{
Expand Down

0 comments on commit 703023e

Please sign in to comment.