Skip to content

Commit

Permalink
Merge pull request #908 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Release 3.25
  • Loading branch information
zengin committed Feb 18, 2021
2 parents cebdee3 + b9d4a16 commit 942bbd1
Show file tree
Hide file tree
Showing 224 changed files with 3,760 additions and 429 deletions.
Expand Up @@ -88,7 +88,7 @@ public CallRecord()

/// <summary>
/// Gets or sets version.
/// Monotonically increasing version of the call record. Higher version call records with the same id includes additional data compared to the lower version.
/// Monotonically increasing version of the call record. Higher version call records with the same ID includes additional data compared to the lower version.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "version", Required = Newtonsoft.Json.Required.Default)]
public Int64? Version { get; set; }
Expand Down
Expand Up @@ -39,7 +39,7 @@ public AadUserConversationMember()

/// <summary>
/// Gets or sets user id.
/// The guid of the user.
/// The GUID of the user.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "userId", Required = Newtonsoft.Json.Required.Default)]
public string UserId { get; set; }
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.Graph/Generated/model/AdministrativeUnit.cs
Expand Up @@ -46,7 +46,7 @@ public AdministrativeUnit()

/// <summary>
/// Gets or sets visibility.
/// Controls whether the administrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
/// Controls whether the adminstrative unit and its members are hidden or public. Can be set to HiddenMembership or Public. If not set, default behavior is Public. When set to HiddenMembership, only members of the administrative unit can list other members of the adminstrative unit.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "visibility", Required = Newtonsoft.Json.Required.Default)]
public string Visibility { get; set; }
Expand All @@ -67,6 +67,7 @@ public AdministrativeUnit()

/// <summary>
/// Gets or sets extensions.
/// The collection of open extensions defined for this Administrative Unit. Nullable.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "extensions", Required = Newtonsoft.Json.Required.Default)]
public IAdministrativeUnitExtensionsCollectionPage Extensions { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Graph/Generated/model/Alert.cs
Expand Up @@ -143,6 +143,7 @@ public Alert()

/// <summary>
/// Gets or sets history states.
/// A collection of alertHistoryStates comprising an audit log of all updates made to an alert.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "historyStates", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<AlertHistoryState> HistoryStates { get; set; }
Expand Down
7 changes: 7 additions & 0 deletions src/Microsoft.Graph/Generated/model/AlertHistoryState.cs
Expand Up @@ -32,42 +32,49 @@ public AlertHistoryState()

/// <summary>
/// Gets or sets appId.
/// The Application ID of the calling application that submitted an update (PATCH) to the alert. The appId should be extracted from the auth token and not entered manually by the calling application.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "appId", Required = Newtonsoft.Json.Required.Default)]
public string AppId { get; set; }

/// <summary>
/// Gets or sets assignedTo.
/// UPN of user the alert was assigned to (note: alert.assignedTo only stores the last value/UPN).
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "assignedTo", Required = Newtonsoft.Json.Required.Default)]
public string AssignedTo { get; set; }

/// <summary>
/// Gets or sets comments.
/// Comment entered by signed-in user.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "comments", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<string> Comments { get; set; }

/// <summary>
/// Gets or sets feedback.
/// Analyst feedback on the alert in this update. Possible values are: unknown, truePositive, falsePositive, benignPositive.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "feedback", Required = Newtonsoft.Json.Required.Default)]
public AlertFeedback? Feedback { get; set; }

/// <summary>
/// Gets or sets status.
/// Alert status value (if updated). Possible values are: unknown, newAlert, inProgress, resolved, dismissed.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "status", Required = Newtonsoft.Json.Required.Default)]
public AlertStatus? Status { get; set; }

/// <summary>
/// Gets or sets updatedDateTime.
/// Date and time of the alert update. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 would look like this: '2014-01-01T00:00:00Z'
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "updatedDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? UpdatedDateTime { get; set; }

/// <summary>
/// Gets or sets user.
/// UPN of the signed-in user that updated the alert (taken from the bearer token - if in user/delegated auth mode).
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "user", Required = Newtonsoft.Json.Required.Default)]
public string User { get; set; }
Expand Down
Expand Up @@ -32,14 +32,14 @@ public AndroidManagedAppProtection()

/// <summary>
/// Gets or sets custom browser display name.
/// Friendly name of the preferred custom browser to open weblink on Android. When this property is configured, ManagedBrowserToOpenLinksRequired should be true.
/// Friendly name of the preferred custom browser to open weblink on Android.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "customBrowserDisplayName", Required = Newtonsoft.Json.Required.Default)]
public string CustomBrowserDisplayName { get; set; }

/// <summary>
/// Gets or sets custom browser package id.
/// Unique identifier of the preferred custom browser to open weblink on Android. When this property is configured, ManagedBrowserToOpenLinksRequired should be true.
/// Unique identifier of a custom browser to open weblink on Android.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "customBrowserPackageId", Required = Newtonsoft.Json.Required.Default)]
public string CustomBrowserPackageId { get; set; }
Expand Down
16 changes: 9 additions & 7 deletions src/Microsoft.Graph/Generated/model/Application.cs
Expand Up @@ -46,7 +46,7 @@ public Application()

/// <summary>
/// Gets or sets app id.
/// The unique identifier for the application that is assigned to an application by Azure AD. Not nullable. Read-only.
/// The unique identifier for the application that is assigned by Azure AD. Not nullable. Read-only.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "appId", Required = Newtonsoft.Json.Required.Default)]
public string AppId { get; set; }
Expand Down Expand Up @@ -86,21 +86,21 @@ public Application()

/// <summary>
/// Gets or sets group membership claims.
/// Configures the groups claim issued in a user or OAuth 2.0 access token that the application expects. To set this attribute, use one of the following valid string values:NoneSecurityGroup: For security groups and Azure AD rolesAll: This gets all of the security groups, distribution groups, and Azure AD directory roles that the signed-in user is a member of.
/// Configures the groups claim issued in a user or OAuth 2.0 access token that the application expects. To set this attribute, use one of the following string values:NoneSecurityGroup: For security groups and Azure AD rolesAll: This gets all of the security groups, distribution groups, and Azure AD directory roles that the signed-in user is a member of.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "groupMembershipClaims", Required = Newtonsoft.Json.Required.Default)]
public string GroupMembershipClaims { get; set; }

/// <summary>
/// Gets or sets identifier uris.
/// The URIs that identify the application within its Azure AD tenant, or within a verified custom domain if the application is multi-tenant. For more information see Application Objects and Service Principal Objects. The any operator is required for filter expressions on multi-valued properties. Not nullable.
/// The URIs that identify the application within its Azure AD tenant, or within a verified custom domain if the application is multi-tenant. For more information, see Application Objects and Service Principal Objects. The any operator is required for filter expressions on multi-valued properties. Not nullable.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "identifierUris", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<string> IdentifierUris { get; set; }

/// <summary>
/// Gets or sets info.
/// Basic profile information of the application such as app's marketing, support, terms of service and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more info, see How to: Add Terms of service and privacy statement for registered Azure AD apps.
/// Basic profile information of the application, such as it's marketing, support, terms of service, and privacy statement URLs. The terms of service and privacy statement are surfaced to users through the user consent experience. For more information, see How to: Add Terms of service and privacy statement for registered Azure AD apps.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "info", Required = Newtonsoft.Json.Required.Default)]
public InformationalUrl Info { get; set; }
Expand All @@ -113,7 +113,7 @@ public Application()

/// <summary>
/// Gets or sets is fallback public client.
/// Specifies the fallback application type as public client, such as an installed application running on a mobile device. The default value is false which means the fallback application type is confidential client such as a web app. There are certain scenarios where Azure AD cannot determine the client application type. For example, the ROPC flow where it is configured without specifying a redirect URI. In those cases Azure AD interprets the application type based on the value of this property.
/// Specifies the fallback application type as public client, such as an installed application running on a mobile device. The default value is false which means the fallback application type is confidential client such as a web app. There are certain scenarios where Azure AD cannot determine the client application type. For example, the ROPC flow where the application is configured without specifying a redirect URI. In those cases Azure AD interprets the application type based on the value of this property.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "isFallbackPublicClient", Required = Newtonsoft.Json.Required.Default)]
public bool? IsFallbackPublicClient { get; set; }
Expand Down Expand Up @@ -174,7 +174,7 @@ public Application()

/// <summary>
/// Gets or sets publisher domain.
/// The verified publisher domain for the application. Read-only. For more information, see How to: Configure an application's publisher domain.
/// The verified publisher domain for the application. Read-only.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "publisherDomain", Required = Newtonsoft.Json.Required.Default)]
public string PublisherDomain { get; set; }
Expand All @@ -188,13 +188,14 @@ public Application()

/// <summary>
/// Gets or sets sign in audience.
/// Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single tenant)AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.For authenticating users with Azure AD B2C user flows, use AzureADandPersonalMicrosoftAccount. This value allows for the widest set of user identities including local accounts and user identities from Microsoft, Facebook, Google, Twitter, or any OpenID Connect provider.
/// Specifies the Microsoft accounts that are supported for the current application. Supported values are:AzureADMyOrg: Users with a Microsoft work or school account in my organization’s Azure AD tenant (single-tenant).AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (multi-tenant).AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant.PersonalMicrosoftAccount: Users with a personal Microsoft account only.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "signInAudience", Required = Newtonsoft.Json.Required.Default)]
public string SignInAudience { get; set; }

/// <summary>
/// Gets or sets spa.
/// Specifies settings for a single-page application, including sign out URLs and redirect URIs for authorization codes and access tokens.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "spa", Required = Newtonsoft.Json.Required.Default)]
public SpaApplication Spa { get; set; }
Expand Down Expand Up @@ -255,6 +256,7 @@ public Application()

/// <summary>
/// Gets or sets token lifetime policies.
/// The tokenLifetimePolicies assigned to this application.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "tokenLifetimePolicies", Required = Newtonsoft.Json.Required.Default)]
public IApplicationTokenLifetimePoliciesCollectionWithReferencesPage TokenLifetimePolicies { get; set; }
Expand Down
58 changes: 58 additions & 0 deletions src/Microsoft.Graph/Generated/model/ApplicationServicePrincipal.cs
@@ -0,0 +1,58 @@
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

// **NOTE** This file was generated by a tool and any changes will be overwritten.
// <auto-generated/>

// Template Source: ComplexType.cs.tt

namespace Microsoft.Graph
{
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization;
using Newtonsoft.Json;

/// <summary>
/// The type ApplicationServicePrincipal.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(DerivedTypeConverter))]
public partial class ApplicationServicePrincipal
{
/// <summary>
/// Initializes a new instance of the <see cref="ApplicationServicePrincipal"/> class.
/// </summary>
public ApplicationServicePrincipal()
{
this.ODataType = "microsoft.graph.applicationServicePrincipal";
}

/// <summary>
/// Gets or sets application.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "application", Required = Newtonsoft.Json.Required.Default)]
public Application Application { get; set; }

/// <summary>
/// Gets or sets servicePrincipal.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "servicePrincipal", Required = Newtonsoft.Json.Required.Default)]
public ServicePrincipal ServicePrincipal { get; set; }

/// <summary>
/// Gets or sets additional data.
/// </summary>
[JsonExtensionData(ReadData = true)]
public IDictionary<string, object> AdditionalData { get; set; }

/// <summary>
/// Gets or sets @odata.type.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "@odata.type", Required = Newtonsoft.Json.Required.Default)]
public string ODataType { get; set; }

}
}

0 comments on commit 942bbd1

Please sign in to comment.