MarimerLLC#1101 Update snippets to use nameof()

rockfordlhotka · Jun 3, 2019 · cecc8bc · cecc8bc
1 parent 1a70708
commit cecc8bc
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 32 deletions.
diff --git a/Support/Snippets/cs/AddACriteriaClass.snippet b/Support/Snippets/cs/AddACriteriaClass.snippet
@@ -43,7 +43,7 @@
       <Code Language="CSharp" Kind="type decl"><![CDATA[[Serializable()]
       private class $ClassName$ : CriteriaBase
       {
-        public static readonly PropertyInfo<$IdType$> $IdProperty$Property = RegisterProperty<$IdType$>(c => c.$IdProperty$);
+        public static readonly PropertyInfo<$IdType$> $IdProperty$Property = RegisterProperty<$IdType$>(nameof($IdProperty$));
         public $IdType$ $IdProperty$
         {
           get { return ReadProperty($IdProperty$Property); }

diff --git a/Support/Snippets/cs/DefineACslaChildProperty.snippet b/Support/Snippets/cs/DefineACslaChildProperty.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(c => c.$PropertyName$, RelationshipTypes.Child);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(nameof($PropertyName$), RelationshipTypes.Child);
 public $ChildType$ $PropertyName$
 {
   get { return GetProperty($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaChildPropertyWithAsyncLazyLoad.snippet b/Support/Snippets/cs/DefineACslaChildPropertyWithAsyncLazyLoad.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(c => c.$PropertyName$, RelationshipTypes.Child | RelationshipTypes.LazyLoad);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(nameof($PropertyName$), RelationshipTypes.Child | RelationshipTypes.LazyLoad);
 public $ChildType$ $PropertyName$
 {
   get 

diff --git a/Support/Snippets/cs/DefineACslaChildPropertyWithSyncLazyLoad.snippet b/Support/Snippets/cs/DefineACslaChildPropertyWithSyncLazyLoad.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(c => c.$PropertyName$, RelationshipTypes.Child | RelationshipTypes.LazyLoad);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ChildType$> $PropertyName$Property = RegisterProperty<$ChildType$>(nameof($PropertyName$), RelationshipTypes.Child | RelationshipTypes.LazyLoad);
 public $ChildType$ $PropertyName$
 {
   get 

diff --git a/Support/Snippets/cs/DefineACslaIntergraphReference.snippet b/Support/Snippets/cs/DefineACslaIntergraphReference.snippet
@@ -36,7 +36,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ReferencedType$> $PropertyName$Property = RegisterProperty<$ReferencedType$>(c => c.$PropertyName$, RelationshipTypes.PrivateField);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ReferencedType$> $PropertyName$Property = RegisterProperty<$ReferencedType$>(nameof($PropertyName$), RelationshipTypes.PrivateField);
 [NotUndoable]
 private $ReferencedType$ $PrivateFieldName$ = $PropertyName$Property.DefaultValue;
 public $ReferencedType$ $PropertyName$

diff --git a/Support/Snippets/cs/DefineACslaMethod.snippet b/Support/Snippets/cs/DefineACslaMethod.snippet
@@ -22,7 +22,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static MethodInfo $MethodName$Method = RegisterMethod(c => c.$MethodName$());
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static MethodInfo $MethodName$Method = RegisterMethod(nameof($MethodName$));
 public void $MethodName$()
 {
   // Check Authorization, trows UserNotAuthorizedException if not authorized

diff --git a/Support/Snippets/cs/DefineACslaProperty.snippet b/Support/Snippets/cs/DefineACslaProperty.snippet
@@ -36,7 +36,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return GetProperty($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaPropertyWithConversion.snippet b/Support/Snippets/cs/DefineACslaPropertyWithConversion.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ManagedFieldType$> $PropertyName$Property = RegisterProperty<$ManagedFieldType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ManagedFieldType$> $PropertyName$Property = RegisterProperty<$ManagedFieldType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return GetPropertyConvert<$ManagedFieldType$, $PropertyType$>($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaPropertyWithNoAuthorizationOrDirty.snippet b/Support/Snippets/cs/DefineACslaPropertyWithNoAuthorizationOrDirty.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return ReadProperty($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaPropertyWithPrivateBackingField.snippet b/Support/Snippets/cs/DefineACslaPropertyWithPrivateBackingField.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$, RelationshipTypes.PrivateField);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$), RelationshipTypes.PrivateField);
 // [NotUndoable, NonSerialized]
 private $PropertyType$ $PrivateFieldName$ = $PropertyName$Property.DefaultValue;
 public $PropertyType$ $PropertyName$

diff --git a/Support/Snippets/cs/DefineACslaReadonlyProperty.snippet b/Support/Snippets/cs/DefineACslaReadonlyProperty.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return GetProperty($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaReadonlyPropertyWithConversion.snippet b/Support/Snippets/cs/DefineACslaReadonlyPropertyWithConversion.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ManagedFieldType$> $PropertyName$Property = RegisterProperty<$ManagedFieldType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$ManagedFieldType$> $PropertyName$Property = RegisterProperty<$ManagedFieldType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return GetPropertyConvert<$ManagedFieldType$, $PropertyType$>($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaReadonlyPropertyWithNoAuthorization.snippet b/Support/Snippets/cs/DefineACslaReadonlyPropertyWithNoAuthorization.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$));
 public $PropertyType$ $PropertyName$
 {
   get { return ReadProperty($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaReadonlyPropertyWithPrivateBackingField.snippet b/Support/Snippets/cs/DefineACslaReadonlyPropertyWithPrivateBackingField.snippet
@@ -50,7 +50,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(c => c.$PropertyName$, RelationshipTypes.PrivateField);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$PropertyType$> $PropertyName$Property = RegisterProperty<$PropertyType$>(nameof($PropertyName$), RelationshipTypes.PrivateField);
 private $PropertyType$ $PrivateFieldName$ = $PropertyName$Property.DefaultValue;
 public $PropertyType$ $PropertyName$
 {

diff --git a/Support/Snippets/cs/DefineACslaSmartDateProperty.snippet b/Support/Snippets/cs/DefineACslaSmartDateProperty.snippet
@@ -22,7 +22,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<SmartDate> $PropertyName$Property = RegisterProperty<SmartDate>(c => c.$PropertyName$, null, new SmartDate());
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<SmartDate> $PropertyName$Property = RegisterProperty<SmartDate>(nameof($PropertyName$), null, new SmartDate());
 public string $PropertyName$
 {
 	get { return GetPropertyConvert<SmartDate, string>($PropertyName$Property); }

diff --git a/Support/Snippets/cs/DefineACslaUsingReference.snippet b/Support/Snippets/cs/DefineACslaUsingReference.snippet
@@ -36,7 +36,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$UsingType$> $PropertyName$Property = RegisterProperty<$UsingType$>(c => c.$PropertyName$, RelationshipTypes.PrivateField);
+      <Code Language="csharp" Kind="method decl"><![CDATA[public static readonly PropertyInfo<$UsingType$> $PropertyName$Property = RegisterProperty<$UsingType$>(nameof($PropertyName$), RelationshipTypes.PrivateField);
 [NotUndoable, NonSerialized]
 private $UsingType$ $PrivateFieldName$ = $PropertyName$Property.DefaultValue;
 public $UsingType$ $PropertyName$

diff --git a/Support/Snippets/vb/AddACriteriaClass.snippet b/Support/Snippets/vb/AddACriteriaClass.snippet
@@ -43,7 +43,7 @@
       <Code Language="VB" Kind="type decl"><![CDATA[<Serializable()> _
 Private Class $ClassName$ Inherits CriteriaBase
 
-Public Shared ReadOnly $IdProperty$Property As PropertyInfo(Of $IdType$) = RegisterProperty(Of $IdType$)(Function(c) c.$IdProperty$)
+Public Shared ReadOnly $IdProperty$Property As PropertyInfo(Of $IdType$) = RegisterProperty(Of $IdType$)(NameOf($IdProperty$))
 Public Property $IdProperty$() As $IdType$
     Get
         Return ReadProperty($IdProperty$Property)

diff --git a/Support/Snippets/vb/DefineACslaChildProperty.snippet b/Support/Snippets/vb/DefineACslaChildProperty.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(Function(p) p.$PropertyName$, Nothing, RelationshipTypes.Child)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(NameOf($IdProperty$), Nothing, RelationshipTypes.Child)
   Public Property $PropertyName$() As $ChildType$
     Get
       Return GetProperty(Of $ChildType$)($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaChildPropertyWithAsyncLazyLoad.snippet b/Support/Snippets/vb/DefineACslaChildPropertyWithAsyncLazyLoad.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(Function(p) p.$PropertyName$, RelationshipTypes.Child)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(NameOf($IdProperty$), RelationshipTypes.Child)
     Property Property $PropertyName$() As $ChildType$
     Public Get
       If Not FieldManager.FieldExists($PropertyName$Property) Then

diff --git a/Support/Snippets/vb/DefineACslaChildPropertyWithSyncLazyLoad.snippet b/Support/Snippets/vb/DefineACslaChildPropertyWithSyncLazyLoad.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(Function(p) p.$PropertyName$, RelationshipTypes.Child)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ChildType$) = RegisterProperty(Of $ChildType$)(NameOf($IdProperty$), RelationshipTypes.Child)
   Public Property $PropertyName$() As $ChildType$
     Get
       If Not FieldManager.FieldExists($PropertyName$Property) Then 

diff --git a/Support/Snippets/vb/DefineACslaIntergraphReference.snippet b/Support/Snippets/vb/DefineACslaIntergraphReference.snippet
@@ -36,7 +36,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ReferencedType$) = RegisterProperty(Of $ReferencedType$)(Function(c) c.$PropertyName$, RelationshipTypes.PrivateField)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ReferencedType$) = RegisterProperty(Of $ReferencedType$)(NameOf($IdProperty$), RelationshipTypes.PrivateField)
 <NotUndoable> _
 Private $PrivateFieldName$ As $ReferencedType$ = $PropertyName$Property.DefaultValue
 Public Property $PropertyName$() As $ReferencedType$

diff --git a/Support/Snippets/vb/DefineACslaMethod.snippet b/Support/Snippets/vb/DefineACslaMethod.snippet
@@ -22,7 +22,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared $MethodName$Method As MethodInfo = RegisterMethod(Function(c) c.$MethodName$())
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared $MethodName$Method As MethodInfo = RegisterMethod(NameOf($MethodName$))
 Public Sub $MethodName$()
   ' Check Authorization, trows UserNotAuthorizedException if not authorized
   CanExecuteMethod($MethodName$Method, True)

diff --git a/Support/Snippets/vb/DefineACslaProperty.snippet b/Support/Snippets/vb/DefineACslaProperty.snippet
@@ -54,7 +54,7 @@
           <Type>Object</Type>
         </Object>
       </Declarations>
-      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$)
+      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$))
 Public Property $PropertyName$() As $PropertyType$
     Get
         Return GetProperty($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaPropertyWithConversion.snippet b/Support/Snippets/vb/DefineACslaPropertyWithConversion.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ManagedFieldType$) = RegisterProperty(Of $ManagedFieldType$)(Function(c) c.$PropertyName$)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $ManagedFieldType$) = RegisterProperty(Of $ManagedFieldType$)(NameOf($IdProperty$))
 Public Property $PropertyName$() As $PropertyType$
 	Get
 		Return GetPropertyConvert(Of $ManagedFieldType$, $PropertyType$)(PropertyNameProperty)

diff --git a/Support/Snippets/vb/DefineACslaPropertyWithNoAuthorizationOrDirty.snippet b/Support/Snippets/vb/DefineACslaPropertyWithNoAuthorizationOrDirty.snippet
@@ -29,7 +29,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$))
 Public Property $PropertyName$() As $PropertyType$
     Get
         Return ReadProperty($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaPropertyWithPrivateBackingField.snippet b/Support/Snippets/vb/DefineACslaPropertyWithPrivateBackingField.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$, RelationshipTypes.PrivateField)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$), RelationshipTypes.PrivateField)
 '<NotUndoable, NonSerialized> _
 Private $PrivateField$Name As $PropertyType$ = $PropertyName$Property.DefaultValue
 Public Property $PropertyName$() As $PropertyType$

diff --git a/Support/Snippets/vb/DefineACslaReadonlyProperty.snippet b/Support/Snippets/vb/DefineACslaReadonlyProperty.snippet
@@ -54,7 +54,7 @@
           <Type>Object</Type>
         </Object>
       </Declarations>
-      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$)
+      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$))
 Public Property $PropertyName$() As $PropertyType$
     Get
         Return GetProperty($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaReadonlyPropertyWithConversion.snippet b/Support/Snippets/vb/DefineACslaReadonlyPropertyWithConversion.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$, Nothing, New $PropertyType$())
+      <Code Language="csharp" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$), Nothing, New $PropertyType$())
 Public Property $PropertyName$() As $FieldType$
     Get
         Return GetPropertyConvert(Of $PropertyType$, $FieldType$)($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaReadonlyPropertyWithNoAuthorization.snippet b/Support/Snippets/vb/DefineACslaReadonlyPropertyWithNoAuthorization.snippet
@@ -43,7 +43,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$))
 Public Property $PropertyName$() As $PropertyType$
     Get
         Return ReadProperty($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaReadonlyPropertyWithPrivateBackingField.snippet b/Support/Snippets/vb/DefineACslaReadonlyPropertyWithPrivateBackingField.snippet
@@ -50,7 +50,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="csharp" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(Function(c) c.$PropertyName$, RelationshipTypes.PrivateField)
+      <Code Language="csharp" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $PropertyType$) = RegisterProperty(Of $PropertyType$)(NameOf($IdProperty$), RelationshipTypes.PrivateField)
 Private $PrivateFieldName$ As $PropertyType$ = $PropertyName$Property.DefaultValue
 Public Property $PropertyName$() As $PropertyType$
 	Get

diff --git a/Support/Snippets/vb/DefineACslaSmartDateProperty.snippet b/Support/Snippets/vb/DefineACslaSmartDateProperty.snippet
@@ -24,7 +24,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of SmartDate) = RegisterProperty(Of SmartDate)(Function(c) c.$PropertyName$, Nothing, New SmartDate())
+      <Code Language="vb" Kind="method decl" Delimiter="$"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of SmartDate) = RegisterProperty(Of SmartDate)(NameOf($IdProperty$), Nothing, New SmartDate())
 Public Property $PropertyName$() As String
     Get
         Return GetPropertyConvert(Of SmartDate, String)($PropertyName$Property)

diff --git a/Support/Snippets/vb/DefineACslaUsingReference.snippet b/Support/Snippets/vb/DefineACslaUsingReference.snippet
@@ -36,7 +36,7 @@
           </Function>
         </Literal>
       </Declarations>
-      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $UsingType$) = RegisterProperty(Of $UsingType$)(Function(c) c.$PropertyName$, RelationshipTypes.PrivateField)
+      <Code Language="vb" Kind="method decl"><![CDATA[Public Shared ReadOnly $PropertyName$Property As PropertyInfo(Of $UsingType$) = RegisterProperty(Of $UsingType$)(NameOf($IdProperty$), RelationshipTypes.PrivateField)
 <NotUndoable, NonSerialized> _
 Private $PrivateField$Name As $UsingType$ = $PropertyName$Property.DefaultValue
 Public ReadOnly Property $PropertyName$() As $UsingType$