Merge branch 'master' into travis-xenial

Author: hazzik

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpasyncgenerator.tool": {
+      "version": "0.19.1",
+      "commands": [
+        "async-generator"
+      ]
+    }
+  }
+}

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: Microsoft.AspNetCore
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.Mvc
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
+    versions:
+    - "> 2.0.0"
+  - dependency-name: Microsoft.AspNetCore.StaticFiles
+    versions:
+    - "> 2.0.0"

.travis.yml

@@ -13,9 +13,6 @@ env:
   - DB=Firebird 
   - DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"   
   - DB=SQLite 
-matrix:
-  allow_failures:
-    - env: DB=MySQL CONNECTION_STRING="Server=127.0.0.1;Uid=root;Database=nhibernate;Old Guids=True;"
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y powershell 

README.md

@@ -103,7 +103,7 @@ of NHibernate (in no particular order):
 [Apache Software Foundation]: http://www.apache.org
 [JetBrains]: http://www.jetbrains.com
 [ReSharper]: http://www.jetbrains.com/resharper
-[LinFu]: http://code.google.com/p/linfu
+[LinFu]: https://github.com/philiplaureano/LinFu
 [article]: http://www.codeproject.com/KB/recipes/sets.aspx
-[Relinq]: http://relinq.codeplex.com/
+[Relinq]: https://github.com/re-motion/Relinq
 [AsyncGenerator]: http://github.com/maca88/AsyncGenerator

ShowBuildMenu.sh

@@ -178,36 +178,15 @@ testRun(){
 }
 
 generateAsync(){
-	dotnet restore ./src/NHibernate.sln
-
-	getAsyncGeneratorPath
 	cd src
-	dotnet ../"$async_generator_path"
+	dotnet tool restore
+	dotnet restore ./NHibernate.sln
+	dotnet async-generator
 	cd ..
 
 	mainMenu
 }
 
-getAsyncGeneratorPath(){
-	if [ "$async_generator_path" ]
-	then
-		return
-	fi
-
-	cd Tools
-
-	async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
-	async_generator_path="csharpasyncgenerator.commandline/$async_generator_version/tools"
-
-	if [ ! -d $async_generator_path ]
-	then
-		dotnet restore "./packages.csproj" --packages .
-	fi
-
-	async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
-	cd ..
-}
-
 mainMenu() {
 	echo  "========================= NHIBERNATE BUILD MENU =========================="
 	echo  "--- TESTING ---"

Tools/packages.csproj

@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.2" />
     <PackageReference Include="vswhere" Version="2.1.4" />
     <PackageReference Include="NUnit.Console" Version="3.10.0" />
     <PackageReference Include="GitReleaseManager" Version="0.11.0" />

appveyor.yml

@@ -13,9 +13,6 @@ environment:
 init:
     # Required for having windows endlines in sources zip
     - git config --global core.autocrlf true
-matrix:
-  allow_failures:
-  - DB: MySQL
 build: off
 before_test:
 - ps: |-

build-common/NHibernate.props

@@ -2,10 +2,10 @@
   <Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
 
   <PropertyGroup>
-    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.3</NhVersion>
-    <VersionPatch  Condition="'$(VersionPatch)'  == ''">8</VersionPatch>
+    <NhVersion     Condition="'$(NhVersion)' == ''"    >5.4</NhVersion>
+    <VersionPatch  Condition="'$(VersionPatch)'  == ''">0</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
@@ -42,6 +42,6 @@
     <DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
   </ItemGroup>
 </Project>

build-common/common.xml

@@ -48,6 +48,9 @@
 	</target>
 
 	<target name="common.tools-restore" depends="common.init">
+		<exec workingdir="${root.dir}" program="dotnet" verbose="true">
+			<arg line="tool restore" />
+		</exec> 
 		<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
 			<arg line="restore ./packages.csproj --packages ." />
 		</exec> 

default.build

@@ -64,15 +64,9 @@
 		<property name="tool.path" value="${tools.dir}/${tool.id}/${tool.version}/" />
 	</target>
 
-	<target name="find-async-generator-console">
-		<property name="tool.id" value="CSharpAsyncGenerator.CommandLine" />
-		<call target="get-tool-info" />
-		<property name="async-generator-console"  value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
-	</target>
-
-	<target name="generate-async" depends="solution-restore find-async-generator-console">
+	<target name="generate-async" depends="solution-restore">
 		<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
-			<arg line=".${async-generator-console}" />
+			<arg line="async-generator" />
 		</exec> 
 	</target>