Merge branch 'release/2.0.1' into production

csf-dev · Feb 27, 2020 · d1770bf · d1770bf
2 parents 570b54f + 2faa725
commit d1770bf
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 16 deletions.
diff --git a/CSF.Entities/CSF.Entities.csproj b/CSF.Entities/CSF.Entities.csproj
@@ -11,7 +11,7 @@
     <Authors>craigfowler</Authors>
     <Title>Entity &amp; identity types</Title>
     <Description>Interfaces &amp; base types to describe ORM-mapped entities and their identities.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/CSF.ORM.Entities/CSF.ORM.Entities.csproj b/CSF.ORM.Entities/CSF.ORM.Entities.csproj
@@ -13,7 +13,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Entity integration</Title>
     <Description>An integration between CSF.ORM and CSF.Entities, providing convenience functionality for projects which use both.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj b/CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj
@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>

diff --git a/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj b/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj
@@ -12,7 +12,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Implementation for NHibernate 4</Title>
     <Description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -22,6 +22,8 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
     <RootNamespace>CSF.ORM.NHibernate</RootNamespace>
+    <NuspecFile>CSF.ORM.NHibernate4.nuspec</NuspecFile>
+    <NuspecProperties>Version=$(ReleaseVersion)</NuspecProperties>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.nuspec b/CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.nuspec
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>CSF.ORM.NHibernate4</id>
+    <version>2.0.0</version>
+    <title>ORM abstractions: Implementation for NHibernate 4</title>
+    <authors>craigfowler</authors>
+    <owners>craigfowler</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
+    <description>Implementation of the ORM abstractions for users of NHibernate version 4.x.</description>
+    <copyright>Copyright 2020 - CSF Software Limited</copyright>
+    <repository url="https://github.com/csf-dev/CSF.ORM" />
+    <dependencies>
+      <group targetFramework=".NETFramework4.5">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
+      </group>
+      <group targetFramework=".NETCoreApp2.0">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
+      </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="System.Configuration.ConfigurationManager" version="4.4.0" />
+        <dependency id="System.Data.SQLite.Core" version="1.0.112" />
+        <dependency id="System.Security.Permissions" version="4.4.0" />
+        <dependency id="System.ServiceModel.Primitives" version="4.4.0" />
+      </group>
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.5" />
+    </frameworkAssemblies>
+  </metadata>
+  <files>
+    <file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />
+    <file src="bin/Release/**/CSF.ORM.NHibernate*.xml" target="lib" />
+  </files>
+</package>
diff --git a/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj b/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj
@@ -12,7 +12,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions: Implementation for NHibernate 5</Title>
     <Description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -22,6 +22,8 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
     <RootNamespace>CSF.ORM.NHibernate</RootNamespace>
+    <NuspecFile>CSF.ORM.NHibernate5.nuspec</NuspecFile>
+    <NuspecProperties>Version=$(ReleaseVersion)</NuspecProperties>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.nuspec b/CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.nuspec
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>CSF.ORM.NHibernate5</id>
+    <version>0.0.0</version>
+    <title>ORM abstractions: Implementation for NHibernate 5</title>
+    <authors>craigfowler</authors>
+    <owners>craigfowler</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <projectUrl>https://github.com/csf-dev/CSF.ORM</projectUrl>
+    <description>Implementation of the ORM abstractions for users of NHibernate version 5.x.</description>
+    <copyright>Copyright 2020 - CSF Software Limited</copyright>
+    <repository url="https://github.com/csf-dev/CSF.ORM" />
+    <dependencies>
+      <group targetFramework=".NETFramework4.6.1">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[5.0.0,6.0.0)" />
+      </group>
+      <group targetFramework=".NETCoreApp2.0">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[5.0.0,6.0.0)" />
+      </group>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="CSF.ORM" version="[2.0.0,3.0.0)" />
+        <dependency id="Iesi.Collections" version="[4.0.0.4000,5.0.0)" />
+        <dependency id="NHibernate" version="[5.0.0,6.0.0)" />
+        <dependency id="System.Configuration.ConfigurationManager" version="4.4.0" />
+        <dependency id="System.Data.SQLite.Core" version="1.0.112" />
+        <dependency id="System.Security.Permissions" version="4.4.0" />
+        <dependency id="System.ServiceModel.Primitives" version="4.4.0" />
+      </group>
+    </dependencies>
+    <frameworkAssemblies>
+      <frameworkAssembly assemblyName="System.Configuration" targetFramework=".NETFramework4.6.1" />
+    </frameworkAssemblies>
+  </metadata>
+  <files>
+    <file src="bin/Release/**/CSF.ORM.NHibernate*.dll" target="lib" />
+    <file src="bin/Release/**/CSF.ORM.NHibernate*.xml" target="lib" />
+  </files>
+</package>
diff --git a/CSF.ORM.sln b/CSF.ORM.sln
@@ -174,6 +174,6 @@ Global
 		$0.NameConventionPolicy = $4
 		$4.Rules = $5
 		$5.NamingRule = $25
-		version = 2.0.0
+		version = 2.0.1
 	EndGlobalSection
 EndGlobal
diff --git a/CSF.ORM/CSF.ORM.csproj b/CSF.ORM/CSF.ORM.csproj
@@ -12,7 +12,7 @@
     <Authors>craigfowler</Authors>
     <Title>ORM abstractions</Title>
     <Description>Types which relate to the usage of an ORM, so that a business logic project does not need to depend upon the ORM directly.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj b/PersistenceTester/CSF.PersistenceTester.Core/CSF.PersistenceTester.Core.csproj
@@ -18,7 +18,7 @@
     <PackageId>CSF.PersistenceTester</PackageId>
     <Title>ORM persistence tester</Title>
     <Description>A utility for testing object/entity persistence when using an ORM.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <SonarQubeTestProject>false</SonarQubeTestProject>

diff --git a/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj b/PersistenceTester/CSF.PersistenceTester.NUnit/CSF.PersistenceTester.NUnit.csproj
@@ -18,7 +18,7 @@
     <PackageId>CSF.PersistenceTester.NUnit</PackageId>
     <Title>ORM persistence tester: NUnit integration</Title>
     <Description>An integration for the ORM persistence tester and NUnit 3.x.  Provides an NUnit constraint for asserting that the test passed.</Description>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <SonarQubeTestProject>false</SonarQubeTestProject>

diff --git a/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj b/Tests/CSF.CommonTestLogic/CSF.CommonTestLogic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
     <RootNamespace>CSF</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj b/Tests/CSF.Entities.Tests/CSF.Entities.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

diff --git a/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj b/Tests/CSF.ORM.NHibernate4.Tests/CSF.ORM.NHibernate4.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

diff --git a/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj b/Tests/CSF.ORM.NHibernate5.Tests/CSF.ORM.NHibernate5.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

diff --git a/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj b/Tests/CSF.ORM.Tests/CSF.ORM.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

diff --git a/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj b/Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <OutputType>Library</OutputType>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

diff --git a/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj b/Tests/CSF.PersistenceTester.Tests/CSF.PersistenceTester.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <OutputType>Library</OutputType>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.0.1</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />