Skip to content

Commit

Permalink
Release 3.21 -Merge pull request #859 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MIchaelMainer committed Dec 8, 2020
2 parents 291fea3 + 6ffbdda commit 6d401d8
Show file tree
Hide file tree
Showing 73 changed files with 3,575 additions and 430 deletions.
6 changes: 6 additions & 0 deletions .editorconfig
@@ -0,0 +1,6 @@
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs

# All files
[*]
indent_style = space
indent_size = 4
5 changes: 5 additions & 0 deletions Microsoft.Graph.sln
Expand Up @@ -10,6 +10,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph", "src\Micr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph.DotnetCore.Test", "tests\Microsoft.Graph.DotnetCore.Test\Microsoft.Graph.DotnetCore.Test.csproj", "{A46FC884-EDDC-4617-9B52-37017A90241D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{483C32A2-1573-4E4D-9DE9-39C4CEAAA29C}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
30 changes: 30 additions & 0 deletions src/Microsoft.Graph/Generated/model/Alert.cs
Expand Up @@ -37,6 +37,12 @@ public Alert()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "activityGroupName", Required = Newtonsoft.Json.Required.Default)]
public string ActivityGroupName { get; set; }

/// <summary>
/// Gets or sets alert detections.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "alertDetections", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<AlertDetection> AlertDetections { get; set; }

/// <summary>
/// Gets or sets assigned to.
/// Name of the analyst the alert is assigned to for triage, investigation, or remediation (supports update).
Expand Down Expand Up @@ -155,6 +161,18 @@ public Alert()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "incidentIds", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<string> IncidentIds { get; set; }

/// <summary>
/// Gets or sets investigation security states.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "investigationSecurityStates", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<InvestigationSecurityState> InvestigationSecurityStates { get; set; }

/// <summary>
/// Gets or sets last event date time.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "lastEventDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? LastEventDateTime { get; set; }

/// <summary>
/// Gets or sets last modified date time.
/// Time at which the alert entity was last modified. 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'.
Expand All @@ -169,6 +187,12 @@ public Alert()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "malwareStates", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<MalwareState> MalwareStates { get; set; }

/// <summary>
/// Gets or sets message security states.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "messageSecurityStates", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<MessageSecurityState> MessageSecurityStates { get; set; }

/// <summary>
/// Gets or sets network connections.
/// Security-related stateful information generated by the provider about the network connection(s) related to this alert.
Expand Down Expand Up @@ -246,6 +270,12 @@ public Alert()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "triggers", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<AlertTrigger> Triggers { get; set; }

/// <summary>
/// Gets or sets uri click security states.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "uriClickSecurityStates", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<UriClickSecurityState> UriClickSecurityStates { get; set; }

/// <summary>
/// Gets or sets user states.
/// Security-related stateful information generated by the provider about the user accounts related to this alert.
Expand Down
64 changes: 64 additions & 0 deletions src/Microsoft.Graph/Generated/model/AlertDetection.cs
@@ -0,0 +1,64 @@
// ------------------------------------------------------------------------------
// 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: Templates\CSharp\Model\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 AlertDetection.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(DerivedTypeConverter))]
public partial class AlertDetection
{
/// <summary>
/// Initializes a new instance of the <see cref="AlertDetection"/> class.
/// </summary>
public AlertDetection()
{
this.ODataType = "microsoft.graph.alertDetection";
}

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

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

/// <summary>
/// Gets or sets name.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "name", Required = Newtonsoft.Json.Required.Default)]
public string Name { 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; }

}
}
48 changes: 48 additions & 0 deletions src/Microsoft.Graph/Generated/model/AllowInvitesFrom.cs
@@ -0,0 +1,48 @@
// ------------------------------------------------------------------------------
// 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: Templates\CSharp\Model\EnumType.cs.tt


namespace Microsoft.Graph
{
using Newtonsoft.Json;

/// <summary>
/// The enum AllowInvitesFrom.
/// </summary>
[JsonConverter(typeof(EnumConverter))]
public enum AllowInvitesFrom
{

/// <summary>
/// None
/// </summary>
None = 0,

/// <summary>
/// Admins And Guest Inviters
/// </summary>
AdminsAndGuestInviters = 1,

/// <summary>
/// Admins Guest Inviters And All Members
/// </summary>
AdminsGuestInvitersAndAllMembers = 2,

/// <summary>
/// Everyone
/// </summary>
Everyone = 3,

/// <summary>
/// Unknown Future Value
/// </summary>
UnknownFutureValue = 4,

}
}
2 changes: 1 addition & 1 deletion src/Microsoft.Graph/Generated/model/Application.cs
Expand Up @@ -188,7 +188,7 @@ 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.
/// 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.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "signInAudience", Required = Newtonsoft.Json.Required.Default)]
public string SignInAudience { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Graph/Generated/model/AssignedPlan.cs
Expand Up @@ -39,7 +39,7 @@ public AssignedPlan()

/// <summary>
/// Gets or sets capabilityStatus.
/// For example, 'Enabled'.
/// Condition of the capability assignment. The possible values are Enabled, Warning, Suspended, Deleted, LockedOut.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "capabilityStatus", Required = Newtonsoft.Json.Required.Default)]
public string CapabilityStatus { get; set; }
Expand Down
77 changes: 77 additions & 0 deletions src/Microsoft.Graph/Generated/model/AuthorizationPolicy.cs
@@ -0,0 +1,77 @@
// ------------------------------------------------------------------------------
// 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: Templates\CSharp\Model\EntityType.cs.tt

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

/// <summary>
/// The type Authorization Policy.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
public partial class AuthorizationPolicy : PolicyBase
{

///<summary>
/// The AuthorizationPolicy constructor
///</summary>
public AuthorizationPolicy()
{
this.ODataType = "microsoft.graph.authorizationPolicy";
}

/// <summary>
/// Gets or sets allowed to sign up email based subscriptions.
/// Indicates whether users can sign up for email based subscriptions.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "allowedToSignUpEmailBasedSubscriptions", Required = Newtonsoft.Json.Required.Default)]
public bool? AllowedToSignUpEmailBasedSubscriptions { get; set; }

/// <summary>
/// Gets or sets allowed to use sspr.
/// Indicates whether the Self-Serve Password Reset feature can be used by users on the tenant.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "allowedToUseSSPR", Required = Newtonsoft.Json.Required.Default)]
public bool? AllowedToUseSSPR { get; set; }

/// <summary>
/// Gets or sets allow email verified users to join organization.
/// Indicates whether a user can join the tenant by email validation.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "allowEmailVerifiedUsersToJoinOrganization", Required = Newtonsoft.Json.Required.Default)]
public bool? AllowEmailVerifiedUsersToJoinOrganization { get; set; }

/// <summary>
/// Gets or sets allow invites from.
/// Indicates who can invite external users to the organization. Possible values are:none - Prevent everyone, including admins, from inviting external users. Default setting for US Government.adminsAndGuestInviters - Allow members of Global Administrators, User Administrators, and Guest Inviter roles to invite external users.adminsGuestInvitersAndAllMembers - Allow the above admin roles and all other User role members to invite external users.everyone - Allow everyone in the organization, including guest users, to invite external users. Default setting for all cloud environments except US Government.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "allowInvitesFrom", Required = Newtonsoft.Json.Required.Default)]
public AllowInvitesFrom? AllowInvitesFrom { get; set; }

/// <summary>
/// Gets or sets block msol power shell.
/// To disable the use of MSOL PowerShell set this property to true. Setting to true will also disable user-based access to the legacy service endpoint used by MSOL PowerShell. This does not affect Azure AD Connect or Microsoft Graph.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "blockMsolPowerShell", Required = Newtonsoft.Json.Required.Default)]
public bool? BlockMsolPowerShell { get; set; }

/// <summary>
/// Gets or sets default user role permissions.
/// Specifies certain customizable permissions for default user role.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "defaultUserRolePermissions", Required = Newtonsoft.Json.Required.Default)]
public DefaultUserRolePermissions DefaultUserRolePermissions { get; set; }

}
}

10 changes: 5 additions & 5 deletions src/Microsoft.Graph/Generated/model/CalendarColor.cs
Expand Up @@ -19,6 +19,11 @@ namespace Microsoft.Graph
public enum CalendarColor
{

/// <summary>
/// Auto
/// </summary>
Auto = -1,

/// <summary>
/// Light Blue
/// </summary>
Expand All @@ -29,11 +34,6 @@ public enum CalendarColor
/// </summary>
LightGreen = 1,

/// <summary>
/// Auto
/// </summary>
Auto = -1,

/// <summary>
/// Light Orange
/// </summary>
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.Graph/Generated/model/CategoryColor.cs
Expand Up @@ -19,6 +19,11 @@ namespace Microsoft.Graph
public enum CategoryColor
{

/// <summary>
/// None
/// </summary>
None = -1,

/// <summary>
/// Preset0
/// </summary>
Expand All @@ -29,11 +34,6 @@ public enum CategoryColor
/// </summary>
Preset1 = 1,

/// <summary>
/// None
/// </summary>
None = -1,

/// <summary>
/// Preset2
/// </summary>
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.Graph/Generated/model/Channel.cs
Expand Up @@ -60,6 +60,7 @@ public Channel()

/// <summary>
/// Gets or sets membership type.
/// The type of the channel. Can be set during creation and cannot be changed. Possible values are: standard - Channel inherits the list of members of the parent team; private - Channel can have members that are a subset of all the members on the parent team.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "membershipType", Required = Newtonsoft.Json.Required.Default)]
public ChannelMembershipType? MembershipType { get; set; }
Expand All @@ -80,6 +81,7 @@ public Channel()

/// <summary>
/// Gets or sets members.
/// A collection of membership records associated with the channel.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "members", Required = Newtonsoft.Json.Required.Default)]
public IChannelMembersCollectionPage Members { get; set; }
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.Graph/Generated/model/CloudCommunications.cs
Expand Up @@ -48,6 +48,12 @@ public CloudCommunications()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "onlineMeetings", Required = Newtonsoft.Json.Required.Default)]
public ICloudCommunicationsOnlineMeetingsCollectionPage OnlineMeetings { get; set; }

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

}
}

@@ -0,0 +1,32 @@
// ------------------------------------------------------------------------------
// 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: Templates\CSharp\Model\MethodRequestBody.cs.tt

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

/// <summary>
/// The type CloudCommunicationsGetPresencesByUserIdRequestBody.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
public partial class CloudCommunicationsGetPresencesByUserIdRequestBody
{

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

}
}

0 comments on commit 6d401d8

Please sign in to comment.