Merge branch 'main' into feature/175-untyped-nodes

andrueastman · web-flow · commit 55af16f1ae6d · 2024-02-27T12:13:58.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added support for untyped nodes. (https://github.com/microsoft/kiota-abstractions-dotnet/issues/175)
 
+## [1.7.11] - 2024-02-26
+
+### Changed
+
+- Updated IParseNode enum methods `DynamicallyAccessedMembersAttribute` to `PublicFields`.
+- Fixed AOT compiler warnings from ILC.
+ 
 ## [1.7.10] - 2024-02-26
 
 ### Changed
diff --git a/src/RequestInformation.cs b/src/RequestInformation.cs
@@ -53,7 +53,7 @@ public RequestInformation(Method method, string urlTemplate, IDictionary<string,
         public void Configure<T>(Action<RequestConfiguration<T>>? requestConfiguration) where T : class, new()
 #endif
         {
-            if(requestConfiguration == null) return;
+            if (requestConfiguration == null) return;
             var requestConfig = new RequestConfiguration<T>();
             requestConfiguration(requestConfig);
             AddQueryParameters(requestConfig.QueryParameters);
@@ -69,36 +69,36 @@ public Uri URI
         {
             set
             {
-                if(value == null)
+                if (value == null)
                     throw new ArgumentNullException(nameof(value));
                 QueryParameters.Clear();
                 PathParameters.Clear();
                 _rawUri = value;
             }
             get
             {
-                if(_rawUri != null)
+                if (_rawUri != null)
                     return _rawUri;
-                else if(PathParameters.TryGetValue(RawUrlKey, out var rawUrl) &&
+                else if (PathParameters.TryGetValue(RawUrlKey, out var rawUrl) &&
                     rawUrl is string rawUrlString)
                 {
                     URI = new Uri(rawUrlString);
                     return _rawUri!;
                 }
                 else
                 {
-                    if(UrlTemplate?.IndexOf("{+baseurl}", StringComparison.OrdinalIgnoreCase) >= 0 && !PathParameters.ContainsKey("baseurl"))
+                    if (UrlTemplate?.IndexOf("{+baseurl}", StringComparison.OrdinalIgnoreCase) >= 0 && !PathParameters.ContainsKey("baseurl"))
                         throw new InvalidOperationException($"{nameof(PathParameters)} must contain a value for \"baseurl\" for the url to be built.");
 
                     var substitutions = new Dictionary<string, object>();
-                    foreach(var urlTemplateParameter in PathParameters)
+                    foreach (var urlTemplateParameter in PathParameters)
                     {
                         substitutions.Add(urlTemplateParameter.Key, GetSanitizedValues(urlTemplateParameter.Value));
                     }
 
-                    foreach(var queryStringParameter in QueryParameters)
+                    foreach (var queryStringParameter in QueryParameters)
                     {
-                        if(queryStringParameter.Value != null)
+                        if (queryStringParameter.Value != null)
                         {
                             substitutions.Add(queryStringParameter.Key, GetSanitizedValues(queryStringParameter.Value));
                         }
@@ -157,8 +157,8 @@ public Uri URI
         public void AddQueryParameters<T>(T source)
 #endif
         {
-            if(source == null) return;
-            foreach(var property in typeof(T)
+            if (source == null) return;
+            foreach (var property in typeof(T)
                                         .GetProperties()
                                         .Select(
                                             x => (
@@ -179,7 +179,7 @@ public void AddQueryParameters<T>(T source)
         private static object[] ExpandArray(Array collection)
         {
             var passedArray = new object[collection.Length];
-            for(var i = 0; i < collection.Length; i++)
+            for (var i = 0; i < collection.Length; i++)
             {
                 passedArray[i] = GetSanitizedValue(collection.GetValue(i)!);
             }
@@ -188,7 +188,7 @@ private static object[] ExpandArray(Array collection)
 
         private static object ReplaceEnumValueByStringRepresentation(object source)
         {
-            if(source is Enum enumValue && GetEnumName(enumValue) is string enumValueName)
+            if (source is Enum enumValue && GetEnumName(enumValue) is string enumValueName)
             {
                 return enumValueName;
             }
@@ -203,13 +203,17 @@ private static object ReplaceEnumValueByStringRepresentation(object source)
         {
             var type = value.GetType();
 
-            if(Enum.GetName(type, value) is not { } name)
+            if (Enum.GetName(type, value) is not { } name)
                 throw new ArgumentException($"Invalid Enum value {value} for enum of type {type}");
 
-            if(type.GetField(name)?.GetCustomAttribute<EnumMemberAttribute>() is { } attribute)
-                return attribute.Value;
+#if NET5_0_OR_GREATER
+            [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",
+                Justification = "Enumerating Enum fields is always trimming/AOT safe - https://github.com/dotnet/runtime/issues/97737")]
+#endif
+            static string? GetEnumMemberValue(Type enumType, string name) =>
+                enumType.GetField(name, BindingFlags.Static | BindingFlags.Public)?.GetCustomAttribute<EnumMemberAttribute>() is { } attribute ? attribute.Value : null;
 
-            return name.ToFirstCharacterLowerCase();
+            return GetEnumMemberValue(type, name) ?? name.ToFirstCharacterLowerCase();
         }
         /// <summary>
         /// The Request Headers.
@@ -220,7 +224,7 @@ private static object ReplaceEnumValueByStringRepresentation(object source)
         /// </summary>
         public void AddHeaders(RequestHeaders headers)
         {
-            if(headers == null) return;
+            if (headers == null) return;
             Headers.AddAll(headers);
         }
         /// <summary>
@@ -238,8 +242,8 @@ public void AddHeaders(RequestHeaders headers)
         /// <param name="options">The option to add.</param>
         public void AddRequestOptions(IEnumerable<IRequestOption> options)
         {
-            if(options == null) return;
-            foreach(var option in options.Where(x => x != null))
+            if (options == null) return;
+            foreach (var option in options.Where(x => x != null))
                 _requestOptions.AddOrReplace(option.GetType().FullName!, option);
         }
         /// <summary>
@@ -248,8 +252,8 @@ public void AddRequestOptions(IEnumerable<IRequestOption> options)
         /// <param name="options">Options to remove.</param>
         public void RemoveRequestOptions(params IRequestOption[] options)
         {
-            if(options.Length == 0) throw new ArgumentNullException(nameof(options));
-            foreach(var optionName in options.Where(x => x != null).Select(x => x.GetType().FullName))
+            if (options.Length == 0) throw new ArgumentNullException(nameof(options));
+            foreach (var optionName in options.Where(x => x != null).Select(x => x.GetType().FullName))
                 _requestOptions.Remove(optionName!);
         }
 
@@ -263,7 +267,7 @@ public void RemoveRequestOptions(params IRequestOption[] options)
         /// </summary>
         public void SetResponseHandler(IResponseHandler responseHandler)
         {
-            if(responseHandler == null)
+            if (responseHandler == null)
                 throw new ArgumentNullException(nameof(responseHandler));
 
             var responseHandlerOption = new ResponseHandlerOption
@@ -322,7 +326,7 @@ public void SetContentFromParsable<T>(IRequestAdapter requestAdapter, string con
             using var activity = _activitySource?.StartActivity(nameof(SetContentFromParsable));
             using var writer = GetSerializationWriter(requestAdapter, contentType, item);
             SetRequestType(item, activity);
-            if(item is MultipartBody mpBody)
+            if (item is MultipartBody mpBody)
             {
                 contentType += "; boundary=" + mpBody.Boundary;
                 mpBody.RequestAdapter = requestAdapter;
@@ -333,15 +337,15 @@ public void SetContentFromParsable<T>(IRequestAdapter requestAdapter, string con
         }
         private static void SetRequestType(object? result, Activity? activity)
         {
-            if(activity == null) return;
-            if(result == null) return;
+            if (activity == null) return;
+            if (result == null) return;
             activity.SetTag("com.microsoft.kiota.request.type", result.GetType().FullName);
         }
         private static ISerializationWriter GetSerializationWriter<T>(IRequestAdapter requestAdapter, string contentType, T item)
         {
-            if(string.IsNullOrEmpty(contentType)) throw new ArgumentNullException(nameof(contentType));
-            if(requestAdapter == null) throw new ArgumentNullException(nameof(requestAdapter));
-            if(item == null) throw new InvalidOperationException($"{nameof(item)} cannot be null");
+            if (string.IsNullOrEmpty(contentType)) throw new ArgumentNullException(nameof(contentType));
+            if (requestAdapter == null) throw new ArgumentNullException(nameof(requestAdapter));
+            if (item == null) throw new InvalidOperationException($"{nameof(item)} cannot be null");
             return requestAdapter.SerializationWriterFactory.GetSerializationWriter(contentType);
         }
         /// <summary>
@@ -372,7 +376,7 @@ public void SetContentFromScalar<T>(IRequestAdapter requestAdapter, string conte
             using var activity = _activitySource?.StartActivity(nameof(SetContentFromScalar));
             using var writer = GetSerializationWriter(requestAdapter, contentType, item);
             SetRequestType(item, activity);
-            switch(item)
+            switch (item)
             {
                 case string s:
                     writer.WriteStringValue(null, s);
diff --git a/src/serialization/IParseNode.cs b/src/serialization/IParseNode.cs
@@ -101,7 +101,7 @@ public interface IParseNode
         /// </summary>
         /// <returns>The collection of enum values.</returns>
 #if NET5_0_OR_GREATER
-        IEnumerable<T?> GetCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]T>() where T : struct, Enum;
+        IEnumerable<T?> GetCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>() where T : struct, Enum;
 #else
         IEnumerable<T?> GetCollectionOfEnumValues<T>() where T : struct, Enum;
 #endif
@@ -116,7 +116,7 @@ public interface IParseNode
         /// </summary>
         /// <returns>The enum value of the node.</returns>
 #if NET5_0_OR_GREATER
-        T? GetEnumValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]T>() where T : struct, Enum;
+        T? GetEnumValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>() where T : struct, Enum;
 #else
         T? GetEnumValue<T>() where T : struct, Enum;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public RequestInformation(Method method, string urlTemplate, IDictionary<string,`
`53`	`53`	`public void Configure<T>(Action<RequestConfiguration<T>>? requestConfiguration) where T : class, new()`
`54`	`54`	`#endif`
`55`	`55`	`{`
`56`		`- if(requestConfiguration == null) return;`
	`56`	`+ if (requestConfiguration == null) return;`
`57`	`57`	`var requestConfig = new RequestConfiguration<T>();`
`58`	`58`	`requestConfiguration(requestConfig);`
`59`	`59`	`AddQueryParameters(requestConfig.QueryParameters);`
`@@ -69,36 +69,36 @@ public Uri URI`
`69`	`69`	`{`
`70`	`70`	`set`
`71`	`71`	`{`
`72`		`- if(value == null)`
	`72`	`+ if (value == null)`
`73`	`73`	`throw new ArgumentNullException(nameof(value));`
`74`	`74`	`QueryParameters.Clear();`
`75`	`75`	`PathParameters.Clear();`
`76`	`76`	`_rawUri = value;`
`77`	`77`	`}`
`78`	`78`	`get`
`79`	`79`	`{`
`80`		`- if(_rawUri != null)`
	`80`	`+ if (_rawUri != null)`
`81`	`81`	`return _rawUri;`
`82`		`- else if(PathParameters.TryGetValue(RawUrlKey, out var rawUrl) &&`
	`82`	`+ else if (PathParameters.TryGetValue(RawUrlKey, out var rawUrl) &&`
`83`	`83`	`rawUrl is string rawUrlString)`
`84`	`84`	`{`
`85`	`85`	`URI = new Uri(rawUrlString);`
`86`	`86`	`return _rawUri!;`
`87`	`87`	`}`
`88`	`88`	`else`
`89`	`89`	`{`
`90`		`- if(UrlTemplate?.IndexOf("{+baseurl}", StringComparison.OrdinalIgnoreCase) >= 0 && !PathParameters.ContainsKey("baseurl"))`
	`90`	`+ if (UrlTemplate?.IndexOf("{+baseurl}", StringComparison.OrdinalIgnoreCase) >= 0 && !PathParameters.ContainsKey("baseurl"))`
`91`	`91`	`throw new InvalidOperationException($"{nameof(PathParameters)} must contain a value for \"baseurl\" for the url to be built.");`
`92`	`92`
`93`	`93`	`var substitutions = new Dictionary<string, object>();`
`94`		`- foreach(var urlTemplateParameter in PathParameters)`
	`94`	`+ foreach (var urlTemplateParameter in PathParameters)`
`95`	`95`	`{`
`96`	`96`	`substitutions.Add(urlTemplateParameter.Key, GetSanitizedValues(urlTemplateParameter.Value));`
`97`	`97`	`}`
`98`	`98`
`99`		`- foreach(var queryStringParameter in QueryParameters)`
	`99`	`+ foreach (var queryStringParameter in QueryParameters)`
`100`	`100`	`{`
`101`		`- if(queryStringParameter.Value != null)`
	`101`	`+ if (queryStringParameter.Value != null)`
`102`	`102`	`{`
`103`	`103`	`substitutions.Add(queryStringParameter.Key, GetSanitizedValues(queryStringParameter.Value));`
`104`	`104`	`}`
`@@ -157,8 +157,8 @@ public Uri URI`
`157`	`157`	`public void AddQueryParameters<T>(T source)`
`158`	`158`	`#endif`
`159`	`159`	`{`
`160`		`- if(source == null) return;`
`161`		`- foreach(var property in typeof(T)`
	`160`	`+ if (source == null) return;`
	`161`	`+ foreach (var property in typeof(T)`
`162`	`162`	`.GetProperties()`
`163`	`163`	`.Select(`
`164`	`164`	`x => (`
`@@ -179,7 +179,7 @@ public void AddQueryParameters<T>(T source)`
`179`	`179`	`private static object[] ExpandArray(Array collection)`
`180`	`180`	`{`
`181`	`181`	`var passedArray = new object[collection.Length];`
`182`		`- for(var i = 0; i < collection.Length; i++)`
	`182`	`+ for (var i = 0; i < collection.Length; i++)`
`183`	`183`	`{`
`184`	`184`	`passedArray[i] = GetSanitizedValue(collection.GetValue(i)!);`
`185`	`185`	`}`
`@@ -188,7 +188,7 @@ private static object[] ExpandArray(Array collection)`
`188`	`188`
`189`	`189`	`private static object ReplaceEnumValueByStringRepresentation(object source)`
`190`	`190`	`{`
`191`		`- if(source is Enum enumValue && GetEnumName(enumValue) is string enumValueName)`
	`191`	`+ if (source is Enum enumValue && GetEnumName(enumValue) is string enumValueName)`
`192`	`192`	`{`
`193`	`193`	`return enumValueName;`
`194`	`194`	`}`
`@@ -203,13 +203,17 @@ private static object ReplaceEnumValueByStringRepresentation(object source)`
`203`	`203`	`{`
`204`	`204`	`var type = value.GetType();`
`205`	`205`
`206`		`- if(Enum.GetName(type, value) is not { } name)`
	`206`	`+ if (Enum.GetName(type, value) is not { } name)`
`207`	`207`	`throw new ArgumentException($"Invalid Enum value {value} for enum of type {type}");`
`208`	`208`
`209`		`- if(type.GetField(name)?.GetCustomAttribute<EnumMemberAttribute>() is { } attribute)`
`210`		`- return attribute.Value;`
	`209`	`+#if NET5_0_OR_GREATER`
	`210`	`+ [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2070:UnrecognizedReflectionPattern",`
	`211`	`+ Justification = "Enumerating Enum fields is always trimming/AOT safe - https://github.com/dotnet/runtime/issues/97737")]`
	`212`	`+#endif`
	`213`	`+ static string? GetEnumMemberValue(Type enumType, string name) =>`
	`214`	`+ enumType.GetField(name, BindingFlags.Static \| BindingFlags.Public)?.GetCustomAttribute<EnumMemberAttribute>() is { } attribute ? attribute.Value : null;`
`211`	`215`
`212`		`- return name.ToFirstCharacterLowerCase();`
	`216`	`+ return GetEnumMemberValue(type, name) ?? name.ToFirstCharacterLowerCase();`
`213`	`217`	`}`
`214`	`218`	`/// <summary>`
`215`	`219`	`/// The Request Headers.`
`@@ -220,7 +224,7 @@ private static object ReplaceEnumValueByStringRepresentation(object source)`
`220`	`224`	`/// </summary>`
`221`	`225`	`public void AddHeaders(RequestHeaders headers)`
`222`	`226`	`{`
`223`		`- if(headers == null) return;`
	`227`	`+ if (headers == null) return;`
`224`	`228`	`Headers.AddAll(headers);`
`225`	`229`	`}`
`226`	`230`	`/// <summary>`
`@@ -238,8 +242,8 @@ public void AddHeaders(RequestHeaders headers)`
`238`	`242`	`/// <param name="options">The option to add.</param>`
`239`	`243`	`public void AddRequestOptions(IEnumerable<IRequestOption> options)`
`240`	`244`	`{`
`241`		`- if(options == null) return;`
`242`		`- foreach(var option in options.Where(x => x != null))`
	`245`	`+ if (options == null) return;`
	`246`	`+ foreach (var option in options.Where(x => x != null))`
`243`	`247`	`_requestOptions.AddOrReplace(option.GetType().FullName!, option);`
`244`	`248`	`}`
`245`	`249`	`/// <summary>`
`@@ -248,8 +252,8 @@ public void AddRequestOptions(IEnumerable<IRequestOption> options)`
`248`	`252`	`/// <param name="options">Options to remove.</param>`
`249`	`253`	`public void RemoveRequestOptions(params IRequestOption[] options)`
`250`	`254`	`{`
`251`		`- if(options.Length == 0) throw new ArgumentNullException(nameof(options));`
`252`		`- foreach(var optionName in options.Where(x => x != null).Select(x => x.GetType().FullName))`
	`255`	`+ if (options.Length == 0) throw new ArgumentNullException(nameof(options));`
	`256`	`+ foreach (var optionName in options.Where(x => x != null).Select(x => x.GetType().FullName))`
`253`	`257`	`_requestOptions.Remove(optionName!);`
`254`	`258`	`}`
`255`	`259`
`@@ -263,7 +267,7 @@ public void RemoveRequestOptions(params IRequestOption[] options)`
`263`	`267`	`/// </summary>`
`264`	`268`	`public void SetResponseHandler(IResponseHandler responseHandler)`
`265`	`269`	`{`
`266`		`- if(responseHandler == null)`
	`270`	`+ if (responseHandler == null)`
`267`	`271`	`throw new ArgumentNullException(nameof(responseHandler));`
`268`	`272`
`269`	`273`	`var responseHandlerOption = new ResponseHandlerOption`
`@@ -322,7 +326,7 @@ public void SetContentFromParsable<T>(IRequestAdapter requestAdapter, string con`
`322`	`326`	`using var activity = _activitySource?.StartActivity(nameof(SetContentFromParsable));`
`323`	`327`	`using var writer = GetSerializationWriter(requestAdapter, contentType, item);`
`324`	`328`	`SetRequestType(item, activity);`
`325`		`- if(item is MultipartBody mpBody)`
	`329`	`+ if (item is MultipartBody mpBody)`
`326`	`330`	`{`
`327`	`331`	`contentType += "; boundary=" + mpBody.Boundary;`
`328`	`332`	`mpBody.RequestAdapter = requestAdapter;`
`@@ -333,15 +337,15 @@ public void SetContentFromParsable<T>(IRequestAdapter requestAdapter, string con`
`333`	`337`	`}`
`334`	`338`	`private static void SetRequestType(object? result, Activity? activity)`
`335`	`339`	`{`
`336`		`- if(activity == null) return;`
`337`		`- if(result == null) return;`
	`340`	`+ if (activity == null) return;`
	`341`	`+ if (result == null) return;`
`338`	`342`	`activity.SetTag("com.microsoft.kiota.request.type", result.GetType().FullName);`
`339`	`343`	`}`
`340`	`344`	`private static ISerializationWriter GetSerializationWriter<T>(IRequestAdapter requestAdapter, string contentType, T item)`
`341`	`345`	`{`
`342`		`- if(string.IsNullOrEmpty(contentType)) throw new ArgumentNullException(nameof(contentType));`
`343`		`- if(requestAdapter == null) throw new ArgumentNullException(nameof(requestAdapter));`
`344`		`- if(item == null) throw new InvalidOperationException($"{nameof(item)} cannot be null");`
	`346`	`+ if (string.IsNullOrEmpty(contentType)) throw new ArgumentNullException(nameof(contentType));`
	`347`	`+ if (requestAdapter == null) throw new ArgumentNullException(nameof(requestAdapter));`
	`348`	`+ if (item == null) throw new InvalidOperationException($"{nameof(item)} cannot be null");`
`345`	`349`	`return requestAdapter.SerializationWriterFactory.GetSerializationWriter(contentType);`
`346`	`350`	`}`
`347`	`351`	`/// <summary>`
`@@ -372,7 +376,7 @@ public void SetContentFromScalar<T>(IRequestAdapter requestAdapter, string conte`
`372`	`376`	`using var activity = _activitySource?.StartActivity(nameof(SetContentFromScalar));`
`373`	`377`	`using var writer = GetSerializationWriter(requestAdapter, contentType, item);`
`374`	`378`	`SetRequestType(item, activity);`
`375`		`- switch(item)`
	`379`	`+ switch (item)`
`376`	`380`	`{`
`377`	`381`	`case string s:`
`378`	`382`	`writer.WriteStringValue(null, s);`