Usage of nameof in ForeignKeyAttribute/InversePropertyAttribute

Author: codingdna2

src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpEntityTypeGenerator.cs

@@ -401,9 +401,16 @@ private void GenerateForeignKeyAttribute(INavigation navigation)
                 {
                     var foreignKeyAttribute = new AttributeWriter(nameof(ForeignKeyAttribute));
 
-                    foreignKeyAttribute.AddParameter(
-                        CSharpHelper.Literal(
-                            string.Join(",", navigation.ForeignKey.Properties.Select(p => p.Name))));
+                    if (navigation.ForeignKey.Properties.Count > 1)
+                    {
+                        foreignKeyAttribute.AddParameter(
+                                CSharpHelper.Literal(
+                                    string.Join(",", navigation.ForeignKey.Properties.Select(p => p.Name))));
+                    }
+                    else
+                    { 
+                        foreignKeyAttribute.AddParameter($"nameof({navigation.ForeignKey.Properties.First().Name})");
+                    }
 
                     NavPropertyAnnotations.Add(new Dictionary<string, object>
                     {
@@ -423,7 +430,11 @@ private void GenerateInversePropertyAttribute(INavigation navigation)
                 {
                     var inversePropertyAttribute = new AttributeWriter(nameof(InversePropertyAttribute));
 
-                    inversePropertyAttribute.AddParameter(CSharpHelper.Literal(inverseNavigation.Name));
+                    inversePropertyAttribute.AddParameter(
+                        !navigation.DeclaringEntityType.GetPropertiesAndNavigations().Any(
+                                m => m.Name == inverseNavigation.DeclaringEntityType.Name)
+                            ? $"nameof({inverseNavigation.DeclaringEntityType.Name}.{inverseNavigation.Name})"
+                            : CSharpHelper.Literal(inverseNavigation.Name));
 
                     NavPropertyAnnotations.Add(new Dictionary<string, object>
                     {

test/Scaffolding.Handlebars.Tests/ExpectedEntities.cs

@@ -96,7 +96,7 @@ public partial class Product
         public byte[] RowVersion { get; set; }
         public int? CategoryId { get; set; }
 
-        [ForeignKey(""CategoryId"")]
+        [ForeignKey(nameof(CategoryId))]
         [InverseProperty(""Product"")]
         public virtual Category Category { get; set; }
     }