Skip to content

Commit

Permalink
Generated models and request builders using Typewriter (#647)
Browse files Browse the repository at this point in the history
* Update generated files with build 2544600
* Update to target .NET standard 2.0, update tests per warnings
  • Loading branch information
github-actions[bot] authored Mar 16, 2020
1 parent ad744d8 commit f784b2e
Show file tree
Hide file tree
Showing 350 changed files with 20,720 additions and 130 deletions.
10 changes: 5 additions & 5 deletions src/Microsoft.Graph/Microsoft.Graph.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<AssemblyTitle>Microsoft Graph V1.0 Service Client Library</AssemblyTitle>
<Authors>Microsoft</Authors>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<PreserveCompilationContext>false</PreserveCompilationContext>
<AssemblyName>Microsoft.Graph</AssemblyName>
<PackageId>Microsoft.Graph</PackageId>
Expand All @@ -13,13 +13,13 @@
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<RepositoryUrl>https://github.com/microsoftgraph/msgraph-sdk-dotnet</RepositoryUrl>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.0</NetStandardImplicitPackageVersion>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.0</NetStandardImplicitPackageVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>false</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<VersionPrefix>1.21.0</VersionPrefix>
<VersionPrefix>3.0.0</VersionPrefix>
<!-- VersionPrefix minor version should not be set when the change comes from the generator. It will be updated automatically. -->
<!-- VersionPrefix minor version must be manually set when making manual changes to code. -->
<!-- VersionPrefix major and patch versions must be manually set. -->
Expand All @@ -28,7 +28,7 @@
<PackageReleaseNotes>
</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.3|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\Microsoft.Graph.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591</NoWarn>
</PropertyGroup>
Expand All @@ -47,4 +47,4 @@
</PackagePath>
</None>
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public AppHostedMediaConfig()

/// <summary>
/// Gets or sets blob.
/// The media configuration blob generated by smart media agent.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "blob", Required = Newtonsoft.Json.Required.Default)]
public string Blob { get; set; }
Expand Down
77 changes: 77 additions & 0 deletions src/Microsoft.Graph/Models/Generated/AppRoleAssignment.cs
Original file line number Diff line number Diff line change
@@ -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 App Role Assignment.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
public partial class AppRoleAssignment : DirectoryObject
{

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

/// <summary>
/// Gets or sets app role id.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "appRoleId", Required = Newtonsoft.Json.Required.Default)]
public Guid? AppRoleId { get; set; }

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

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

/// <summary>
/// Gets or sets principal id.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "principalId", Required = Newtonsoft.Json.Required.Default)]
public Guid? PrincipalId { get; set; }

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

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

/// <summary>
/// Gets or sets resource id.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "resourceId", Required = Newtonsoft.Json.Required.Default)]
public Guid? ResourceId { get; set; }

}
}

Original file line number Diff line number Diff line change
@@ -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 AttachmentCreateUploadSessionRequestBody.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
public partial class AttachmentCreateUploadSessionRequestBody
{

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

}
}
76 changes: 76 additions & 0 deletions src/Microsoft.Graph/Models/Generated/AttachmentItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// ------------------------------------------------------------------------------
// 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 AttachmentItem.
/// </summary>
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(DerivedTypeConverter))]
public partial class AttachmentItem
{
/// <summary>
/// Initializes a new instance of the <see cref="AttachmentItem"/> class.
/// </summary>
public AttachmentItem()
{
this.ODataType = "microsoft.graph.attachmentItem";
}

/// <summary>
/// Gets or sets attachmentType.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "attachmentType", Required = Newtonsoft.Json.Required.Default)]
public AttachmentType? AttachmentType { 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 size.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "size", Required = Newtonsoft.Json.Required.Default)]
public Int64? Size { get; set; }

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

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

}
}
38 changes: 38 additions & 0 deletions src/Microsoft.Graph/Models/Generated/AttachmentType.cs
Original file line number Diff line number Diff line change
@@ -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 AttachmentType.
/// </summary>
[JsonConverter(typeof(EnumConverter))]
public enum AttachmentType
{

/// <summary>
/// File
/// </summary>
File = 0,

/// <summary>
/// Item
/// </summary>
Item = 1,

/// <summary>
/// Reference
/// </summary>
Reference = 2,

}
}
3 changes: 3 additions & 0 deletions src/Microsoft.Graph/Models/Generated/AudioConferencing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,21 @@ public AudioConferencing()

/// <summary>
/// Gets or sets tollNumber.
/// The toll number that connects to the Audio Conference Provider.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "tollNumber", Required = Newtonsoft.Json.Required.Default)]
public string TollNumber { get; set; }

/// <summary>
/// Gets or sets tollFreeNumber.
/// The toll-free number that connects to the Audio Conference Provider.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "tollFreeNumber", Required = Newtonsoft.Json.Required.Default)]
public string TollFreeNumber { get; set; }

/// <summary>
/// Gets or sets dialinUrl.
/// A URL to the externally-accessible web page that contains dial-in information.
/// </summary>
[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "dialinUrl", Required = Newtonsoft.Json.Required.Default)]
public string DialinUrl { get; set; }
Expand Down
Loading

0 comments on commit f784b2e

Please sign in to comment.