Merge pull request #1859 from microsoftgraph/dev

Release 5.8.0

.gitignore

@@ -36,3 +36,4 @@ UpgradeLog*.XML
 UpgradeLog*.htm
 
 .idea/
+*.log

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project does adheres to [Semantic Versioning](https://semver.org/spec/v
 
 ## [Unreleased]
 
+## [5.8.0] - 2023-04-27
+
+- Latest metadata updates from 25th April 2023
+- Drops orphaned collection models unnecessarily generated due to inheritance (https://github.com/microsoft/kiota/issues/2543)
+
 ## [5.7.0] - 2023-04-18
 
 - Latest metadata updates from 18th April 2023

src/Microsoft.Graph/Generated/Models/ChangeNotification.cs → src/Microsoft.Graph/Extensions/ChangeNotification.cs

@@ -1,4 +1,4 @@
-using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Abstractions.Store;
 using System.Collections.Generic;
 using System.IO;

src/Microsoft.Graph/Generated/Models/CommsNotification.cs → src/Microsoft.Graph/Extensions/ChangeNotificationCollection.cs

@@ -1,22 +1,50 @@
-using Microsoft.Kiota.Abstractions.Serialization;
-using Microsoft.Kiota.Abstractions.Store;
+using Microsoft.Kiota.Abstractions.Serialization;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System;
+using Microsoft.Kiota.Abstractions.Store;
+
 namespace Microsoft.Graph.Models {
-    public class CommsNotification : IAdditionalDataHolder, IBackedModel, IParsable {
+    public class ChangeNotificationCollection : IAdditionalDataHolder,IBackedModel, IParsable {
+        /// <summary>Stores model information.</summary>
+        public IBackingStore BackingStore { get; private set; }
         /// <summary>Stores additional data not described in the OpenAPI description found when deserializing. Can be used for serialization as well.</summary>
         public IDictionary<string, object> AdditionalData {
             get { return BackingStore?.Get<IDictionary<string, object>>("additionalData"); }
             set { BackingStore?.Set("additionalData", value); }
         }
-        /// <summary>Stores model information.</summary>
-        public IBackingStore BackingStore { get; private set; }
-        /// <summary>The changeType property</summary>
-        public Microsoft.Graph.Models.ChangeType? ChangeType {
-            get { return BackingStore?.Get<Microsoft.Graph.Models.ChangeType?>("changeType"); }
-            set { BackingStore?.Set("changeType", value); }
+        /// <summary>The value property</summary>
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
+#nullable enable
+        public List<ChangeNotification>? Value {
+            get { return BackingStore?.Get<List<ChangeNotification>?>("value"); }
+            set { BackingStore?.Set("value", value); }
+        }
+#nullable restore
+#else
+        public List<ChangeNotification> Value {
+            get { return BackingStore?.Get<List<ChangeNotification>>("value"); }
+            set { BackingStore?.Set("value", value); }
+        }
+#endif
+        /// <summary>
+        /// Creates a new instance of the appropriate class based on discriminator value
+        /// </summary>
+        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
+        public static ChangeNotificationCollection CreateFromDiscriminatorValue(IParseNode parseNode) {
+            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
+            return new ChangeNotificationCollection();
+        }
+        /// <summary>
+        /// The deserialization information for the current model
+        /// </summary>
+        public IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
+            return new Dictionary<string, Action<IParseNode>>() {
+                {"@odata.type", n => { OdataType = n.GetStringValue(); } },
+                {"validationTokens", n => { ValidationTokens = n.GetCollectionOfPrimitiveValues<string>()?.ToList(); } },
+                {"value", n => { Value = n.GetCollectionOfObjectValues<ChangeNotification>(ChangeNotification.CreateFromDiscriminatorValue)?.ToList(); } },
+            };
         }
         /// <summary>The OdataType property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -32,54 +60,29 @@ public string OdataType {
             set { BackingStore?.Set("@odata.type", value); }
         }
 #endif
-        /// <summary>URI of the resource that was changed.</summary>
+        /// <summary>The stopTones property</summary>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 #nullable enable
-        public string? ResourceUrl {
-            get { return BackingStore?.Get<string?>("resourceUrl"); }
-            set { BackingStore?.Set("resourceUrl", value); }
+        public List<string>? ValidationTokens {
+            get { return BackingStore?.Get<List<string>?>("validationTokens"); }
+            set { BackingStore?.Set("validationTokens", value); }
         }
 #nullable restore
 #else
-        public string ResourceUrl {
-            get { return BackingStore?.Get<string>("resourceUrl"); }
-            set { BackingStore?.Set("resourceUrl", value); }
+        public List<string> ValidationTokens {
+            get { return BackingStore?.Get<List<string>>("validationTokens"); }
+            set { BackingStore?.Set("validationTokens", value); }
         }
 #endif
-        /// <summary>
-        /// Instantiates a new commsNotification and sets the default values.
-        /// </summary>
-        public CommsNotification() {
-            BackingStore = BackingStoreFactorySingleton.Instance.CreateBackingStore();
-            AdditionalData = new Dictionary<string, object>();
-        }
-        /// <summary>
-        /// Creates a new instance of the appropriate class based on discriminator value
-        /// </summary>
-        /// <param name="parseNode">The parse node to use to read the discriminator value and create the object</param>
-        public static CommsNotification CreateFromDiscriminatorValue(IParseNode parseNode) {
-            _ = parseNode ?? throw new ArgumentNullException(nameof(parseNode));
-            return new CommsNotification();
-        }
-        /// <summary>
-        /// The deserialization information for the current model
-        /// </summary>
-        public IDictionary<string, Action<IParseNode>> GetFieldDeserializers() {
-            return new Dictionary<string, Action<IParseNode>> {
-                {"changeType", n => { ChangeType = n.GetEnumValue<ChangeType>(); } },
-                {"@odata.type", n => { OdataType = n.GetStringValue(); } },
-                {"resourceUrl", n => { ResourceUrl = n.GetStringValue(); } },
-            };
-        }
         /// <summary>
         /// Serializes information the current object
         /// </summary>
         /// <param name="writer">Serialization writer to use to serialize this model</param>
         public void Serialize(ISerializationWriter writer) {
             _ = writer ?? throw new ArgumentNullException(nameof(writer));
-            writer.WriteEnumValue<ChangeType>("changeType", ChangeType);
             writer.WriteStringValue("@odata.type", OdataType);
-            writer.WriteStringValue("resourceUrl", ResourceUrl);
+            writer.WriteCollectionOfObjectValues<ChangeNotification>("value", Value);
+            writer.WriteCollectionOfPrimitiveValues<string>("value", ValidationTokens);
             writer.WriteAdditionalData(AdditionalData);
         }
     }

src/Microsoft.Graph/Generated/Models/ChangeNotificationCollectionResponse.cs → src/Microsoft.Graph/Extensions/ChangeNotificationCollectionResponse.cs

@@ -1,4 +1,4 @@
-using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Serialization;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Microsoft.Graph/Generated/Models/ChangeNotificationEncryptedContent.cs → src/Microsoft.Graph/Extensions/ChangeNotificationEncryptedContent.cs

@@ -1,4 +1,4 @@
-using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Abstractions.Store;
 using System.Collections.Generic;
 using System.IO;

src/Microsoft.Graph/Generated/Models/ChangeType.cs → src/Microsoft.Graph/Extensions/ChangeType.cs

@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using System;
 namespace Microsoft.Graph.Models {
     public enum ChangeType {

src/Microsoft.Graph/Generated/Models/LifecycleEventType.cs → src/Microsoft.Graph/Extensions/LifeCycleEventType.cs

@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using System;
 namespace Microsoft.Graph.Models {
     public enum LifecycleEventType {

src/Microsoft.Graph/Generated/Models/ResourceData.cs → src/Microsoft.Graph/Extensions/ResourceData.cs

@@ -1,4 +1,4 @@
-using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Abstractions.Store;
 using System.Collections.Generic;
 using System.IO;

src/Microsoft.Graph/Generated/Models/ResourcePermission.cs → src/Microsoft.Graph/Extensions/ResourcePermission.cs

@@ -1,4 +1,4 @@
-using Microsoft.Kiota.Abstractions.Serialization;
+using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Abstractions.Store;
 using System.Collections.Generic;
 using System.IO;

src/Microsoft.Graph/Generated/Admin/Edge/InternetExplorerMode/SiteLists/Item/Publish/PublishRequestBuilder.cs

@@ -28,8 +28,7 @@ public PublishRequestBuilder(Dictionary<string, object> pathParameters, IRequest
         public PublishRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/admin/edge/internetExplorerMode/siteLists/{browserSiteList%2Did}/publish", rawUrl) {
         }
         /// <summary>
-        /// Publish the specified browserSiteList for devices to download.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/browsersitelist-publish?view=graph-rest-1.0" />
+        /// Invoke action publish
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
@@ -50,7 +49,7 @@ public async Task<BrowserSiteList> PostAsync(PublishPostRequestBody body, Action
             return await RequestAdapter.SendAsync<BrowserSiteList>(requestInfo, BrowserSiteList.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Publish the specified browserSiteList for devices to download.
+        /// Invoke action publish
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>

src/Microsoft.Graph/Generated/Admin/Edge/InternetExplorerMode/SiteLists/Item/SharedCookies/SharedCookiesRequestBuilder.cs

@@ -40,8 +40,7 @@ public SharedCookiesRequestBuilder(Dictionary<string, object> pathParameters, IR
         public SharedCookiesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/admin/edge/internetExplorerMode/siteLists/{browserSiteList%2Did}/sharedCookies{?%24top,%24skip,%24search,%24filter,%24count,%24orderby,%24select,%24expand}", rawUrl) {
         }
         /// <summary>
-        /// Get a list of the browserSharedCookie objects and their properties.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/browsersitelist-list-sharedcookies?view=graph-rest-1.0" />
+        /// A collection of shared cookies defined for the site list.
         /// </summary>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -60,8 +59,7 @@ public async Task<BrowserSharedCookieCollectionResponse> GetAsync(Action<SharedC
             return await RequestAdapter.SendAsync<BrowserSharedCookieCollectionResponse>(requestInfo, BrowserSharedCookieCollectionResponse.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Create a new browserSharedCookie object in a browserSiteList.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/browsersitelist-post-sharedcookies?view=graph-rest-1.0" />
+        /// Create new navigation property to sharedCookies for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
@@ -82,7 +80,7 @@ public async Task<BrowserSharedCookie> PostAsync(BrowserSharedCookie body, Actio
             return await RequestAdapter.SendAsync<BrowserSharedCookie>(requestInfo, BrowserSharedCookie.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Get a list of the browserSharedCookie objects and their properties.
+        /// A collection of shared cookies defined for the site list.
         /// </summary>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -108,7 +106,7 @@ public RequestInformation ToGetRequestInformation(Action<SharedCookiesRequestBui
             return requestInfo;
         }
         /// <summary>
-        /// Create a new browserSharedCookie object in a browserSiteList.
+        /// Create new navigation property to sharedCookies for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -136,7 +134,7 @@ public RequestInformation ToPostRequestInformation(BrowserSharedCookie body, Act
             return requestInfo;
         }
         /// <summary>
-        /// Get a list of the browserSharedCookie objects and their properties.
+        /// A collection of shared cookies defined for the site list.
         /// </summary>
         public class SharedCookiesRequestBuilderGetQueryParameters {
             /// <summary>Include count of items</summary>

src/Microsoft.Graph/Generated/Admin/Edge/InternetExplorerMode/SiteLists/Item/Sites/SitesRequestBuilder.cs

@@ -40,8 +40,7 @@ public SitesRequestBuilder(Dictionary<string, object> pathParameters, IRequestAd
         public SitesRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/admin/edge/internetExplorerMode/siteLists/{browserSiteList%2Did}/sites{?%24top,%24skip,%24search,%24filter,%24count,%24orderby,%24select,%24expand}", rawUrl) {
         }
         /// <summary>
-        /// Get a list of the browserSite objects and their properties.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/browsersitelist-list-sites?view=graph-rest-1.0" />
+        /// A collection of sites defined for the site list.
         /// </summary>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -60,8 +59,7 @@ public async Task<BrowserSiteCollectionResponse> GetAsync(Action<SitesRequestBui
             return await RequestAdapter.SendAsync<BrowserSiteCollectionResponse>(requestInfo, BrowserSiteCollectionResponse.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Create a new browserSite object in a browserSiteList.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/browsersitelist-post-sites?view=graph-rest-1.0" />
+        /// Create new navigation property to sites for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
@@ -82,7 +80,7 @@ public async Task<BrowserSite> PostAsync(BrowserSite body, Action<SitesRequestBu
             return await RequestAdapter.SendAsync<BrowserSite>(requestInfo, BrowserSite.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Get a list of the browserSite objects and their properties.
+        /// A collection of sites defined for the site list.
         /// </summary>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -108,7 +106,7 @@ public RequestInformation ToGetRequestInformation(Action<SitesRequestBuilderGetR
             return requestInfo;
         }
         /// <summary>
-        /// Create a new browserSite object in a browserSiteList.
+        /// Create new navigation property to sites for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -136,7 +134,7 @@ public RequestInformation ToPostRequestInformation(BrowserSite body, Action<Site
             return requestInfo;
         }
         /// <summary>
-        /// Get a list of the browserSite objects and their properties.
+        /// A collection of sites defined for the site list.
         /// </summary>
         public class SitesRequestBuilderGetQueryParameters {
             /// <summary>Include count of items</summary>

src/Microsoft.Graph/Generated/Admin/Edge/InternetExplorerMode/SiteLists/SiteListsRequestBuilder.cs

@@ -40,8 +40,7 @@ public SiteListsRequestBuilder(Dictionary<string, object> pathParameters, IReque
         public SiteListsRequestBuilder(string rawUrl, IRequestAdapter requestAdapter) : base(requestAdapter, "{+baseurl}/admin/edge/internetExplorerMode/siteLists{?%24top,%24skip,%24search,%24filter,%24count,%24orderby,%24select,%24expand}", rawUrl) {
         }
         /// <summary>
-        /// Get a list of the browserSiteList objects and their properties.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/internetexplorermode-list-sitelists?view=graph-rest-1.0" />
+        /// A collection of site lists to support Internet Explorer mode.
         /// </summary>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -60,8 +59,7 @@ public async Task<BrowserSiteListCollectionResponse> GetAsync(Action<SiteListsRe
             return await RequestAdapter.SendAsync<BrowserSiteListCollectionResponse>(requestInfo, BrowserSiteListCollectionResponse.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Create a new browserSiteList object to support Internet Explorer mode.
-        /// Find more info here <see href="https://docs.microsoft.com/graph/api/internetexplorermode-post-sitelists?view=graph-rest-1.0" />
+        /// Create new navigation property to siteLists for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="cancellationToken">Cancellation token to use when cancelling requests</param>
@@ -82,7 +80,7 @@ public async Task<BrowserSiteList> PostAsync(BrowserSiteList body, Action<SiteLi
             return await RequestAdapter.SendAsync<BrowserSiteList>(requestInfo, BrowserSiteList.CreateFromDiscriminatorValue, errorMapping, cancellationToken);
         }
         /// <summary>
-        /// Get a list of the browserSiteList objects and their properties.
+        /// A collection of site lists to support Internet Explorer mode.
         /// </summary>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -108,7 +106,7 @@ public RequestInformation ToGetRequestInformation(Action<SiteListsRequestBuilder
             return requestInfo;
         }
         /// <summary>
-        /// Create a new browserSiteList object to support Internet Explorer mode.
+        /// Create new navigation property to siteLists for admin
         /// </summary>
         /// <param name="body">The request body</param>
         /// <param name="requestConfiguration">Configuration for the request such as headers, query parameters, and middleware options.</param>
@@ -136,7 +134,7 @@ public RequestInformation ToPostRequestInformation(BrowserSiteList body, Action<
             return requestInfo;
         }
         /// <summary>
-        /// Get a list of the browserSiteList objects and their properties.
+        /// A collection of site lists to support Internet Explorer mode.
         /// </summary>
         public class SiteListsRequestBuilderGetQueryParameters {
             /// <summary>Include count of items</summary>