.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.0.0",
+      "version": "5.0.0",
       "commands": [
         "dotnet-cake"
       ]

.editorconfig

@@ -2,10 +2,6 @@ root = true
 ; This file is for unifying the coding style for different editors and IDEs.
 ; More information at http://EditorConfig.org
 
-
-[*]
-end_of_line = crlf
-
 [*.ps1]
 indent_style = space
 indent_size = 2
@@ -14,18 +10,33 @@ indent_size = 2
 indent_style = space
 indent_size = 4
 insert_final_newline = true
+max_line_length = off
 
 csharp_style_namespace_declarations = file_scoped
 
 dotnet_diagnostic.ide0161.severity = warning
+dotnet_diagnostic.nunit1032.severity = suggestion
+dotnet_diagnostic.nunit1028.severity = none
+dotnet_diagnostic.nunit2045.severity = none
 
 # ReSharper properties
 resharper_default_private_modifier = implicit
 
+# Microsoft .NET properties
+dotnet_style_require_accessibility_modifiers = never:suggestion
+
 [*.cake]
 indent_style = space
 indent_size = 4
 
 [*.js]
 indent_style = tab
 indent_size = 2
+
+[*.csproj]
+indent_style = space
+indent_size = 2
+
+[*.props]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,2 +1,28 @@
-[core]
-autocrlf=false
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cs      text diff=csharp
+*.xaml    text
+*.txt     text
+*.tt      text
+*.ps1     text
+*.cmd     text
+*.msbuild text
+*.md      text
+
+*.sln text eol=crlf
+*.csproj text eol=crlf
+*.vbproj text eol=crlf
+*.fsproj text eol=crlf
+*.dbproj text eol=crlf
+
+# Resharper DotSettings files are in Unix format
+*.DotSettings text eol=lf 
+
+# Binary files
+*.png binary
+*.jpg binary
+*.dll binary
+*.exe binary

.github/renovate.json

@@ -1,18 +1,22 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "labels": [
     "build"
   ],
   "packageRules": [
     {
-      "matchSourceUrls": [ "https://github.com/nunit/nunit"],
+      "matchSourceUrls": [
+        "https://github.com/nunit/nunit"
+      ],
       "groupName": "NUnit"
     },
     {
-      "matchSourceUrls": [ "https://github.com/nunit/nunit-console"],
+      "matchSourceUrls": [
+        "https://github.com/nunit/nunit-console"
+      ],
       "groupName": "NUnit.Console"
     }
   ]

CODEOFCONDUCT.md

@@ -1,24 +1,24 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-- The use of sexualized language or imagery
-- Personal attacks
-- Trolling or insulting/derogatory comments
-- Public or private harassment
-- Publishing other's private information, such as physical or electronic addresses, without explicit permission
-- Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
-
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery
+- Personal attacks
+- Trolling or insulting/derogatory comments
+- Public or private harassment
+- Publishing other's private information, such as physical or electronic addresses, without explicit permission
+- Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+
 This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/

CONTRIBUTING.md

@@ -1,14 +1,5 @@
-# Contribution Guidelines
-
-The wiki has a page on contributing to FNH:
-
-https://github.com/nhibernate/fluent-nhibernate/wiki/Contributing
-
-## Important
-If you've just pulled the FNH code into a local git repository for the first time, its really important that you set the core.autocrlf setting to false to avoid running into whitespace/line ending issues. Do this using the following command:
-
-```
-git config core.autocrlf false
-```
-
-
+# Contribution Guidelines
+
+The wiki has a page on contributing to FNH:
+
+https://github.com/nhibernate/fluent-nhibernate/wiki/Contributing

GitVersion.yml

@@ -1,2 +1,2 @@
 assembly-versioning-scheme: MajorMinor
-mode: ContinuousDeployment
+mode: ContinuousDelivery

README.md

@@ -1,41 +1,37 @@
-![FluentNHibernate logo](https://raw.githubusercontent.com/nhibernate/fluent-nhibernate/main/docs/logo.png)
-
-[![Build status](https://ci.appveyor.com/api/projects/status/684r2ot07i2lrcij/branch/main?svg=true)](https://ci.appveyor.com/project/nhibernate/fluent-nhibernate/branch/main)
-[![NuGet](https://img.shields.io/nuget/v/FluentNHibernate.svg)](https://www.nuget.org/packages/FluentNHibernate)
-
-## What is FluentNHibernate?
-Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate. *Get your fluent on.*
-
-## Where can I get it?
-
-Install using the [FluentNHibernate NuGet package](https://www.nuget.org/packages/FluentNHibernate):
-
-```
-dotnet add package FluentNHibernate
-```
-
-## How do I use it?
-
-* Read the [introduction](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started).
-* Get latest version from NuGet
-    - [.NETCore2.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
-    - [.NET 4.0 with NHibernate 4.x](https://www.nuget.org/packages/FluentNHibernate/2.0.3)
-    - [.NET 3.5 with NHibernate 3 if you like it vintage](https://www.nuget.org/packages/FluentNHibernate.Net35)
-
-* Create your [first project](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started#wiki-yourfirstproject).
-
-## Further reading
-
-Once you've followed the above, you can compare our [auto mapping](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Auto-mapping) to our [fluent interface](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-mapping) to see which suits your application, read through our [API documentation](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-configuration), or just see what's available for reading in our [wiki](https://github.com/FluentNHibernate/fluent-nhibernate/wiki).
-
-Contributors
----------------------------------------------
-
-Fluent NHibernate wouldn't be possible without the time and effort of its contributors. The team comprises of [James Gregory](http://jagregory.com), [Paul Batum](http://www.paulbatum.com), Andrew Stewart, [Hudson Akridge](https://github.com/HudsonAkridge), [Gleb Chermennov](https://github.com/chester89) and [Jorge Rodríguez Galán](https://github.com/jrgcubano).
-
-**Our valued committers are:** Aaron Jensen, Alexander Gross, Andrew Stewart, Barry Dahlberg, Bobby Johnson, Brian Donahue, Cameron Harris, Chad Myers, Chris Chilvers, Craig Neuwirt, Dan Malcolm, Daniel Mirapalheta, David Archer, David Longnecker, David R. Longnecker, Derick Bailey, Erik Ojebo, Firo, Hudson Akridge, Ivan Zlatev, James Freiwirth, James Gregory, James Kovacs, Jeremy Skinner, Lee Henson, Louis DeJardin, Patric Forsgard, Paul Batum, Roelof Blom, Stuart Childs, Tom Janssens, Tuna Toksoz, U-BSOD\pruiz, di97mni, dschilling, felixg, jeremydmiller, kevm, leebrandt, maxild, robsosno, [Jorge Rodríguez Galán](https://github.com/jrgcubano) and many more.</p>
-
-Thanks goes to [Jeremy Miller](http://codebetter.com/blogs/jeremy.miller) for the original idea and implementation.
-
-Fluent NHibernate is &copy; 2008-2018 [James Gregory](http://jagregory.com) and contributors under the [BSD license](https://github.com/nhibernate/fluent-nhibernate/blob/main/LICENSE)
-
+![FluentNHibernate logo](https://raw.githubusercontent.com/nhibernate/fluent-nhibernate/main/docs/logo.png)
+
+[![Build status](https://ci.appveyor.com/api/projects/status/684r2ot07i2lrcij/branch/main?svg=true)](https://ci.appveyor.com/project/nhibernate/fluent-nhibernate/branch/main)
+[![NuGet](https://img.shields.io/nuget/v/FluentNHibernate.svg)](https://www.nuget.org/packages/FluentNHibernate)
+
+## What is FluentNHibernate?
+Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate. *Get your fluent on.*
+
+## Where can I get it?
+
+Install using the [FluentNHibernate NuGet package](https://www.nuget.org/packages/FluentNHibernate):
+
+```
+dotnet add package FluentNHibernate
+```
+
+## How do I use it?
+
+* Read the [introduction](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started).
+* Get latest version from [NuGet](https://www.nuget.org/packages/FluentNHibernate)
+* Create your [first project](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started#wiki-yourfirstproject).
+
+## Further reading
+
+Once you've followed the above, you can compare our [auto mapping](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Auto-mapping) to our [fluent interface](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-mapping) to see which suits your application, read through our [API documentation](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Fluent-configuration), or just see what's available for reading in our [wiki](https://github.com/FluentNHibernate/fluent-nhibernate/wiki).
+
+Contributors
+---------------------------------------------
+
+Fluent NHibernate wouldn't be possible without the time and effort of its contributors. The team comprises of [James Gregory](http://jagregory.com), [Paul Batum](http://www.paulbatum.com), Andrew Stewart, [Hudson Akridge](https://github.com/HudsonAkridge), [Gleb Chermennov](https://github.com/chester89) and [Jorge Rodríguez Galán](https://github.com/jrgcubano).
+
+**Our valued committers are:** Aaron Jensen, Alexander Gross, Andrew Stewart, Barry Dahlberg, Bobby Johnson, Brian Donahue, Cameron Harris, Chad Myers, Chris Chilvers, Craig Neuwirt, Dan Malcolm, Daniel Mirapalheta, David Archer, David Longnecker, David R. Longnecker, Derick Bailey, Erik Ojebo, Firo, Hudson Akridge, Ivan Zlatev, James Freiwirth, James Gregory, James Kovacs, Jeremy Skinner, Lee Henson, Louis DeJardin, Patric Forsgard, Paul Batum, Roelof Blom, Stuart Childs, Tom Janssens, Tuna Toksoz, U-BSOD\pruiz, di97mni, dschilling, felixg, jeremydmiller, kevm, leebrandt, maxild, robsosno, [Jorge Rodríguez Galán](https://github.com/jrgcubano) and many more.</p>
+
+Thanks goes to [Jeremy Miller](http://codebetter.com/blogs/jeremy.miller) for the original idea and implementation.
+
+Fluent NHibernate is &copy; 2008-2018 [James Gregory](http://jagregory.com) and contributors under the [BSD license](https://github.com/nhibernate/fluent-nhibernate/blob/main/LICENSE)
+

build.cake

@@ -1,6 +1,6 @@
-#addin "nuget:?package=Cake.FileHelpers&version=6.1.3"
-#tool "dotnet:?package=GitReleaseManager.Tool&version=0.13.0"
-#tool "dotnet:?package=GitVersion.Tool&version=5.12.0"
+#addin "nuget:?package=Cake.FileHelpers&version=7.0.0"
+#tool "dotnet:?package=GitReleaseManager.Tool&version=0.18.0"
+#tool "dotnet:?package=GitVersion.Tool&version=6.0.5"
 
 #load "./build/parameters.cake"
 
@@ -85,7 +85,7 @@ Task("Test")
         {                      
             DotNetTest(project.ToString(), new DotNetTestSettings
             {
-                Framework = "net461",
+                Framework = "net48",
                 NoBuild = true,
                 NoRestore = true,
                 Configuration = parameters.Configuration
@@ -108,21 +108,21 @@ Task("Copy-Files")
         PublishProjects(
             SrcProjects, "net461",
             parameters.Paths.Directories.ArtifactsBinFullFx.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );
         PublishProjects(
             SrcProjects, "netstandard2.0",
             parameters.Paths.Directories.ArtifactsBinNetStandard20.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );
         PublishProjects(
             SrcProjects, "netcoreapp2.0",
             parameters.Paths.Directories.ArtifactsBinNetCoreApp2.FullPath, 
-            parameters.Version.DotNetAsterix, 
+            parameters.Version.VersionSuffix, 
             parameters.Configuration, 
             msBuildSettings
         );

build/version.cake

@@ -2,7 +2,7 @@ public class BuildVersion
 {
     public string Version { get; private set; }
     public string SemVersion { get; private set; }
-    public string DotNetAsterix { get; private set; }
+    public string VersionSuffix { get; private set; }
     public string Milestone { get; private set; }
     public string AppVersion { get; private set; }
     public string AssemblyVersion { get; private set; }
@@ -20,45 +20,45 @@ public class BuildVersion
         string assemblyVersion = null;
         string informationalVersion = null;
         string milestone = null;
+        string preReleaseTag = null;
 
-        if (context.IsRunningOnWindows())
+        context.Information("Calculating Semantic Version");
+        if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
         {
-            context.Information("Calculating Semantic Version");
-            if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
-            {
-                context.GitVersion(new GitVersionSettings{
-                    UpdateAssemblyInfo = false,
-                    OutputType = GitVersionOutput.BuildServer
-                });
-
-                version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
-                semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
-                assemblyVersion = context.EnvironmentVariable("GitVersion_AssemblySemVer");
-                informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
-                milestone = string.Concat("v", version);
-            }
-
-            GitVersion assertedVersions = context.GitVersion(new GitVersionSettings
-            {
-                OutputType = GitVersionOutput.Json,
+            context.GitVersion(new GitVersionSettings{
+                UpdateAssemblyInfo = false,
+                OutputType = GitVersionOutput.BuildServer
             });
 
-            version = assertedVersions.MajorMinorPatch;
-            semVersion = assertedVersions.LegacySemVerPadded;
-            assemblyVersion = assertedVersions.AssemblySemVer;
-            informationalVersion = assertedVersions.InformationalVersion;
+            version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
+            semVersion = context.EnvironmentVariable("GitVersion_SemVer");
+            preReleaseTag = context.EnvironmentVariable("GitVersion_PreReleaseTag");
+            assemblyVersion = context.EnvironmentVariable("GitVersion_AssemblySemVer");
+            informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
             milestone = string.Concat("v", version);
-
-            context.Information("Calculated Semantic Version: {0}", semVersion);
         }
 
+        GitVersion assertedVersions = context.GitVersion(new GitVersionSettings
+        {
+            OutputType = GitVersionOutput.Json,
+        });
+
+        version = assertedVersions.MajorMinorPatch;
+        semVersion = assertedVersions.SemVer;
+        preReleaseTag = assertedVersions.PreReleaseTag;
+        assemblyVersion = assertedVersions.AssemblySemVer;
+        informationalVersion = assertedVersions.InformationalVersion;
+        milestone = string.Concat("v", version);
+
+        context.Information("Calculated Semantic Version: {0}", semVersion);
+
         var appVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
 
         return new BuildVersion
         {
             Version = version,
             SemVersion = semVersion,
-            DotNetAsterix = semVersion.Substring(version.Length).TrimStart('-'),
+            VersionSuffix = preReleaseTag,
             Milestone = milestone,
             AppVersion = appVersion,
             AssemblyVersion = assemblyVersion,

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.403",
+        "version": "8.0.100",
         "rollForward": "latestFeature"
     }
 }