From ac00794de1e9c8f6d6be114af12bdee2bcb907b6 Mon Sep 17 00:00:00 2001 From: "FAREAST\\vidadhee" Date: Thu, 7 Feb 2019 14:35:56 +0530 Subject: [PATCH] Change Models template to ClientModels to facilitate generation of MSGraphClientModels file and relevant imports --- Templates/ObjC/Models/{Models.h.tt => ClientModels.h.tt} | 0 Templates/ObjC/Models/ComplexType.m.tt | 2 +- Templates/ObjC/Models/EntityType.m.tt | 2 +- Templates/Templates.csproj | 2 +- src/GraphODataTemplateWriter/.config/ObjCSettings.json | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename Templates/ObjC/Models/{Models.h.tt => ClientModels.h.tt} (100%) diff --git a/Templates/ObjC/Models/Models.h.tt b/Templates/ObjC/Models/ClientModels.h.tt similarity index 100% rename from Templates/ObjC/Models/Models.h.tt rename to Templates/ObjC/Models/ClientModels.h.tt diff --git a/Templates/ObjC/Models/ComplexType.m.tt b/Templates/ObjC/Models/ComplexType.m.tt index a61ccb351..f53c16b7f 100644 --- a/Templates/ObjC/Models/ComplexType.m.tt +++ b/Templates/ObjC/Models/ComplexType.m.tt @@ -7,7 +7,7 @@ var complexType = host.CurrentType.AsOdcmClass(); #import "NSDate+MSSerialization.h" -#import "<#=writer.GetPrefix()#>Models.h" +#import "<#=writer.GetPrefix()#>ClientModels.h" @interface <#=writer.GetStaticCodePrefix()#>Object() diff --git a/Templates/ObjC/Models/EntityType.m.tt b/Templates/ObjC/Models/EntityType.m.tt index 6feaf4707..70c8c6133 100644 --- a/Templates/ObjC/Models/EntityType.m.tt +++ b/Templates/ObjC/Models/EntityType.m.tt @@ -7,7 +7,7 @@ var entity = host.CurrentType.AsOdcmClass(); #import "NSDate+MSSerialization.h" -#import "<#=writer.GetPrefix()#>Models.h" +#import "<#=writer.GetPrefix()#>ClientModels.h" @interface <#=GetStaticBaseObject()#>() diff --git a/Templates/Templates.csproj b/Templates/Templates.csproj index 99acf023d..15d1f3d09 100644 --- a/Templates/Templates.csproj +++ b/Templates/Templates.csproj @@ -295,7 +295,7 @@ - + diff --git a/src/GraphODataTemplateWriter/.config/ObjCSettings.json b/src/GraphODataTemplateWriter/.config/ObjCSettings.json index 988070e0c..6f30053da 100644 --- a/src/GraphODataTemplateWriter/.config/ObjCSettings.json +++ b/src/GraphODataTemplateWriter/.config/ObjCSettings.json @@ -14,7 +14,7 @@ ], "ObjC": [ - { "Template": "Models", "SubProcessor": "Other", "Type": "Model", "Name": "Models" }, + { "Template": "ClientModels", "SubProcessor": "Other", "Type": "Model", "Name": "ClientModels" }, { "Template": "ODataEntities", "SubProcessor": "Other", "Type": "Model", "Name": "ODataEntities" } ] }