From c54cccccb076b1ac4f6d498b61a275f4de4b937c Mon Sep 17 00:00:00 2001 From: Microsoft Graph DevX Tooling Date: Tue, 22 Mar 2022 10:18:41 +0000 Subject: [PATCH 1/2] Update generated files with build 70873 --- .../model/ExternalItemContent.cs | 2 +- .../Generated/model/ColumnDefinition.cs | 7 +++ .../ConditionalAccessClientApplications.cs | 51 +++++++++++++++++++ .../model/ConditionalAccessConditionSet.cs | 7 +++ .../model/ConditionalAccessPlatforms.cs | 4 +- .../Generated/model/DriveItem.cs | 3 +- .../Generated/model/OAuth2PermissionGrant.cs | 2 +- .../Generated/model/SelfSignedCertificate.cs | 9 ++++ 8 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 src/Microsoft.Graph/Generated/model/ConditionalAccessClientApplications.cs diff --git a/src/Microsoft.Graph/Generated/externalconnectors/model/ExternalItemContent.cs b/src/Microsoft.Graph/Generated/externalconnectors/model/ExternalItemContent.cs index 40c9ed5d1ae..446965fbc10 100644 --- a/src/Microsoft.Graph/Generated/externalconnectors/model/ExternalItemContent.cs +++ b/src/Microsoft.Graph/Generated/externalconnectors/model/ExternalItemContent.cs @@ -23,7 +23,7 @@ public partial class ExternalItemContent /// /// Gets or sets type. - /// The type of content in the value property. Possible values are: text, html, unknownFutureValue. + /// The type of content in the value property. Possible values are: text, html, unknownFutureValue. These are the content types that the indexer supports, and not the file extension types allowed. /// [JsonPropertyName("type")] public ExternalItemContentType? Type { get; set; } diff --git a/src/Microsoft.Graph/Generated/model/ColumnDefinition.cs b/src/Microsoft.Graph/Generated/model/ColumnDefinition.cs index ba75063c820..c4c8c12ae92 100644 --- a/src/Microsoft.Graph/Generated/model/ColumnDefinition.cs +++ b/src/Microsoft.Graph/Generated/model/ColumnDefinition.cs @@ -196,6 +196,13 @@ public partial class ColumnDefinition : Entity [JsonPropertyName("required")] public bool? Required { get; set; } + /// + /// Gets or sets source content type. + /// ContentType from which this column is inherited from. Present only in contentTypes columns response. Read-only. + /// + [JsonPropertyName("sourceContentType")] + public ContentTypeInfo SourceContentType { get; set; } + /// /// Gets or sets term. /// This column stores taxonomy terms. diff --git a/src/Microsoft.Graph/Generated/model/ConditionalAccessClientApplications.cs b/src/Microsoft.Graph/Generated/model/ConditionalAccessClientApplications.cs new file mode 100644 index 00000000000..f2a92a49844 --- /dev/null +++ b/src/Microsoft.Graph/Generated/model/ConditionalAccessClientApplications.cs @@ -0,0 +1,51 @@ +// ------------------------------------------------------------------------------ +// 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. +// + +// Template Source: ComplexType.cs.tt + +namespace Microsoft.Graph +{ + using System; + using System.Collections.Generic; + using System.IO; + using System.Text.Json.Serialization; + + /// + /// The type ConditionalAccessClientApplications. + /// + [JsonConverter(typeof(DerivedTypeConverter))] + public partial class ConditionalAccessClientApplications + { + + /// + /// Gets or sets excludeServicePrincipals. + /// Service principal IDs excluded from the policy scope. + /// + [JsonPropertyName("excludeServicePrincipals")] + public IEnumerable ExcludeServicePrincipals { get; set; } + + /// + /// Gets or sets includeServicePrincipals. + /// Service principal IDs included in the policy scope, or ServicePrincipalsInMyTenant. + /// + [JsonPropertyName("includeServicePrincipals")] + public IEnumerable IncludeServicePrincipals { get; set; } + + /// + /// Gets or sets additional data. + /// + [JsonExtensionData] + public IDictionary AdditionalData { get; set; } + + /// + /// Gets or sets @odata.type. + /// + [JsonPropertyName("@odata.type")] + public string ODataType { get; set; } + + } +} diff --git a/src/Microsoft.Graph/Generated/model/ConditionalAccessConditionSet.cs b/src/Microsoft.Graph/Generated/model/ConditionalAccessConditionSet.cs index 145f94fc455..abf64db0a2c 100644 --- a/src/Microsoft.Graph/Generated/model/ConditionalAccessConditionSet.cs +++ b/src/Microsoft.Graph/Generated/model/ConditionalAccessConditionSet.cs @@ -28,6 +28,13 @@ public partial class ConditionalAccessConditionSet [JsonPropertyName("applications")] public ConditionalAccessApplications Applications { get; set; } + /// + /// Gets or sets clientApplications. + /// Client applications (service principals and workload identities) included in and excluded from the policy. Either users or clientApplications is required. + /// + [JsonPropertyName("clientApplications")] + public ConditionalAccessClientApplications ClientApplications { get; set; } + /// /// Gets or sets clientAppTypes. /// Client application types included in the policy. Possible values are: all, browser, mobileAppsAndDesktopClients, exchangeActiveSync, easSupported, other. Required. diff --git a/src/Microsoft.Graph/Generated/model/ConditionalAccessPlatforms.cs b/src/Microsoft.Graph/Generated/model/ConditionalAccessPlatforms.cs index ef4b6aa4ac8..611e014194d 100644 --- a/src/Microsoft.Graph/Generated/model/ConditionalAccessPlatforms.cs +++ b/src/Microsoft.Graph/Generated/model/ConditionalAccessPlatforms.cs @@ -23,14 +23,14 @@ public partial class ConditionalAccessPlatforms /// /// Gets or sets excludePlatforms. - /// Possible values are: android, iOS, windows, windowsPhone, macOS, all, unknownFutureValue. + /// Possible values are: android, iOS, windows, windowsPhone, macOS, linux, all, unknownFutureValue. /// [JsonPropertyName("excludePlatforms")] public IEnumerable ExcludePlatforms { get; set; } /// /// Gets or sets includePlatforms. - /// Possible values are: android, iOS, windows, windowsPhone, macOS, all, unknownFutureValue. + /// Possible values are: android, iOS, windows, windowsPhone, macOS, linux, all, unknownFutureValue. /// [JsonPropertyName("includePlatforms")] public IEnumerable IncludePlatforms { get; set; } diff --git a/src/Microsoft.Graph/Generated/model/DriveItem.cs b/src/Microsoft.Graph/Generated/model/DriveItem.cs index 9248daa1cf7..792317234fa 100644 --- a/src/Microsoft.Graph/Generated/model/DriveItem.cs +++ b/src/Microsoft.Graph/Generated/model/DriveItem.cs @@ -30,13 +30,14 @@ public DriveItem() /// /// Gets or sets audio. - /// Audio metadata, if the item is an audio file. Read-only. Only on OneDrive Personal. + /// Audio metadata, if the item is an audio file. Read-only. Read-only. Only on OneDrive Personal. /// [JsonPropertyName("audio")] public Audio Audio { get; set; } /// /// Gets or sets bundle. + /// Bundle metadata, if the item is a bundle. Read-only. /// [JsonPropertyName("bundle")] public Bundle Bundle { get; set; } diff --git a/src/Microsoft.Graph/Generated/model/OAuth2PermissionGrant.cs b/src/Microsoft.Graph/Generated/model/OAuth2PermissionGrant.cs index 87440368e93..2cfe6905644 100644 --- a/src/Microsoft.Graph/Generated/model/OAuth2PermissionGrant.cs +++ b/src/Microsoft.Graph/Generated/model/OAuth2PermissionGrant.cs @@ -50,7 +50,7 @@ public partial class OAuth2PermissionGrant : Entity /// /// Gets or sets scope. - /// A space-separated list of the claim values for delegated permissions which should be included in access tokens for the resource application (the API). For example, openid User.Read GroupMember.Read.All. Each claim value should match the value field of one of the delegated permissions defined by the API, listed in the publishedPermissionScopes property of the resource service principal. + /// A space-separated list of the claim values for delegated permissions which should be included in access tokens for the resource application (the API). For example, openid User.Read GroupMember.Read.All. Each claim value should match the value field of one of the delegated permissions defined by the API, listed in the oauth2PermissionScopes property of the resource service principal. /// [JsonPropertyName("scope")] public string Scope { get; set; } diff --git a/src/Microsoft.Graph/Generated/model/SelfSignedCertificate.cs b/src/Microsoft.Graph/Generated/model/SelfSignedCertificate.cs index 5af90dcc869..6753ab8bd9a 100644 --- a/src/Microsoft.Graph/Generated/model/SelfSignedCertificate.cs +++ b/src/Microsoft.Graph/Generated/model/SelfSignedCertificate.cs @@ -23,54 +23,63 @@ public partial class SelfSignedCertificate /// /// Gets or sets customKeyIdentifier. + /// Custom key identifier. /// [JsonPropertyName("customKeyIdentifier")] public byte[] CustomKeyIdentifier { get; set; } /// /// Gets or sets displayName. + /// The friendly name for the key. /// [JsonPropertyName("displayName")] public string DisplayName { get; set; } /// /// Gets or sets endDateTime. + /// The date and time at which the credential expires. 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 is 2014-01-01T00:00:00Z. /// [JsonPropertyName("endDateTime")] public DateTimeOffset? EndDateTime { get; set; } /// /// Gets or sets key. + /// The value for the key credential. Should be a base-64 encoded value. /// [JsonPropertyName("key")] public byte[] Key { get; set; } /// /// Gets or sets keyId. + /// The unique identifier (GUID) for the key. /// [JsonPropertyName("keyId")] public Guid? KeyId { get; set; } /// /// Gets or sets startDateTime. + /// The date and time at which the credential becomes valid. 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 is 2014-01-01T00:00:00Z. /// [JsonPropertyName("startDateTime")] public DateTimeOffset? StartDateTime { get; set; } /// /// Gets or sets thumbprint. + /// The thumbprint value for the key. /// [JsonPropertyName("thumbprint")] public string Thumbprint { get; set; } /// /// Gets or sets type. + /// The type of key credential. 'AsymmetricX509Cert'. /// [JsonPropertyName("type")] public string Type { get; set; } /// /// Gets or sets usage. + /// A string that describes the purpose for which the key can be used. For example, 'Verify'. /// [JsonPropertyName("usage")] public string Usage { get; set; } From 0696bd901baeca5bf24c4272217b5faf337ab088 Mon Sep 17 00:00:00 2001 From: Eastman Date: Tue, 22 Mar 2022 13:29:19 +0300 Subject: [PATCH 2/2] updates version and release notes --- src/Microsoft.Graph/Microsoft.Graph.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Graph/Microsoft.Graph.csproj b/src/Microsoft.Graph/Microsoft.Graph.csproj index c159200411a..42c2ebe1656 100644 --- a/src/Microsoft.Graph/Microsoft.Graph.csproj +++ b/src/Microsoft.Graph/Microsoft.Graph.csproj @@ -21,13 +21,13 @@ false 35MSSharedLib1024.snk true - 4.21.0 + 4.22.0 -- Latest metadata updates from 15th March 2022 snapshot +- Latest metadata updates from 22nd March 2022 snapshot true true