Merge pull request #855 from microsoftgraph/dev

Release to main

Author: andrueastman

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         submodules: recursive
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.0.0
+      uses: actions/setup-dotnet@v3.0.2
       with:
         dotnet-version: 6.0.x
     - name: Restore dependencies

Templates/templates/PHP/Model/EntityType.php.tt

@@ -188,7 +188,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
     * <#=property.GetSanitizedLongDescription()#>
 <# } #>
     *
-    * @return <#=propertyTypeReference#>|null The <#=propertyName#>
+    * @return <#=(property.IsCollection()) ? "array" : propertyTypeReference#>|null The <#=propertyName#>
     */
     public function get<#=propertyName.ToCheckedCase()#>()
     {
@@ -216,7 +216,7 @@ foreach(var property in entity.Properties.Where(prop => prop.Type.GetTypeString(
     * <#=property.GetSanitizedLongDescription()#>
 <# } #>
     *
-    * @param <#=propertyTypeReference#> $val The <#=propertyName#>
+    * @param <#=(property.IsCollection()) ? $"{propertyTypeReference}[]" : propertyTypeReference#> $val The <#=propertyName#>
     *
     * @return <#=entityName.ToCheckedCase()#>
     */

apidoctor

@@ -730,10 +730,10 @@ public static List<OdcmProperty> GetComposableFunctionReturnTypeNavigations(this
                 throw new InvalidOperationException("This extension method is intended " +
                                                     "to only be called on a composable function.");
 
-            return (odcmMethod.ReturnType as OdcmClass).Properties
+            return (odcmMethod.ReturnType as OdcmClass)?.Properties
                                                        .Where(p => p.IsLink)
                                                        .OrderBy(p => p.Name)
-                                                       .ToList();
+                                                       .ToList() ?? new List<OdcmProperty>(); // default to empty list
         }
 
         /// <summary>

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -54,7 +54,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Mono.TextTemplating">
-      <Version>2.2.1</Version>
+      <Version>2.3.0</Version>
     </PackageReference>
     <PackageReference Include="NLog.Config">
       <Version>4.7.15</Version>

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -10,6 +10,7 @@
             </EntityType>
             <EntityType Name="testType" BaseType="graph.entity">
                 <Property Name="propertyAlpha" Type="graph.derivedComplexTypeRequest" />
+                <Property Name="primitiveCollection" Type="Collection(Edm.String)" />
             </EntityType>
             <EnumType Name="enum1">
                 <Member Name="value0" Value="0" />

submodules/vipr

@@ -9,5 +9,6 @@
 @interface MSGraphTestType : MSGraphEntity
 
   @property (nullable, nonatomic, setter=setPropertyAlpha:, getter=propertyAlpha) MSGraphDerivedComplexTypeRequest* propertyAlpha;
+    @property (nullable, nonatomic, setter=setPrimitiveCollection:, getter=primitiveCollection) NSArray* primitiveCollection;
 
 @end

test/Typewriter.Test/Metadata/MetadataWithSubNamespaces.xml

@@ -15,6 +15,7 @@ @interface MSObject()
 @interface MSGraphTestType()
 {
     MSGraphDerivedComplexTypeRequest* _propertyAlpha;
+    NSArray* _primitiveCollection;
 }
 @end
 
@@ -41,5 +42,19 @@ - (void) setPropertyAlpha: (MSGraphDerivedComplexTypeRequest*) val
     self.dictionary[@"propertyAlpha"] = val;
 }
 
+- (NSArray*) primitiveCollection
+{
+    if([[NSNull null] isEqual:self.dictionary[@"primitiveCollection"]])
+    {
+        return nil;
+    }   
+    return self.dictionary[@"primitiveCollection"];
+}
+
+- (void) setPrimitiveCollection: (NSArray*) val
+{
+    self.dictionary[@"primitiveCollection"] = val;
+}
+
 
 @end

test/Typewriter.Test/TestDataObjC/Models/MSGraphTestType.h

@@ -55,4 +55,31 @@ public function setPropertyAlpha($val)
         return $this;
     }
 
+    /**
+    * Gets the primitiveCollection
+    *
+    * @return array|null The primitiveCollection
+    */
+    public function getPrimitiveCollection()
+    {
+        if (array_key_exists("primitiveCollection", $this->_propDict)) {
+            return $this->_propDict["primitiveCollection"];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+    * Sets the primitiveCollection
+    *
+    * @param string[] $val The primitiveCollection
+    *
+    * @return TestType
+    */
+    public function setPrimitiveCollection($val)
+    {
+        $this->_propDict["primitiveCollection"] = $val;
+        return $this;
+    }
+
 }