Skip to content

Commit

Permalink
Merge pull request #799 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Release 3.15.0
  • Loading branch information
MIchaelMainer committed Sep 24, 2020
2 parents 5fc7c66 + 96a1f9c commit 76b9eb3
Show file tree
Hide file tree
Showing 70 changed files with 4,397 additions and 15 deletions.
11 changes: 8 additions & 3 deletions src/Microsoft.Graph/Generated/model/AdministrativeUnit.cs
Expand Up @@ -22,40 +22,45 @@ namespace Microsoft.Graph
public partial class AdministrativeUnit : DirectoryObject
{

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

/// <summary>
/// Gets or sets description.
/// An optional description for the administrative unit.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "description", Required = Newtonsoft.Json.Required.Default)]
public string Description { get; set; }

/// <summary>
/// Gets or sets display name.
/// Display name for the administrative unit.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "displayName", Required = Newtonsoft.Json.Required.Default)]
public string DisplayName { get; set; }

/// <summary>
/// Gets or sets visibility.
/// 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; }

/// <summary>
/// Gets or sets members.
/// Users and groups that are members of this Adminsitrative Unit. HTTP Methods: GET (list members), POST (add members), DELETE (remove members).
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "members", Required = Newtonsoft.Json.Required.Default)]
public IAdministrativeUnitMembersCollectionWithReferencesPage Members { get; set; }

/// <summary>
/// Gets or sets scoped role members.
/// Scoped-role members of this Administrative Unit. HTTP Methods: GET (list scopedRoleMemberships), POST (add scopedRoleMembership), DELETE (remove scopedRoleMembership).
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "scopedRoleMembers", Required = Newtonsoft.Json.Required.Default)]
public IAdministrativeUnitScopedRoleMembersCollectionPage ScopedRoleMembers { get; set; }
Expand Down
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 what Microsoft accounts 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 (i.e. single tenant)AzureADMultipleOrgs: Users with a Microsoft work or school account in any organization’s Azure AD tenant (i.e. multi-tenant) AzureADandPersonalMicrosoftAccount: Users with a personal Microsoft account, or a work or school account in any organization’s Azure AD tenant
/// 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.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "signInAudience", Required = Newtonsoft.Json.Required.Default)]
public string SignInAudience { get; set; }
Expand Down
13 changes: 13 additions & 0 deletions src/Microsoft.Graph/Generated/model/ChangeNotification.cs
Expand Up @@ -44,13 +44,26 @@ public ChangeNotification()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "clientState", Required = Newtonsoft.Json.Required.Default)]
public string ClientState { get; set; }

/// <summary>
/// Gets or sets encryptedContent.
/// (Preview) Encrypted content attached with the change notification. Only provided if encryptionCertificate and includeResourceData were defined during the subscription request and if the resource supports it. Optional.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "encryptedContent", Required = Newtonsoft.Json.Required.Default)]
public ChangeNotificationEncryptedContent EncryptedContent { get; set; }

/// <summary>
/// Gets or sets id.
/// Unique ID for the notification. Optional.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "id", Required = Newtonsoft.Json.Required.Default)]
public string Id { get; set; }

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

/// <summary>
/// Gets or sets resource.
/// The URI of the resource that emitted the change notification relative to https://graph.microsoft.com. Required.
Expand Down
Expand Up @@ -30,6 +30,13 @@ public ChangeNotificationCollection()
this.ODataType = "microsoft.graph.changeNotificationCollection";
}

/// <summary>
/// Gets or sets validationTokens.
/// Contains an array of JWT tokens generated by Microsoft Graph for the application to validate the origin of the notifications. Microsoft Graph generates a single token for each distinct app and tenant pair for an item if it exists in the value array. Keep in mind that notifications can contain a mix of items for various apps and tenants that subscribed using the same notification URL. Only provided for change notifications with resource data Optional.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "validationTokens", Required = Newtonsoft.Json.Required.Default)]
public IEnumerable<string> ValidationTokens { get; set; }

/// <summary>
/// Gets or sets value.
/// The set of notifications being sent to the notification URL. Required.
Expand Down
@@ -0,0 +1,81 @@
// ------------------------------------------------------------------------------
// 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 ChangeNotificationEncryptedContent.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(DerivedTypeConverter))]
public partial class ChangeNotificationEncryptedContent
{
/// <summary>
/// Initializes a new instance of the <see cref="ChangeNotificationEncryptedContent"/> class.
/// </summary>
public ChangeNotificationEncryptedContent()
{
this.ODataType = "microsoft.graph.changeNotificationEncryptedContent";
}

/// <summary>
/// Gets or sets data.
/// Base64-encoded encrypted data that produces a full resource respresented as JSON. The data has been encrypted with the provided dataKey using an AES/CBC/PKCS5PADDING cipher suite.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "data", Required = Newtonsoft.Json.Required.Default)]
public string Data { get; set; }

/// <summary>
/// Gets or sets dataKey.
/// Base64-encoded symmetric key generated by Microsoft Graph to encrypt the data value and to generate the data signature. This key is encrypted with the certificate public key that was provided during the subscription. It must be decrypted with the certificate private key before it can be used to decrypt the data or verify the signature. This key has been encrypted with the following cipher suite: RSA/ECB/OAEPWithSHA1AndMGF1Padding.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "dataKey", Required = Newtonsoft.Json.Required.Default)]
public string DataKey { get; set; }

/// <summary>
/// Gets or sets dataSignature.
/// Base64-encoded HMAC-SHA256 hash of the data for validation purposes.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "dataSignature", Required = Newtonsoft.Json.Required.Default)]
public string DataSignature { get; set; }

/// <summary>
/// Gets or sets encryptionCertificateId.
/// ID of the certificate used to encrypt the dataKey.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "encryptionCertificateId", Required = Newtonsoft.Json.Required.Default)]
public string EncryptionCertificateId { get; set; }

/// <summary>
/// Gets or sets encryptionCertificateThumbprint.
/// Hexadecimal representation of the thumbprint of the certificate used to encrypt the dataKey.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "encryptionCertificateThumbprint", Required = Newtonsoft.Json.Required.Default)]
public string EncryptionCertificateThumbprint { 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; }

}
}
35 changes: 35 additions & 0 deletions src/Microsoft.Graph/Generated/model/Chat.cs
@@ -0,0 +1,35 @@
// ------------------------------------------------------------------------------
// 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 Chat.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
public partial class Chat : Entity
{

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

}
}

9 changes: 8 additions & 1 deletion src/Microsoft.Graph/Generated/model/ChatMessage.cs
Expand Up @@ -79,9 +79,16 @@ public ChatMessage()
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "importance", Required = Newtonsoft.Json.Required.Default)]
public ChatMessageImportance? Importance { get; set; }

/// <summary>
/// Gets or sets last edited date time.
/// Read only. Timestamp when edits to the chat message were made. Triggers an 'Edited' flag in the Microsoft Teams UI. If no edits are made the value is null.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "lastEditedDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? LastEditedDateTime { get; set; }

/// <summary>
/// Gets or sets last modified date time.
/// Read only. Timestamp of when the chat message is created or edited, including when a reply is made (if it's a root chat message in a channel) or a reaction is added or removed.
/// Read only. Timestamp when the chat message is created (initial setting) or edited, including when a reaction is added or removed.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "lastModifiedDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? LastModifiedDateTime { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Graph/Generated/model/Event.cs
Expand Up @@ -249,6 +249,7 @@ public Event()

/// <summary>
/// Gets or sets transaction id.
/// A custom identifier specified by a client app for the server to avoid redundant POST operations in case of client retries to create the same event. This is useful when low network connectivity causes the client to time out before receiving a response from the server for the client's prior create-event request. After you set transactionId when creating an event, you cannot change transactionId in a subsequent update. This property is only returned in a response payload if an app has set it. Optional.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "transactionId", Required = Newtonsoft.Json.Required.Default)]
public string TransactionId { get; set; }
Expand Down
38 changes: 38 additions & 0 deletions src/Microsoft.Graph/Generated/model/LifecycleEventType.cs
@@ -0,0 +1,38 @@
// ------------------------------------------------------------------------------
// 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 LifecycleEventType.
/// </summary>
[JsonConverter(typeof(EnumConverter))]
public enum LifecycleEventType
{

/// <summary>
/// Missed
/// </summary>
Missed = 0,

/// <summary>
/// Subscription Removed
/// </summary>
SubscriptionRemoved = 1,

/// <summary>
/// Reauthorization Required
/// </summary>
ReauthorizationRequired = 2,

}
}
@@ -0,0 +1,67 @@
// ------------------------------------------------------------------------------
// 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 MobileAppInstallTimeSettings.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(DerivedTypeConverter))]
public partial class MobileAppInstallTimeSettings
{
/// <summary>
/// Initializes a new instance of the <see cref="MobileAppInstallTimeSettings"/> class.
/// </summary>
public MobileAppInstallTimeSettings()
{
this.ODataType = "microsoft.graph.mobileAppInstallTimeSettings";
}

/// <summary>
/// Gets or sets deadlineDateTime.
/// The time at which the app should be installed.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "deadlineDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? DeadlineDateTime { get; set; }

/// <summary>
/// Gets or sets startDateTime.
/// The time at which the app should be available for installation.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "startDateTime", Required = Newtonsoft.Json.Required.Default)]
public DateTimeOffset? StartDateTime { get; set; }

/// <summary>
/// Gets or sets useLocalTime.
/// Whether the local device time or UTC time should be used when determining the available and deadline times.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "useLocalTime", Required = Newtonsoft.Json.Required.Default)]
public bool? UseLocalTime { 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; }

}
}
33 changes: 33 additions & 0 deletions src/Microsoft.Graph/Generated/model/RunAsAccountType.cs
@@ -0,0 +1,33 @@
// ------------------------------------------------------------------------------
// 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 RunAsAccountType.
/// </summary>
[JsonConverter(typeof(EnumConverter))]
public enum RunAsAccountType
{

/// <summary>
/// System
/// </summary>
System = 0,

/// <summary>
/// User
/// </summary>
User = 1,

}
}

0 comments on commit 76b9eb3

Please sign in to comment.