Merge branch 'release/2.0.2' into production

craigfowler · craigfowler · commit 2b2e1d221bd6 · 2020-04-23T19:05:04.000+01:00
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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -49,9 +49,6 @@
       <LogicalName>Strings.resx.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Identity.cs" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Resources\ExceptionMessages.Designer.cs">
       <DependentUpon>ExceptionMessages.resx</DependentUpon>
@@ -63,7 +60,4 @@
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Identity.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
-  </ItemGroup>
 </Project>
diff --git a/CSF.Entities/Identity.cs b/CSF.Entities/Identity.cs
@@ -37,7 +37,7 @@ public static class Identity
     {
         static readonly IGetsIdentityType identityTypeProvider = new IdentityTypeProvider();
         static readonly ICreatesIdentity identityFactory = new IdentityFactory();
-        static readonly IUpCastsIdentity caster = new IdentityCaster();
+        static readonly ICastsIdentityType caster = new IdentityTypeCaster();
         static readonly IParsesIdentity parser = new IdentityParser();
 
         /// <summary>
@@ -69,7 +69,7 @@ public static IIdentity<TEntity> Parse<TEntity>(object value) where TEntity : IE
         /// <param name="identity">The identity to convert to a different entity type.</param>
         /// <typeparam name="TCast">The desired entity type.</typeparam>
         /// <exception cref="InvalidCastException">If the <paramref name="identity"/> is not suitable for the entity type <typeparamref name="TCast"/>.</exception>
-        public static IIdentity<TCast> Cast<TCast>(this IIdentity identity)
+        public static IIdentity<TCast> Cast<TCast>(this IIdentity identity) where TCast : IEntity
             => caster.CastIdentity<TCast>(identity);
     }
 }
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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</ReleaseVersion>
     <Version>$(ReleaseVersion)</Version>
     <PackageVersion>$(ReleaseVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/CSF.ORM.sln b/CSF.ORM.sln
@@ -15,10 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSF.ORM.Tests", "Tests\CSF.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{671772C1-0FCB-4B27-846D-329CBA7A1845}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\build.sh = Tools\build.sh
-		Tools\common-vars.txt = Tools\common-vars.txt
 		Tools\EnableNet45BuildOnUnix.targets = Tools\EnableNet45BuildOnUnix.targets
-		Tools\install.sh = Tools\install.sh
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSF.ORM.Entities", "CSF.ORM.Entities\CSF.ORM.Entities.csproj", "{3EF001E2-A559-42DB-A2DB-1A8629E7486D}"
@@ -174,6 +171,6 @@ Global
 		$0.NameConventionPolicy = $4
 		$4.Rules = $5
 		$5.NamingRule = $25
-		version = 2.0.1
+		version = 2.0.2
 	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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</ReleaseVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
diff --git a/Tests/CSF.Entities.Tests/IdentityTests.cs b/Tests/CSF.Entities.Tests/IdentityTests.cs
@@ -37,6 +37,7 @@ public void Equals_returns_false_for_two_identities_with_incompatible_entity_typ
             var identity2 = new Identity<long, Person>(5);
             Assert.That(identity1.Equals(identity2), Is.False);
         }
+
         [Test, AutoMoqData]
         public void Equals_operator_returns_true_for_two_equal_identities()
         {
@@ -69,6 +70,27 @@ public void Equals_operator_returns_false_for_two_identities_with_incompatible_e
             Assert.That(identity1 == identity2, Is.False);
         }
 
+        [Test, AutoMoqData]
+        public void Create_creates_identity_with_correct_value()
+        {
+            var identity = Identity.Create<Cat>(5);
+            Assert.That(identity.Value, Is.EqualTo(5));
+        }
+
+        [Test, AutoMoqData]
+        public void Parse_returns_identity_with_correct_value()
+        {
+            var identity = Identity.Parse<Cat>("66");
+            Assert.That(identity.Value, Is.EqualTo(66));
+        }
+
+        [Test, AutoMoqData]
+        public void Cast_returns_appropriate_identity()
+        {
+            var identity = new Identity<long,Animal>(5);
+            Assert.That(() => Identity.Cast<Cat>(identity).Value, Is.EqualTo(5));
+        }
+
         [Test, AutoMoqData]
         public void GetValueAsString_returns_correct_value()
         {
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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</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.1</ReleaseVersion>
+    <ReleaseVersion>2.0.2</ReleaseVersion>
   </PropertyGroup>
    
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
diff --git a/Tools/build.sh b/Tools/build.sh
diff --git a/Tools/common-vars.txt b/Tools/common-vars.txt
diff --git a/Tools/install.sh b/Tools/install.sh

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static class Identity`
`37`	`37`	`{`
`38`	`38`	`static readonly IGetsIdentityType identityTypeProvider = new IdentityTypeProvider();`
`39`	`39`	`static readonly ICreatesIdentity identityFactory = new IdentityFactory();`
`40`		`- static readonly IUpCastsIdentity caster = new IdentityCaster();`
	`40`	`+ static readonly ICastsIdentityType caster = new IdentityTypeCaster();`
`41`	`41`	`static readonly IParsesIdentity parser = new IdentityParser();`
`42`	`42`
`43`	`43`	`/// <summary>`
`@@ -69,7 +69,7 @@ public static IIdentity<TEntity> Parse<TEntity>(object value) where TEntity : IE`
`69`	`69`	`/// <param name="identity">The identity to convert to a different entity type.</param>`
`70`	`70`	`/// <typeparam name="TCast">The desired entity type.</typeparam>`
`71`	`71`	`/// <exception cref="InvalidCastException">If the <paramref name="identity"/> is not suitable for the entity type <typeparamref name="TCast"/>.</exception>`
`72`		`- public static IIdentity<TCast> Cast<TCast>(this IIdentity identity)`
	`72`	`+ public static IIdentity<TCast> Cast<TCast>(this IIdentity identity) where TCast : IEntity`
`73`	`73`	`=> caster.CastIdentity<TCast>(identity);`
`74`	`74`	`}`
`75`	`75`	`}`