Merge pull request #221 from sharparchitecture/release/6.0.0

Release/6.0.0
sharparchitecture · Jun 14, 2020 · ee48cdd · ee48cdd
2 parents 9e7016f + fc33ec6
commit ee48cdd
Show file tree

Hide file tree

Showing 126 changed files with 2,467 additions and 1,802 deletions.
diff --git a/Artefacts/Documentation/Makefile b/Artefacts/Documentation/Makefile
@@ -66,6 +66,11 @@ json:
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
+markdown:
+	$(SPHINXBUILD) -b markdown $(ALLSPHINXOPTS) $(BUILDDIR)/markdown
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
 htmlhelp:
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo

diff --git a/Artefacts/Documentation/icon.png b/Artefacts/Documentation/icon.png
diff --git a/Artefacts/Documentation/requirements.txt b/Artefacts/Documentation/requirements.txt
@@ -0,0 +1,12 @@
+Pygments==2.3.1
+setuptools==41.0.1
+docutils==0.14
+mock==1.0.1
+pillow==5.4.1
+alabaster>=0.7,<0.8,!=0.7.5
+commonmark==0.8.1
+recommonmark==0.5.0
+sphinx<2
+sphinx-rtd-theme<0.5
+readthedocs-sphinx-ext<1.1
+sphinx-markdown-builder==0.5.3
diff --git a/Artefacts/Documentation/source/conf.py b/Artefacts/Documentation/source/conf.py
@@ -34,7 +34,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo']
+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx_markdown_builder']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -73,7 +73,9 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = []
+exclude_patterns = [
+    'build/*'
+]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None

diff --git a/Artefacts/Documentation/source/nhibernate/hilo-generator.rst b/Artefacts/Documentation/source/nhibernate/hilo-generator.rst
@@ -4,7 +4,7 @@ NHibernate HiLo Generator
 Why use HiLo
 ------------
 
-HiLo idnentity generatos allows NHibernate to generate identity values to map child objects to their parent without having to hit the database as opposed to using the native identity generation causes nhibernate to hit the database on every save, which affects performance and running of batch statements.
+HiLo identity generators allow NHibernate to generate identity values to map child objects to their parent without having to hit the database as opposed to using the native identity generation causes nhibernate to hit the database on every save, which affects performance and running of batch statements.
 
 For more information on generator behaviours refer to `this <http://fabiomaulo.blogspot.co.uk/2009/02/nh210-generators-behavior-explained.html>`_ blog post by Fabio Maulo.
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,16 +3,22 @@
     <Product>Sharp Architecture</Product>
     <Authors>Sharp Architecture Dev Team</Authors>
 
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <SignAssembly>false</SignAssembly>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
 
+    <LangVersion>8.0</LangVersion>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
+  <PropertyGroup Label="Custom targers">
+    <!-- target frameworks for unit-tests and applications -->
+    <AppTargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.1</AppTargetFrameworks>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DebugType>full</DebugType>
   </PropertyGroup>
@@ -24,10 +30,10 @@
   <PropertyGroup Label="Package" Condition="'$(MSBuildProjectName.Contains(Tests))' == false">
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <IsPackable>True</IsPackable>
-    <PackageIconUrl>https://github.com/sharparchitecture/Sharp-Architecture/raw/master/Artefacts/Documentation/Logo_100x100.png</PackageIconUrl>
+    <PackageIconUrl>https://github.com/sharparchitecture/Sharp-Architecture/raw/master/Artefacts/Documentation/icon.png</PackageIconUrl>
     <PackageProjectUrl>http://sharparchitecture.github.io/</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/5.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/sharparchitecture/Sharp-Architecture/releases/tag/6.0.0</PackageReleaseNotes>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -41,6 +47,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == true">
+    <TargetFrameworks>$(AppTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);0618;1591</NoWarn>

diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml
@@ -61,3 +61,6 @@ issue-labels-alias:
   - name: sample
     header: Sample
     plural: Samples
+  - name: documentation
+    header: Documentation updated
+    plural: Documentation updates