Release fixes

Xriuk · Nov 3, 2024 · b7eb889 · b7eb889
1 parent 4d83988
commit b7eb889
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <!-- https://stackoverflow.com/a/73098203 -->
 <Project>
 	<PropertyGroup>
-		<GlobalVersion>4.0.0</GlobalVersion>
+		<GlobalVersion>5.0.0</GlobalVersion>
 	</PropertyGroup>
 
 	<Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">

diff --git a/NeatMapper.sln b/NeatMapper.sln
@@ -26,6 +26,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Transitive", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Transitive.Tests", "tests\NeatMapper.Transitive.Tests\NeatMapper.Transitive.Tests.csproj", "{21985D54-BC4E-4AD0-9BD2-3A464DC70B39}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{027237DB-F12C-4E23-97DB-3D19EB5DA8B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{847968A8-7996-4775-90AD-5ECA41158046}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -70,6 +74,17 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{85B6709D-BE31-4AE8-B3DA-3B4354B9B091} = {027237DB-F12C-4E23-97DB-3D19EB5DA8B9}
+		{FBD19EAA-E57C-4D8E-ACDD-9AADDD1A510B} = {847968A8-7996-4775-90AD-5ECA41158046}
+		{451EB7D4-1B8F-4C28-ADFB-9C2CD4D10238} = {027237DB-F12C-4E23-97DB-3D19EB5DA8B9}
+		{82BAA0C8-230A-4A76-8B78-85C7798A8717} = {847968A8-7996-4775-90AD-5ECA41158046}
+		{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C} = {027237DB-F12C-4E23-97DB-3D19EB5DA8B9}
+		{F0BEC814-7965-40DB-8CB5-3C832F4BC3D5} = {027237DB-F12C-4E23-97DB-3D19EB5DA8B9}
+		{D670753D-AE9E-40FD-8CFE-B3FE6F870231} = {847968A8-7996-4775-90AD-5ECA41158046}
+		{F6243270-A118-4ADF-8911-3D2AA9144E09} = {027237DB-F12C-4E23-97DB-3D19EB5DA8B9}
+		{21985D54-BC4E-4AD0-9BD2-3A464DC70B39} = {847968A8-7996-4775-90AD-5ECA41158046}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4CA409D6-80E0-44B8-849F-FC10D4BCE178}
 	EndGlobalSection

diff --git a/...erEntityFrameworkCoreChangelog - Copia.md → ...NeatMapperEntityFrameworkCoreChangelog.md b/...erEntityFrameworkCoreChangelog - Copia.md → ...NeatMapperEntityFrameworkCoreChangelog.md
diff --git a/docs/advanced-options/mappers-capabilities.md b/docs/advanced-options/mappers-capabilities.md
@@ -28,7 +28,7 @@ This will check and will return true if the mapper/matcher can map the two given
 
 # List types
 
-You can also retrieve a list of all available maps for a given mapper/matcher/projector (if supported by it), by using the extension methods.
+You can also retrieve a list of all available maps for a given mapper/projector (if supported by it), by using the extension methods.
 
 `IMapper`:
 

diff --git a/src/NeatMapper.EntityFrameworkCore/CHANGELOG.md b/src/NeatMapper.EntityFrameworkCore/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [5.0.0] - Unreleased
+## [5.0.0] - 2024-11-03
 
 ### Removed
 

diff --git a/src/NeatMapper.EntityFrameworkCore/Matchers/EntityFrameworkCoreMatcher.cs b/src/NeatMapper.EntityFrameworkCore/Matchers/EntityFrameworkCoreMatcher.cs
@@ -475,7 +475,7 @@ bool CanMatchInternal(
 				modelEntities
 					.Select(e => {
 						var eKey = e.FindPrimaryKey();
-						if(eKey == null)
+						if(eKey == null || eKey.Properties.Count < 1)
 							return null;
 						else { 
 							return string.Join("~", eKey.Properties
@@ -484,7 +484,6 @@ bool CanMatchInternal(
 						}
 					})
 					.Distinct()
-					.Where(k => !string.IsNullOrEmpty(k))
 					.Count() != 1) {
 
 				return false;

diff --git a/src/NeatMapper.EntityFrameworkCore/NeatMapper.EntityFrameworkCore.csproj b/src/NeatMapper.EntityFrameworkCore/NeatMapper.EntityFrameworkCore.csproj
@@ -10,7 +10,7 @@
 		<Description>Creates automatic maps and projections between entities and their keys (even composite and shadow keys), supports normal maps and asynchronous ones, also supports collections (not nested).</Description>
 		<PackageProjectUrl>https://www.neatmapper.org/ef-core/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Xriuk/NeatMapper/tree/main/src/NeatMapper.EntityFrameworkCore</RepositoryUrl>
-		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/ef-core/changelog#400---2024-07-16</PackageReleaseNotes>
+		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/ef-core/changelog#500---2024-11-03</PackageReleaseNotes>
 		<Copyright>Xriuk</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -41,7 +41,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\NeatMapper\NeatMapper.csproj" PackageVersion="[4,5)" />
+		<ProjectReference Include="..\NeatMapper\NeatMapper.csproj" PackageVersion="[5,6)" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/NeatMapper.Transitive/CHANGELOG.md b/src/NeatMapper.Transitive/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
 
-## [5.0.0] - Unreleased
+## [5.0.0] - 2024-11-03
 
 - Initial version (version matching NeatMapper package)
diff --git a/src/NeatMapper.Transitive/NeatMapper.Transitive.csproj b/src/NeatMapper.Transitive/NeatMapper.Transitive.csproj
@@ -10,7 +10,7 @@
 		<Description>Allows mapping types by automatically chaining maps together, eg: If you have maps for types A -&gt; B and B -&gt; C you can also map A -&gt; C by chaining A -&gt; B -&gt; C, supports normal maps and asynchronous ones, also supports collections.</Description>
 		<PackageProjectUrl>https://www.neatmapper.org/transitive/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Xriuk/NeatMapper/tree/main/src/NeatMapper.Transitive</RepositoryUrl>
-		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/transitive/changelog#400---2024-07-16</PackageReleaseNotes>
+		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/transitive/changelog#500---2024-11-03</PackageReleaseNotes>
 		<Copyright>Xriuk</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\NeatMapper\NeatMapper.csproj" PackageVersion="[4,5)" />
+		<ProjectReference Include="..\NeatMapper\NeatMapper.csproj" PackageVersion="[5,6)" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/NeatMapper/CHANGELOG.md b/src/NeatMapper/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [5.0.0] - Unreleased
+## [5.0.0] - 2024-11-03
 
 ### Removed
 

diff --git a/src/NeatMapper/NeatMapper.csproj b/src/NeatMapper/NeatMapper.csproj
@@ -10,7 +10,7 @@
     <Description>Object mapper and projector, with configurable and reusable mappings. Supports collections, generic types and asynchronous mappings. Also supports projections (expressions).</Description>
 		<PackageProjectUrl>https://www.neatmapper.org</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Xriuk/NeatMapper/tree/main/src/NeatMapper</RepositoryUrl>
-		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/changelog#400---2024-07-16</PackageReleaseNotes>
+		<PackageReleaseNotes>See full changelog at https://www.neatmapper.org/changelog#500---2024-11-03</PackageReleaseNotes>
     <PackAsTool>False</PackAsTool>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <IncludeSymbols>True</IncludeSymbols>

diff --git a/tests/NeatMapper.EntityFrameworkCore.Tests/TestContext.cs b/tests/NeatMapper.EntityFrameworkCore.Tests/TestContext.cs
@@ -67,10 +67,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
 
 
 			modelBuilder.Entity<StringFieldKey>()
-				.HasKey(e => e.Id);
+				.HasKey("Id");
 
 			modelBuilder.Entity<IntFieldKey>()
-				.HasKey(e => e.Id);
+				.HasKey("Id");
 		}
 	}
 }