Update CodeGenReferences for updated identifier mappings

OData · Jun 6, 2023 · 2b659c5 · 2b659c5
1 parent 79daad1
commit 2b659c5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/test/ODataConnectedService.Tests/CodeGenReferences/DupNames.cs b/test/ODataConnectedService.Tests/CodeGenReferences/DupNames.cs
@@ -281,7 +281,6 @@ public static DupWithTypeName CreateDupWithTypeName(global::System.Guid dupWithT
         /// There are no comments for Property dupWithTypeName in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupWithTypeName")]
         public virtual global::System.Nullable<int> dupWithTypeName
         {
             get
@@ -325,7 +324,6 @@ public static DupWithTypeName CreateDupWithTypeName(global::System.Guid dupWithT
         /// There are no comments for Property dupWithTypeName1 in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupWithTypeName1")]
         [global::System.ComponentModel.DataAnnotations.RequiredAttribute(ErrorMessage = "dupWithTypeName1 is required.")]
         public virtual global::System.Guid dupWithTypeName1
         {
@@ -413,7 +411,6 @@ public static DupWithTypeName CreateDupWithTypeName(global::System.Guid dupWithT
         /// There are no comments for Property dupPropertyName in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupPropertyName")]
         public virtual global::System.Collections.ObjectModel.Collection<global::DupNames.DupWithTypeName1> dupPropertyName
         {
             get
@@ -463,7 +460,6 @@ public partial class DupWithComplexTypeName
         /// There are no comments for Property dupWithComplexTypeName in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupWithComplexTypeName")]
         public virtual global::System.Nullable<int> dupWithComplexTypeName
         {
             get
@@ -506,7 +502,6 @@ public virtual string DupWithComplexTypeName1
         /// There are no comments for Property _DupWithComplexTypeName2 in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("_DupWithComplexTypeName2")]
         public virtual global::System.Nullable<int> _DupWithComplexTypeName2
         {
             get
@@ -528,7 +523,6 @@ public virtual string DupWithComplexTypeName1
         /// There are no comments for Property __DupWithComplexTypeName2 in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("__DupWithComplexTypeName2")]
         public virtual global::System.Nullable<int> __DupWithComplexTypeName2
         {
             get
@@ -597,7 +591,6 @@ public static DupWithTypeName1 CreateDupWithTypeName1(global::System.Guid dupWit
         /// There are no comments for Property dupWithTypeName in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupWithTypeName")]
         [global::System.ComponentModel.DataAnnotations.RequiredAttribute(ErrorMessage = "dupWithTypeName is required.")]
         public virtual global::System.Guid dupWithTypeName
         {
@@ -620,7 +613,6 @@ public static DupWithTypeName1 CreateDupWithTypeName1(global::System.Guid dupWit
         /// There are no comments for Property dupwithtypeName in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        [global::Microsoft.OData.Client.OriginalNameAttribute("dupwithtypeName")]
         [global::System.ComponentModel.DataAnnotations.RequiredAttribute(ErrorMessage = "dupwithtypeName is required.")]
         public virtual global::System.Guid dupwithtypeName
         {

diff --git a/test/ODataConnectedService.Tests/CodeGenReferences/DupNamesDSC.vb b/test/ODataConnectedService.Tests/CodeGenReferences/DupNamesDSC.vb
@@ -260,7 +260,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property dupWithTypeName in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("dupWithTypeName")>  _
         Public Overridable Property dupWithTypeName() As Global.System.Nullable(Of Integer)
             Get
                 Return Me._dupWithTypeName
@@ -305,7 +304,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property dupWithTypeName1 in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("dupWithTypeName1")>  _
         <Global.System.ComponentModel.DataAnnotations.RequiredAttribute()>  _
         Public Overridable Property dupWithTypeName1() As Global.System.Guid
             Get
@@ -394,7 +392,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property dupPropertyName in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("dupPropertyName")>  _
         Public Overridable Property dupPropertyName() As Global.Microsoft.OData.Client.DataServiceCollection(Of DupNames.DSC.DupWithTypeName1)
             Get
                 Return Me._dupPropertyName
@@ -459,7 +456,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property dupWithComplexTypeName in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("dupWithComplexTypeName")>  _
         Public Overridable Property dupWithComplexTypeName() As Global.System.Nullable(Of Integer)
             Get
                 Return Me._dupWithComplexTypeName
@@ -502,7 +498,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property _DupWithComplexTypeName2 in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("_DupWithComplexTypeName2")>  _
         Public Overridable Property _DupWithComplexTypeName2() As Global.System.Nullable(Of Integer)
             Get
                 Return Me.__DupWithComplexTypeName21
@@ -524,7 +519,6 @@ Namespace DupNames.DSC
         ''' There are no comments for Property __DupWithComplexTypeName2 in the schema.
         ''' </summary>
         <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")>  _
-        <Global.Microsoft.OData.Client.OriginalNameAttribute("__DupWithComplexTypeName2")>  _
         Public Overridable Property __DupWithComplexTypeName2() As Global.System.Nullable(Of Integer)
             Get
                 Return Me.___DupWithComplexTypeName2

diff --git a/test/ODataConnectedService.Tests/CodeGenReferences/KeywordsAsNames.cs b/test/ODataConnectedService.Tests/CodeGenReferences/KeywordsAsNames.cs
@@ -24,6 +24,7 @@ public New(global::System.Uri serviceRoot) :
                 this(serviceRoot, global::Microsoft.OData.Client.ODataProtocolVersion.V4)
         {
         }
+
         /// <summary>
         /// Initialize a new New object.
         /// </summary>
@@ -183,26 +184,26 @@ public eventSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<@event>
             : base(query) { }
 
         /// <summary>
-        /// There are no comments for event in the schema.
+        /// There are no comments for event1 in the schema.
         /// </summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        public virtual global::Namespace1.eventSingle @event
+        public virtual global::Namespace1.eventSingle event1
         {
             get
             {
                 if (!this.IsComposable)
                 {
                     throw new global::System.NotSupportedException("The previous function is not composable.");
                 }
-                if ((this._event == null))
+                if ((this._event1 == null))
                 {
-                    this._event = new global::Namespace1.eventSingle(this.Context, GetPath("event"));
+                    this._event1 = new global::Namespace1.eventSingle(this.Context, GetPath("event"));
                 }
-                return this._event;
+                return this._event1;
             }
         }
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
-        private global::Namespace1.eventSingle _event;
+        private global::Namespace1.eventSingle _event1;
     }
     /// <summary>
     /// There are no comments for event in the schema.

diff --git a/test/ODataConnectedService.Tests/CodeGenReferences/PrefixConflictDSC.vb b/test/ODataConnectedService.Tests/CodeGenReferences/PrefixConflictDSC.vb
@@ -26,6 +26,7 @@ Namespace PrefixConflict.DSC
         Public Sub New(ByVal serviceRoot As Global.System.Uri)
             Me.New(serviceRoot, Global.Microsoft.OData.Client.ODataProtocolVersion.V4)
         End Sub
+
         ''' <summary>
         ''' Initialize a new EntityContainer object.
         ''' </summary>