Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[csharp-netcore] Add support for ComVisible, CLSCompliant attributes #12733

Merged
merged 2 commits into from
Jul 1, 2022
Merged

[csharp-netcore] Add support for ComVisible, CLSCompliant attributes #12733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
025ff5c
add support for ComVisible, CLSCompliant attributes in csharp-netcore…
wing328 Jun 29, 2022
100a560
fix import
wing328 Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...s/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{{>partial_header}}

{{#models}}
{{#model}}
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
{{#vendorExtensions.x-com-visible}}
using System.Runtime.InteropServices;
{{/vendorExtensions.x-com-visible}}
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
{{#models}}
{{#model}}
{{#discriminator}}
using JsonSubTypes;
{{/discriminator}}
Expand All @@ -34,11 +37,11 @@ using OpenAPIClientUtils = {{packageName}}.Client.ClientUtils;
using System.Reflection;
{{/-first}}
{{/oneOf}}
{{#aneOf}}
{{#anyOf}}
{{#-first}}
using System.Reflection;
{{/-first}}
{{/aneOf}}
{{/anyOf}}

namespace {{packageName}}.{{modelPackage}}
{
Expand Down
11 changes: 7 additions & 4 deletions modules/openapi-generator/src/main/resources/csharp-netcore/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{{>partial_header}}

{{#models}}
{{#model}}
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
{{#vendorExtensions.x-com-visible}}
using System.Runtime.InteropServices;
{{/vendorExtensions.x-com-visible}}
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
{{#models}}
{{#model}}
{{#discriminator}}
using JsonSubTypes;
{{/discriminator}}
Expand All @@ -33,11 +36,11 @@ using OpenAPIClientUtils = {{packageName}}.Client.ClientUtils;
using System.Reflection;
{{/-first}}
{{/oneOf}}
{{#aneOf}}
{{#anyOf}}
{{#-first}}
using System.Reflection;
{{/-first}}
{{/aneOf}}
{{/anyOf}}

namespace {{packageName}}.{{modelPackage}}
{
Expand Down
6 changes: 6 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp-netcore/modelAnyOf.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
/// <summary>
/// {{description}}{{^description}}{{classname}}{{/description}}
/// </summary>
{{#vendorExtensions.x-cls-compliant}}
[CLSCompliant({{{.}}})]
{{/vendorExtensions.x-cls-compliant}}
{{#vendorExtensions.x-com-visible}}
[ComVisible({{{.}}})]
{{/vendorExtensions.x-com-visible}}
[JsonConverter(typeof({{classname}}JsonConverter))]
[DataContract(Name = "{{{name}}}")]
{{>visibility}} partial class {{classname}} : AbstractOpenAPISchema, {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}}
Expand Down
6 changes: 6 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
{{#description}}
/// <value>{{.}}</value>
{{/description}}
{{#vendorExtensions.x-cls-compliant}}
[CLSCompliant({{{.}}})]
{{/vendorExtensions.x-cls-compliant}}
{{#vendorExtensions.x-com-visible}}
[ComVisible({{{.}}})]
{{/vendorExtensions.x-com-visible}}
{{#allowableValues}}
{{#enumVars}}
{{#-first}}
Expand Down
6 changes: 6 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
/// <summary>
/// {{description}}{{^description}}{{classname}}{{/description}}
/// </summary>
{{#vendorExtensions.x-cls-compliant}}
[CLSCompliant({{{vendorExtensions.x-cls-compliant}}})]
{{/vendorExtensions.x-cls-compliant}}
{{#vendorExtensions.x-com-visible}}
[ComVisible({{{vendorExtensions.x-com-visible}}})]
{{/vendorExtensions.x-com-visible}}
[DataContract(Name = "{{{name}}}")]
{{#discriminator}}
[JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
Expand Down
6 changes: 6 additions & 0 deletions modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
/// <summary>
/// {{description}}{{^description}}{{classname}}{{/description}}
/// </summary>
{{#vendorExtensions.x-cls-compliant}}
[CLSCompliant({{{.}}})]
{{/vendorExtensions.x-cls-compliant}}
{{#vendorExtensions.x-com-visible}}
[ComVisible({{{.}}})]
{{/vendorExtensions.x-com-visible}}
[JsonConverter(typeof({{classname}}JsonConverter))]
[DataContract(Name = "{{{name}}}")]
{{>visibility}} partial class {{classname}} : AbstractOpenAPISchema, {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}}
Expand Down
2 changes: 2 additions & 0 deletions ...urces/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,8 @@ components:
items:
$ref: '#/components/schemas/ReadOnlyFirst'
NumberOnly:
x-cls-compliant: true
x-com-visible: true
type: object
properties:
JustNumber:
Expand Down
1 change: 1 addition & 0 deletions ...harp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System.ComponentModel.DataAnnotations;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...p-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -29,6 +30,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down
1 change: 1 addition & 0 deletions ...nt/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using FileParameter = Org.OpenAPITools.Client.FileParameter;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -30,6 +31,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down
1 change: 1 addition & 0 deletions .../client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System.ComponentModel.DataAnnotations;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...ient/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -29,6 +30,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down
1 change: 1 addition & 0 deletions ...client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System.ComponentModel.DataAnnotations;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...ent/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -29,6 +30,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System.ComponentModel.DataAnnotations;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...les/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -29,6 +30,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down
1 change: 1 addition & 0 deletions ...es/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/GmFruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System.ComponentModel.DataAnnotations;
using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
using System.Reflection;

namespace Org.OpenAPITools.Model
{
Expand Down
3 changes: 3 additions & 0 deletions ...client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Text.RegularExpressions;
Expand All @@ -29,6 +30,8 @@ namespace Org.OpenAPITools.Model
/// <summary>
/// NumberOnly
/// </summary>
[CLSCompliant(true)]
[ComVisible(true)]
[DataContract(Name = "NumberOnly")]
public partial class NumberOnly : IEquatable<NumberOnly>, IValidatableObject
{
Expand Down