diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 529caf1..8a66b57 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -7,6 +7,12 @@ "commands": [ "async-generator" ] + }, + "cake.tool": { + "version": "1.0.0-rc0003", + "commands": [ + "dotnet-cake" + ] } } } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3c98a8d..a757bbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,246 @@ -Source/.vs -Source/NHibernate.Extensions.Tests/bin/* -Source/NHibernate.Extensions.Tests/obj/* -Source/NHibernate.Extensions/bin/* +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files *.suo -Source/NHibernate.Extensions/obj/* -Source/packages/* *.user -Source/NHibernateX.Extensions.Tests/bin/ -Source/NHibernateX.Extensions.Tests/obj/ -Source/NHibernateX.Extensions/obj/ -Source/NHibernateX.Extensions/bin/ -Source/TestResults/ +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +[Xx]64/ +[Xx]86/ +[Bb]uild/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml + +# TODO: Un-comment the next line if you do not want to checkin +# your web deploy settings because they may include unencrypted +# passwords +#*.pubxml +*.publishproj + +# NuGet Packages *.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Microsoft Azure ApplicationInsights config file +ApplicationInsights.config + +# Windows Store app package directory +AppPackages/ +BundleArtifacts/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# LightSwitch generated files +GeneratedArtifacts/ +ModelManifest.xml + +# Paket dependency manager +.paket/paket.exe + +# FAKE - F# Make +.fake/ +[Tt]ools/ +.idea/ +*.dev.props + +package/ \ No newline at end of file diff --git a/NHibernate.Extensions.Tests/App.config b/NHibernate.Extensions.Tests/App.config new file mode 100644 index 0000000..94710ea --- /dev/null +++ b/NHibernate.Extensions.Tests/App.config @@ -0,0 +1,42 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/NHibernate.Extensions.Tests/Async/BatchFetchTests.cs b/NHibernate.Extensions.Tests/Async/BatchFetchTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Async/BatchFetchTests.cs rename to NHibernate.Extensions.Tests/Async/BatchFetchTests.cs diff --git a/Source/NHibernate.Extensions.Tests/Async/DeepCloneTests.cs b/NHibernate.Extensions.Tests/Async/DeepCloneTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Async/DeepCloneTests.cs rename to NHibernate.Extensions.Tests/Async/DeepCloneTests.cs diff --git a/Source/NHibernate.Extensions.Tests/Async/LinqIncludeTests.cs b/NHibernate.Extensions.Tests/Async/LinqIncludeTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Async/LinqIncludeTests.cs rename to NHibernate.Extensions.Tests/Async/LinqIncludeTests.cs diff --git a/Source/NHibernate.Extensions.Tests/BaseIncludeTest.cs b/NHibernate.Extensions.Tests/BaseIncludeTest.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/BaseIncludeTest.cs rename to NHibernate.Extensions.Tests/BaseIncludeTest.cs diff --git a/Source/NHibernate.Extensions.Tests/BatchFetchTests.cs b/NHibernate.Extensions.Tests/BatchFetchTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/BatchFetchTests.cs rename to NHibernate.Extensions.Tests/BatchFetchTests.cs diff --git a/Source/NHibernate.Extensions.Tests/CascadeConvention.cs b/NHibernate.Extensions.Tests/CascadeConvention.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/CascadeConvention.cs rename to NHibernate.Extensions.Tests/CascadeConvention.cs diff --git a/Source/NHibernate.Extensions.Tests/DeepCloneTests.cs b/NHibernate.Extensions.Tests/DeepCloneTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/DeepCloneTests.cs rename to NHibernate.Extensions.Tests/DeepCloneTests.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/Animal.cs b/NHibernate.Extensions.Tests/Entities/Animal.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/Animal.cs rename to NHibernate.Extensions.Tests/Entities/Animal.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/AnimalType.cs b/NHibernate.Extensions.Tests/Entities/AnimalType.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/AnimalType.cs rename to NHibernate.Extensions.Tests/Entities/AnimalType.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/BatchModel.cs b/NHibernate.Extensions.Tests/Entities/BatchModel.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/BatchModel.cs rename to NHibernate.Extensions.Tests/Entities/BatchModel.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/Cat.cs b/NHibernate.Extensions.Tests/Entities/Cat.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/Cat.cs rename to NHibernate.Extensions.Tests/Entities/Cat.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBDrivingLicence.cs b/NHibernate.Extensions.Tests/Entities/EQBDrivingLicence.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBDrivingLicence.cs rename to NHibernate.Extensions.Tests/Entities/EQBDrivingLicence.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBHouse.cs b/NHibernate.Extensions.Tests/Entities/EQBHouse.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBHouse.cs rename to NHibernate.Extensions.Tests/Entities/EQBHouse.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBIdentity.cs b/NHibernate.Extensions.Tests/Entities/EQBIdentity.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBIdentity.cs rename to NHibernate.Extensions.Tests/Entities/EQBIdentity.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBIdentityCard.cs b/NHibernate.Extensions.Tests/Entities/EQBIdentityCard.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBIdentityCard.cs rename to NHibernate.Extensions.Tests/Entities/EQBIdentityCard.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBPerson.cs b/NHibernate.Extensions.Tests/Entities/EQBPerson.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBPerson.cs rename to NHibernate.Extensions.Tests/Entities/EQBPerson.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBRoadWorthyTest.cs b/NHibernate.Extensions.Tests/Entities/EQBRoadWorthyTest.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBRoadWorthyTest.cs rename to NHibernate.Extensions.Tests/Entities/EQBRoadWorthyTest.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBUser.cs b/NHibernate.Extensions.Tests/Entities/EQBUser.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBUser.cs rename to NHibernate.Extensions.Tests/Entities/EQBUser.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/EQBVehicle.cs b/NHibernate.Extensions.Tests/Entities/EQBVehicle.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/EQBVehicle.cs rename to NHibernate.Extensions.Tests/Entities/EQBVehicle.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/IUser.cs b/NHibernate.Extensions.Tests/Entities/IUser.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/IUser.cs rename to NHibernate.Extensions.Tests/Entities/IUser.cs diff --git a/Source/NHibernate.Extensions.Tests/Entities/TestEQBWheel.cs b/NHibernate.Extensions.Tests/Entities/TestEQBWheel.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/Entities/TestEQBWheel.cs rename to NHibernate.Extensions.Tests/Entities/TestEQBWheel.cs diff --git a/Source/NHibernate.Extensions.Tests/IEntity.cs b/NHibernate.Extensions.Tests/IEntity.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/IEntity.cs rename to NHibernate.Extensions.Tests/IEntity.cs diff --git a/Source/NHibernate.Extensions.Tests/LinqIncludeTests.cs b/NHibernate.Extensions.Tests/LinqIncludeTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/LinqIncludeTests.cs rename to NHibernate.Extensions.Tests/LinqIncludeTests.cs diff --git a/Source/NHibernate.Extensions.Tests/LogSpy.cs b/NHibernate.Extensions.Tests/LogSpy.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/LogSpy.cs rename to NHibernate.Extensions.Tests/LogSpy.cs diff --git a/Source/NHibernate.Extensions.Tests/NHConfig.cs b/NHibernate.Extensions.Tests/NHConfig.cs similarity index 97% rename from Source/NHibernate.Extensions.Tests/NHConfig.cs rename to NHibernate.Extensions.Tests/NHConfig.cs index 87c3e69..c1a03b2 100644 --- a/Source/NHibernate.Extensions.Tests/NHConfig.cs +++ b/NHibernate.Extensions.Tests/NHConfig.cs @@ -36,8 +36,8 @@ static NHConfig() var modelAssembly = typeof(NHConfig).Assembly; var configuration = Configuration = new Configuration(); configuration.SetProperty(Environment.GenerateStatistics, "true"); - configuration.SetProperty(Environment.UseSqlComments, "true"); - configuration.SetProperty(Environment.ShowSql, "true"); + configuration.SetProperty(Environment.UseSqlComments, "false"); + configuration.SetProperty(Environment.ShowSql, "false"); configuration.Configure(); // Configure from the hibernate.cfg.config // We have to replace |DataDirectory| as it is not supported on .NET Core diff --git a/Source/NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj b/NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj similarity index 90% rename from Source/NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj rename to NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj index c488eec..ad3f1ce 100644 --- a/Source/NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj +++ b/NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp2.0 + net461;netcoreapp3.1 7.2 false maca88 @@ -27,10 +27,6 @@ - - - - PreserveNewest diff --git a/Source/NHibernate.Extensions.Tests/QueryRelationTreeTests.cs b/NHibernate.Extensions.Tests/QueryRelationTreeTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/QueryRelationTreeTests.cs rename to NHibernate.Extensions.Tests/QueryRelationTreeTests.cs diff --git a/Source/NHibernate.Extensions.Tests/SessionSubscriptionTests.cs b/NHibernate.Extensions.Tests/SessionSubscriptionTests.cs similarity index 100% rename from Source/NHibernate.Extensions.Tests/SessionSubscriptionTests.cs rename to NHibernate.Extensions.Tests/SessionSubscriptionTests.cs diff --git a/Source/NHibernate.Extensions.Tests/Test.ldf b/NHibernate.Extensions.Tests/Test.ldf similarity index 100% rename from Source/NHibernate.Extensions.Tests/Test.ldf rename to NHibernate.Extensions.Tests/Test.ldf diff --git a/Source/NHibernate.Extensions.Tests/Test.mdf b/NHibernate.Extensions.Tests/Test.mdf similarity index 100% rename from Source/NHibernate.Extensions.Tests/Test.mdf rename to NHibernate.Extensions.Tests/Test.mdf diff --git a/Source/NHibernate.Extensions.Tests/hibernate.cfg.xml b/NHibernate.Extensions.Tests/hibernate.cfg.xml similarity index 100% rename from Source/NHibernate.Extensions.Tests/hibernate.cfg.xml rename to NHibernate.Extensions.Tests/hibernate.cfg.xml diff --git a/Source/NHibernate.Extensions.sln b/NHibernate.Extensions.sln similarity index 100% rename from Source/NHibernate.Extensions.sln rename to NHibernate.Extensions.sln diff --git a/Source/NHibernate.Extensions/Async/BatchFetchBuilder.cs b/NHibernate.Extensions/Async/BatchFetchBuilder.cs similarity index 100% rename from Source/NHibernate.Extensions/Async/BatchFetchBuilder.cs rename to NHibernate.Extensions/Async/BatchFetchBuilder.cs diff --git a/Source/NHibernate.Extensions/Async/BatchFetchExtension.cs b/NHibernate.Extensions/Async/BatchFetchExtension.cs similarity index 100% rename from Source/NHibernate.Extensions/Async/BatchFetchExtension.cs rename to NHibernate.Extensions/Async/BatchFetchExtension.cs diff --git a/Source/NHibernate.Extensions/Async/DeepClone/DeepCloneSessionExtension.cs b/NHibernate.Extensions/Async/DeepClone/DeepCloneSessionExtension.cs similarity index 100% rename from Source/NHibernate.Extensions/Async/DeepClone/DeepCloneSessionExtension.cs rename to NHibernate.Extensions/Async/DeepClone/DeepCloneSessionExtension.cs diff --git a/Source/NHibernate.Extensions/Async/IBatchFetchBuilder.cs b/NHibernate.Extensions/Async/IBatchFetchBuilder.cs similarity index 100% rename from Source/NHibernate.Extensions/Async/IBatchFetchBuilder.cs rename to NHibernate.Extensions/Async/IBatchFetchBuilder.cs diff --git a/Source/NHibernate.Extensions/BatchFetchBuilder.cs b/NHibernate.Extensions/BatchFetchBuilder.cs similarity index 100% rename from Source/NHibernate.Extensions/BatchFetchBuilder.cs rename to NHibernate.Extensions/BatchFetchBuilder.cs diff --git a/Source/NHibernate.Extensions/BatchFetchExtension.cs b/NHibernate.Extensions/BatchFetchExtension.cs similarity index 100% rename from Source/NHibernate.Extensions/BatchFetchExtension.cs rename to NHibernate.Extensions/BatchFetchExtension.cs diff --git a/Source/NHibernate.Extensions/DeepClone/DeepCloneMemberOptions.cs b/NHibernate.Extensions/DeepClone/DeepCloneMemberOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/DeepCloneMemberOptions.cs rename to NHibernate.Extensions/DeepClone/DeepCloneMemberOptions.cs diff --git a/Source/NHibernate.Extensions/DeepClone/DeepCloneOptions.cs b/NHibernate.Extensions/DeepClone/DeepCloneOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/DeepCloneOptions.cs rename to NHibernate.Extensions/DeepClone/DeepCloneOptions.cs diff --git a/Source/NHibernate.Extensions/DeepClone/DeepCloneParentEntity.cs b/NHibernate.Extensions/DeepClone/DeepCloneParentEntity.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/DeepCloneParentEntity.cs rename to NHibernate.Extensions/DeepClone/DeepCloneParentEntity.cs diff --git a/Source/NHibernate.Extensions/DeepClone/DeepCloneSessionExtension.cs b/NHibernate.Extensions/DeepClone/DeepCloneSessionExtension.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/DeepCloneSessionExtension.cs rename to NHibernate.Extensions/DeepClone/DeepCloneSessionExtension.cs diff --git a/Source/NHibernate.Extensions/DeepClone/DeepCloneTypeOptions.cs b/NHibernate.Extensions/DeepClone/DeepCloneTypeOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/DeepCloneTypeOptions.cs rename to NHibernate.Extensions/DeepClone/DeepCloneTypeOptions.cs diff --git a/Source/NHibernate.Extensions/DeepClone/IDeepCloneMemberOptions.cs b/NHibernate.Extensions/DeepClone/IDeepCloneMemberOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/IDeepCloneMemberOptions.cs rename to NHibernate.Extensions/DeepClone/IDeepCloneMemberOptions.cs diff --git a/Source/NHibernate.Extensions/DeepClone/IDeepCloneTypeOptions.cs b/NHibernate.Extensions/DeepClone/IDeepCloneTypeOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/IDeepCloneTypeOptions.cs rename to NHibernate.Extensions/DeepClone/IDeepCloneTypeOptions.cs diff --git a/Source/NHibernate.Extensions/DeepClone/IEntityResolver.cs b/NHibernate.Extensions/DeepClone/IEntityResolver.cs similarity index 100% rename from Source/NHibernate.Extensions/DeepClone/IEntityResolver.cs rename to NHibernate.Extensions/DeepClone/IEntityResolver.cs diff --git a/Source/NHibernate.Extensions/IBatchFetchBuilder.cs b/NHibernate.Extensions/IBatchFetchBuilder.cs similarity index 100% rename from Source/NHibernate.Extensions/IBatchFetchBuilder.cs rename to NHibernate.Extensions/IBatchFetchBuilder.cs diff --git a/Source/NHibernate.Extensions/Internal/DelegateEntityResolver.cs b/NHibernate.Extensions/Internal/DelegateEntityResolver.cs similarity index 100% rename from Source/NHibernate.Extensions/Internal/DelegateEntityResolver.cs rename to NHibernate.Extensions/Internal/DelegateEntityResolver.cs diff --git a/Source/NHibernate.Extensions/Internal/ExpressionExtensions.cs b/NHibernate.Extensions/Internal/ExpressionExtensions.cs similarity index 100% rename from Source/NHibernate.Extensions/Internal/ExpressionExtensions.cs rename to NHibernate.Extensions/Internal/ExpressionExtensions.cs diff --git a/Source/NHibernate.Extensions/Internal/ExpressionHelper.cs b/NHibernate.Extensions/Internal/ExpressionHelper.cs similarity index 100% rename from Source/NHibernate.Extensions/Internal/ExpressionHelper.cs rename to NHibernate.Extensions/Internal/ExpressionHelper.cs diff --git a/Source/NHibernate.Extensions/Internal/TypeExtensions.cs b/NHibernate.Extensions/Internal/TypeExtensions.cs similarity index 100% rename from Source/NHibernate.Extensions/Internal/TypeExtensions.cs rename to NHibernate.Extensions/Internal/TypeExtensions.cs diff --git a/Source/NHibernate.Extensions/Internal/TypeHelper.cs b/NHibernate.Extensions/Internal/TypeHelper.cs similarity index 100% rename from Source/NHibernate.Extensions/Internal/TypeHelper.cs rename to NHibernate.Extensions/Internal/TypeHelper.cs diff --git a/Source/NHibernate.Extensions/Linq/ExpressionInfo.cs b/NHibernate.Extensions/Linq/ExpressionInfo.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/ExpressionInfo.cs rename to NHibernate.Extensions/Linq/ExpressionInfo.cs diff --git a/Source/NHibernate.Extensions/Linq/IIncludeOptions.cs b/NHibernate.Extensions/Linq/IIncludeOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IIncludeOptions.cs rename to NHibernate.Extensions/Linq/IIncludeOptions.cs diff --git a/Source/NHibernate.Extensions/Linq/IIncludeQueryable.cs b/NHibernate.Extensions/Linq/IIncludeQueryable.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IIncludeQueryable.cs rename to NHibernate.Extensions/Linq/IIncludeQueryable.cs diff --git a/Source/NHibernate.Extensions/Linq/IncludeOptions.cs b/NHibernate.Extensions/Linq/IncludeOptions.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IncludeOptions.cs rename to NHibernate.Extensions/Linq/IncludeOptions.cs diff --git a/Source/NHibernate.Extensions/Linq/IncludeQueryProvider.cs b/NHibernate.Extensions/Linq/IncludeQueryProvider.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IncludeQueryProvider.cs rename to NHibernate.Extensions/Linq/IncludeQueryProvider.cs diff --git a/Source/NHibernate.Extensions/Linq/IncludeQueryable.cs b/NHibernate.Extensions/Linq/IncludeQueryable.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IncludeQueryable.cs rename to NHibernate.Extensions/Linq/IncludeQueryable.cs diff --git a/Source/NHibernate.Extensions/Linq/IncludeRewriterVisitor.cs b/NHibernate.Extensions/Linq/IncludeRewriterVisitor.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/IncludeRewriterVisitor.cs rename to NHibernate.Extensions/Linq/IncludeRewriterVisitor.cs diff --git a/Source/NHibernate.Extensions/Linq/LinqExtensions.cs b/NHibernate.Extensions/Linq/LinqExtensions.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/LinqExtensions.cs rename to NHibernate.Extensions/Linq/LinqExtensions.cs diff --git a/Source/NHibernate.Extensions/Linq/SkipTakeVisitor.cs b/NHibernate.Extensions/Linq/SkipTakeVisitor.cs similarity index 100% rename from Source/NHibernate.Extensions/Linq/SkipTakeVisitor.cs rename to NHibernate.Extensions/Linq/SkipTakeVisitor.cs diff --git a/Source/NHibernate.Extensions/NHibernate.Extensions.csproj b/NHibernate.Extensions/NHibernate.Extensions.csproj similarity index 100% rename from Source/NHibernate.Extensions/NHibernate.Extensions.csproj rename to NHibernate.Extensions/NHibernate.Extensions.csproj diff --git a/Source/NHibernate.Extensions/QueryRelationNode.cs b/NHibernate.Extensions/QueryRelationNode.cs similarity index 100% rename from Source/NHibernate.Extensions/QueryRelationNode.cs rename to NHibernate.Extensions/QueryRelationNode.cs diff --git a/Source/NHibernate.Extensions/QueryRelationTree.cs b/NHibernate.Extensions/QueryRelationTree.cs similarity index 100% rename from Source/NHibernate.Extensions/QueryRelationTree.cs rename to NHibernate.Extensions/QueryRelationTree.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/ISessionSubscription.cs b/NHibernate.Extensions/Subscriptions/ISessionSubscription.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/ISessionSubscription.cs rename to NHibernate.Extensions/Subscriptions/ISessionSubscription.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/ITransactionSubscription.cs b/NHibernate.Extensions/Subscriptions/ITransactionSubscription.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/ITransactionSubscription.cs rename to NHibernate.Extensions/Subscriptions/ITransactionSubscription.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/SessionSubscription.cs b/NHibernate.Extensions/Subscriptions/SessionSubscription.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/SessionSubscription.cs rename to NHibernate.Extensions/Subscriptions/SessionSubscription.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/SessionSubscriptionExtension.cs b/NHibernate.Extensions/Subscriptions/SessionSubscriptionExtension.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/SessionSubscriptionExtension.cs rename to NHibernate.Extensions/Subscriptions/SessionSubscriptionExtension.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/TransactionListener.cs b/NHibernate.Extensions/Subscriptions/TransactionListener.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/TransactionListener.cs rename to NHibernate.Extensions/Subscriptions/TransactionListener.cs diff --git a/Source/NHibernate.Extensions/Subscriptions/TransactionSubscription.cs b/NHibernate.Extensions/Subscriptions/TransactionSubscription.cs similarity index 100% rename from Source/NHibernate.Extensions/Subscriptions/TransactionSubscription.cs rename to NHibernate.Extensions/Subscriptions/TransactionSubscription.cs diff --git a/Source/.editorconfig b/Source/.editorconfig deleted file mode 100644 index bbba723..0000000 --- a/Source/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -root = true - -[*] -end_of_line = crlf -insert_final_newline = true -trim_trailing_whitespace = true - -# 4 space indentation -[*.cs] -indent_style = space -indent_size = 4 - -[*.csproj] -indent_style = space -indent_size = 2 diff --git a/Source/.nuget/NuGet.Config b/Source/.nuget/NuGet.Config deleted file mode 100644 index 3f0e003..0000000 --- a/Source/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Source/NHibernate.Extensions.Tests/App.config b/Source/NHibernate.Extensions.Tests/App.config deleted file mode 100644 index 964eb4b..0000000 --- a/Source/NHibernate.Extensions.Tests/App.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/build.cake b/build.cake new file mode 100644 index 0000000..2ee0cb8 --- /dev/null +++ b/build.cake @@ -0,0 +1,163 @@ +#tool nuget:?package=NUnit.ConsoleRunner&version=3.12.0 +#tool nuget:?package=CSharpAsyncGenerator.CommandLine&version=0.19.1 +////////////////////////////////////////////////////////////////////// +// ARGUMENTS +////////////////////////////////////////////////////////////////////// + +var target = Argument("target", "Default"); +var configuration = Argument("configuration", "Release"); +var netfx = Argument("netfx", "net461"); + +////////////////////////////////////////////////////////////////////// +// CONSTANTS +////////////////////////////////////////////////////////////////////// + +var PROJECT_DIR = Context.Environment.WorkingDirectory.FullPath + "/"; +var PACKAGE_DIR = PROJECT_DIR + "package/"; + +////////////////////////////////////////////////////////////////////// +// PREPARATION +////////////////////////////////////////////////////////////////////// + +// Define directories. +var buildDirs = new List() +{ + Directory("./NHibernate.Extensions/bin") + Directory(configuration), + Directory("./NHibernate.Extensions.Tests/bin") + Directory(configuration) +}; + +////////////////////////////////////////////////////////////////////// +// TASKS +////////////////////////////////////////////////////////////////////// + +Task("Clean") + .Does(() => +{ + foreach(var buildDir in buildDirs) + { + CleanDirectory(buildDir); + } +}); + +Task("Restore") + .IsDependentOn("Clean") + .Does(() => +{ + NuGetRestore("./NHibernate.Extensions.sln"); +}); + +Task("RestoreCore") + .IsDependentOn("Clean") + .Does(() => +{ + DotNetCoreRestore("./NHibernate.Extensions.sln"); +}); + +Task("Build") + .IsDependentOn("Restore") + .Does(() => +{ + MSBuild("./NHibernate.Extensions.sln", settings => + settings.SetConfiguration(configuration)); +}); + +Task("BuildCore") + .IsDependentOn("RestoreCore") + .Does(() => +{ + DotNetCoreBuild("./NHibernate.Extensions.sln", new DotNetCoreBuildSettings + { + Configuration = configuration, + ArgumentCustomization = args => args.Append("--no-restore"), + }); +}); + +Task("Test") + .IsDependentOn("Build") + .Does(() => +{ + NUnit3("./NHibernate.Extensions.Tests/bin/" + configuration + $"/{netfx}/*.Tests.dll", new NUnit3Settings + { + NoResults = true + }); +}); + +Task("TestCore") + .IsDependentOn("BuildCore") + .Does(() => +{ + DotNetCoreTest("./NHibernate.Extensions.Tests/NHibernate.Extensions.Tests.csproj", new DotNetCoreTestSettings + { + Configuration = configuration, + NoBuild = true + }); +}); + +////////////////////////////////////////////////////////////////////// +// PACKAGE +////////////////////////////////////////////////////////////////////// + +Task("CleanPackages") + .Does(() => +{ + CleanDirectory(PACKAGE_DIR); +}); + +Task("Pack") + .IsDependentOn("BuildCore") + .IsDependentOn("CleanPackages") + .Description("Creates NuGet packages") + .Does(() => +{ + CreateDirectory(PACKAGE_DIR); + + var projects = new string[] + { + "NHibernate.Extensions/NHibernate.Extensions.csproj" + }; + + foreach(var project in projects) + { + MSBuild(project, new MSBuildSettings { + Configuration = configuration, + ArgumentCustomization = args => args + .Append("/t:pack") + .Append("/p:PackageOutputPath=\"" + PACKAGE_DIR + "\"") + }); + } +}); + +Task("Async") + .IsDependentOn("Restore") + .Does(() => +{ + DotNetCoreExecute("./Tools/CSharpAsyncGenerator.CommandLine.0.19.1/tools/net472/AsyncGenerator.CommandLine.dll"); +}); + +Task("Publish") + .IsDependentOn("Pack") + .Does(() => +{ + foreach(var package in System.IO.Directory.GetFiles(PACKAGE_DIR, "*.nupkg").Where(o => !o.Contains("symbols"))) + { + NuGetPush(package, new NuGetPushSettings() + { + Source = "https://api.nuget.org/v3/index.json" + }); + } +}); + + + +////////////////////////////////////////////////////////////////////// +// TASK TARGETS +////////////////////////////////////////////////////////////////////// + +Task("Default") + .IsDependentOn("Test"); + +////////////////////////////////////////////////////////////////////// +// EXECUTION +////////////////////////////////////////////////////////////////////// + +RunTarget(target);