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

use non-generic attributes internally #651

Merged
merged 1 commit into from
Feb 7, 2024
Merged

use non-generic attributes internally #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion JsonSchema/AdditionalItemsKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Json.Schema;
[SchemaSpecVersion(SpecVersion.Draft7)]
[SchemaSpecVersion(SpecVersion.Draft201909)]
[Vocabulary(Vocabularies.Applicator201909Id)]
[DependsOnAnnotationsFrom<ItemsKeyword>]
[DependsOnAnnotationsFrom(typeof(ItemsKeyword))]
[JsonConverter(typeof(AdditionalItemsKeywordJsonConverter))]
public class AdditionalItemsKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
4 changes: 2 additions & 2 deletions JsonSchema/AdditionalPropertiesKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<PropertiesKeyword>]
[DependsOnAnnotationsFrom<PatternPropertiesKeyword>]
[DependsOnAnnotationsFrom(typeof(PropertiesKeyword))]
[DependsOnAnnotationsFrom(typeof(PatternPropertiesKeyword))]
[JsonConverter(typeof(AdditionalPropertiesKeywordJsonConverter))]
public class AdditionalPropertiesKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
4 changes: 2 additions & 2 deletions JsonSchema/ContainsKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<MinContainsKeyword>]
[DependsOnAnnotationsFrom<MaxContainsKeyword>]
[DependsOnAnnotationsFrom(typeof(MinContainsKeyword))]
[DependsOnAnnotationsFrom(typeof(MaxContainsKeyword))]
[JsonConverter(typeof(ContainsKeywordJsonConverter))]
public class ContainsKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
11 changes: 7 additions & 4 deletions JsonSchema/DependsOnAnnotationsFromAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ namespace Json.Schema;
/// <summary>
/// Indicates a keyword from which the decorated keyword requires annotations.
/// </summary>
/// <summary>
/// <remarks>
/// Apply this attribute to your schema keyword to indicate a dependency on another keyword.
/// </summary>
/// </remarks>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = true)]
public class DependsOnAnnotationsFromAttribute : Attribute
{
Expand All @@ -29,9 +29,12 @@ public DependsOnAnnotationsFromAttribute(Type type)
/// <summary>
/// Indicates a keyword from which the decorated keyword requires annotations.
/// </summary>
/// <summary>
/// <remarks>
/// Apply this attribute to your schema keyword to indicate a dependency on another keyword.
/// </summary>
///
/// **Warning**: Generic attributes are not supported in .Net Framework. If your target
/// includes .Net Framework, use the non-generic form of this attribute.
/// </remarks>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = true)]
public class DependsOnAnnotationsFromAttribute<T> : DependsOnAnnotationsFromAttribute
where T : IJsonSchemaKeyword
Expand Down
2 changes: 1 addition & 1 deletion JsonSchema/ElseKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<IfKeyword>]
[DependsOnAnnotationsFrom(typeof(IfKeyword))]
[JsonConverter(typeof(ElseKeywordJsonConverter))]
public class ElseKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
2 changes: 1 addition & 1 deletion JsonSchema/ItemsKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<PrefixItemsKeyword>]
[DependsOnAnnotationsFrom(typeof(PrefixItemsKeyword))]
[JsonConverter(typeof(ItemsKeywordJsonConverter))]
public class ItemsKeyword : IJsonSchemaKeyword, ISchemaContainer, ISchemaCollector
{
Expand Down
4 changes: 2 additions & 2 deletions JsonSchema/JsonSchema.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>
<RepositoryUrl>https://github.com/gregsdennis/json-everything</RepositoryUrl>
<PackageTags>json-schema validation schema json</PackageTags>
<Version>6.0.1</Version>
<FileVersion>6.0.1.0</FileVersion>
<Version>6.0.2</Version>
<FileVersion>6.0.2.0</FileVersion>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<AssemblyName>JsonSchema.Net</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion JsonSchema/ThenKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<IfKeyword>]
[DependsOnAnnotationsFrom(typeof(IfKeyword))]
[JsonConverter(typeof(ThenKeywordJsonConverter))]
public class ThenKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
10 changes: 5 additions & 5 deletions JsonSchema/UnevaluatedItemsKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<PrefixItemsKeyword>]
[DependsOnAnnotationsFrom<ItemsKeyword>]
[DependsOnAnnotationsFrom<AdditionalItemsKeyword>]
[DependsOnAnnotationsFrom<ContainsKeyword>]
[DependsOnAnnotationsFrom<UnevaluatedItemsKeyword>]
[DependsOnAnnotationsFrom(typeof(PrefixItemsKeyword))]
[DependsOnAnnotationsFrom(typeof(ItemsKeyword))]
[DependsOnAnnotationsFrom(typeof(AdditionalItemsKeyword))]
[DependsOnAnnotationsFrom(typeof(ContainsKeyword))]
[DependsOnAnnotationsFrom(typeof(UnevaluatedItemsKeyword))]
[JsonConverter(typeof(UnevaluatedItemsKeywordJsonConverter))]
public class UnevaluatedItemsKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
10 changes: 5 additions & 5 deletions JsonSchema/UnevaluatedPropertiesKeyword.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ namespace Json.Schema;
[Vocabulary(Vocabularies.Applicator201909Id)]
[Vocabulary(Vocabularies.Applicator202012Id)]
[Vocabulary(Vocabularies.ApplicatorNextId)]
[DependsOnAnnotationsFrom<PropertiesKeyword>]
[DependsOnAnnotationsFrom<PatternPropertiesKeyword>]
[DependsOnAnnotationsFrom<AdditionalPropertiesKeyword>]
[DependsOnAnnotationsFrom<ContainsKeyword>]
[DependsOnAnnotationsFrom<UnevaluatedPropertiesKeyword>]
[DependsOnAnnotationsFrom(typeof(PropertiesKeyword))]
[DependsOnAnnotationsFrom(typeof(PatternPropertiesKeyword))]
[DependsOnAnnotationsFrom(typeof(AdditionalPropertiesKeyword))]
[DependsOnAnnotationsFrom(typeof(ContainsKeyword))]
[DependsOnAnnotationsFrom(typeof(UnevaluatedPropertiesKeyword))]
[JsonConverter(typeof(UnevaluatedPropertiesKeywordJsonConverter))]
public class UnevaluatedPropertiesKeyword : IJsonSchemaKeyword, ISchemaContainer
{
Expand Down
7 changes: 7 additions & 0 deletions tools/ApiDocsGenerator/release-notes/rn-json-schema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ title: JsonSchema.Net
icon: fas fa-tag
order: "09.01"
---
# [6.0.2](https://github.com/gregsdennis/json-everything/pull/619) {#release-schema-6.0.2}

Reverted usages of `DependsOnAnnotationsFromAttribute<T>` to non-generic form in order to support .Net Framework, which doesn't support generic attributes.

> The generic attribute is still defined and usable, but only do so if you're not targeting .Net Framework.
{: .prompt-info }

# [6.0.0 & 6.0.1](https://github.com/gregsdennis/json-everything/pull/619) {#release-schema-6.0.0}

> v6.0.0 is missing an explicit .Net 8 DLL. The package was repaired and republished as v6.0.1.
Expand Down