Adjust package names and visibility

Author: idg10

Solutions/Corvus.Json.ExtendedTypes/Corvus.Json.ExtendedTypes.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(EndjinProjectPropsPath)" Condition="$(EndjinProjectPropsPath) != ''" />
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <Description>Defines .NET types representing data types found in JSON, including numerous types for specialized string forms such as JsonUuid and JsonDateTime.</Description>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Corvus.Extensions" Version="1.1.4" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.5" />
+    <PackageReference Include="NodaTime" Version="3.1.0" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="..\Corvus.JsonHelpers\Corvus.JsonHelpers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.333" />
+  </ItemGroup>
+
+</Project>

Solutions/Corvus.Json/Corvus.Json/IJsonArray.cs Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/IJsonArray.cs

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="$(EndjinProjectPropsPath)" Condition="$(EndjinProjectPropsPath) != ''" />
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <Description>Object models representing JSON Schema documents (201909 and 202012 drafts)</Description>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="..\Corvus.Json.ExtendedTypes\Corvus.Json.ExtendedTypes.csproj" />
+  </ItemGroup>
+
+</Project>

Solutions/Corvus.Json/Corvus.Json/IJsonArray{T}.cs Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/IJsonArray{T}.cs

@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 #nullable enable
-namespace Corvus.Json.Draft201909
+namespace Corvus.Json.JsonSchema.Draft201909
 {
     using System;
     using System.Collections.Generic;
@@ -200,7 +200,7 @@ public Corvus.Json.JsonString ContentEncoding
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Schema ContentSchema
+        public Corvus.Json.JsonSchema.Draft201909.Schema ContentSchema
         {
             get
             {
@@ -216,7 +216,7 @@ public Corvus.Json.Draft201909.Schema ContentSchema
                 {
                     if (this.jsonElementBacking.TryGetProperty(ContentSchemaUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Schema(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Schema(result);
                     }
                 }
 
@@ -407,7 +407,7 @@ public static implicit operator JsonBoolean(Content boolean)
         /// <summary>
         /// Creates an instance of a <see cref = "Content"/>.
         /// </summary>
-        public static Content Create(Corvus.Json.JsonString? contentMediaType = null, Corvus.Json.JsonString? contentEncoding = null, Corvus.Json.Draft201909.Schema? contentSchema = null)
+        public static Content Create(Corvus.Json.JsonString? contentMediaType = null, Corvus.Json.JsonString? contentEncoding = null, Corvus.Json.JsonSchema.Draft201909.Schema? contentSchema = null)
         {
             var builder = ImmutableDictionary.CreateBuilder<string, JsonAny>();
             if (contentMediaType is Corvus.Json.JsonString contentMediaType__)
@@ -420,7 +420,7 @@ public static Content Create(Corvus.Json.JsonString? contentMediaType = null, Co
                 builder.Add(ContentEncodingJsonPropertyName, contentEncoding__);
             }
 
-            if (contentSchema is Corvus.Json.Draft201909.Schema contentSchema__)
+            if (contentSchema is Corvus.Json.JsonSchema.Draft201909.Schema contentSchema__)
             {
                 builder.Add(ContentSchemaJsonPropertyName, contentSchema__);
             }
@@ -453,7 +453,7 @@ public Content WithContentEncoding(Corvus.Json.JsonString value)
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Content WithContentSchema(Corvus.Json.Draft201909.Schema value)
+        public Content WithContentSchema(Corvus.Json.JsonSchema.Draft201909.Schema value)
         {
             return this.SetProperty(ContentSchemaJsonPropertyName, value);
         }
@@ -736,7 +736,7 @@ private static ValidationContext __CorvusValidateContentEncoding(in Content that
 
         private static ValidationContext __CorvusValidateContentSchema(in Content that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Schema property = that.ContentSchema;
+            Corvus.Json.JsonSchema.Draft201909.Schema property = that.ContentSchema;
             return property.Validate(validationContext, level);
         }
 

Solutions/Corvus.Json/Corvus.Json/IJsonObject.cs Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/IJsonObject.cs

@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 #nullable enable
-namespace Corvus.Json.Draft201909
+namespace Corvus.Json.JsonSchema.Draft201909
 {
     using System;
     using System.Collections.Generic;
@@ -181,7 +181,7 @@ public Core(bool boolean)
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Core.IdValue Id
+        public Corvus.Json.JsonSchema.Draft201909.Core.IdValue Id
         {
             get
             {
@@ -197,7 +197,7 @@ public Corvus.Json.Draft201909.Core.IdValue Id
                 {
                     if (this.jsonElementBacking.TryGetProperty(IdUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Core.IdValue(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Core.IdValue(result);
                     }
                 }
 
@@ -249,7 +249,7 @@ public Corvus.Json.JsonUri Schema
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Core.AnchorValue Anchor
+        public Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue Anchor
         {
             get
             {
@@ -265,7 +265,7 @@ public Corvus.Json.Draft201909.Core.AnchorValue Anchor
                 {
                     if (this.jsonElementBacking.TryGetProperty(AnchorUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Core.AnchorValue(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue(result);
                     }
                 }
 
@@ -351,7 +351,7 @@ public Corvus.Json.JsonUriReference RecursiveRef
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Core.RecursiveAnchorValue RecursiveAnchor
+        public Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue RecursiveAnchor
         {
             get
             {
@@ -367,7 +367,7 @@ public Corvus.Json.Draft201909.Core.RecursiveAnchorValue RecursiveAnchor
                 {
                     if (this.jsonElementBacking.TryGetProperty(RecursiveAnchorUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Core.RecursiveAnchorValue(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue(result);
                     }
                 }
 
@@ -385,7 +385,7 @@ public Corvus.Json.Draft201909.Core.RecursiveAnchorValue RecursiveAnchor
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Core.VocabularyValue Vocabulary
+        public Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue Vocabulary
         {
             get
             {
@@ -401,7 +401,7 @@ public Corvus.Json.Draft201909.Core.VocabularyValue Vocabulary
                 {
                     if (this.jsonElementBacking.TryGetProperty(VocabularyUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Core.VocabularyValue(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue(result);
                     }
                 }
 
@@ -453,7 +453,7 @@ public Corvus.Json.JsonString Comment
         /// <example>
         /// {Property examples}.
         /// </example>
-        public Corvus.Json.Draft201909.Core.DefsValue Defs
+        public Corvus.Json.JsonSchema.Draft201909.Core.DefsValue Defs
         {
             get
             {
@@ -469,7 +469,7 @@ public Corvus.Json.Draft201909.Core.DefsValue Defs
                 {
                     if (this.jsonElementBacking.TryGetProperty(DefsUtf8JsonPropertyName.Span, out JsonElement result))
                     {
-                        return new Corvus.Json.Draft201909.Core.DefsValue(result);
+                        return new Corvus.Json.JsonSchema.Draft201909.Core.DefsValue(result);
                     }
                 }
 
@@ -660,10 +660,10 @@ public static implicit operator JsonBoolean(Core boolean)
         /// <summary>
         /// Creates an instance of a <see cref = "Core"/>.
         /// </summary>
-        public static Core Create(Corvus.Json.Draft201909.Core.IdValue? id = null, Corvus.Json.JsonUri? schema = null, Corvus.Json.Draft201909.Core.AnchorValue? anchor = null, Corvus.Json.JsonUriReference? @ref = null, Corvus.Json.JsonUriReference? recursiveRef = null, Corvus.Json.Draft201909.Core.RecursiveAnchorValue? recursiveAnchor = null, Corvus.Json.Draft201909.Core.VocabularyValue? vocabulary = null, Corvus.Json.JsonString? comment = null, Corvus.Json.Draft201909.Core.DefsValue? defs = null)
+        public static Core Create(Corvus.Json.JsonSchema.Draft201909.Core.IdValue? id = null, Corvus.Json.JsonUri? schema = null, Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue? anchor = null, Corvus.Json.JsonUriReference? @ref = null, Corvus.Json.JsonUriReference? recursiveRef = null, Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue? recursiveAnchor = null, Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue? vocabulary = null, Corvus.Json.JsonString? comment = null, Corvus.Json.JsonSchema.Draft201909.Core.DefsValue? defs = null)
         {
             var builder = ImmutableDictionary.CreateBuilder<string, JsonAny>();
-            if (id is Corvus.Json.Draft201909.Core.IdValue id__)
+            if (id is Corvus.Json.JsonSchema.Draft201909.Core.IdValue id__)
             {
                 builder.Add(IdJsonPropertyName, id__);
             }
@@ -673,7 +673,7 @@ public static Core Create(Corvus.Json.Draft201909.Core.IdValue? id = null, Corvu
                 builder.Add(SchemaJsonPropertyName, schema__);
             }
 
-            if (anchor is Corvus.Json.Draft201909.Core.AnchorValue anchor__)
+            if (anchor is Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue anchor__)
             {
                 builder.Add(AnchorJsonPropertyName, anchor__);
             }
@@ -688,12 +688,12 @@ public static Core Create(Corvus.Json.Draft201909.Core.IdValue? id = null, Corvu
                 builder.Add(RecursiveRefJsonPropertyName, recursiveRef__);
             }
 
-            if (recursiveAnchor is Corvus.Json.Draft201909.Core.RecursiveAnchorValue recursiveAnchor__)
+            if (recursiveAnchor is Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue recursiveAnchor__)
             {
                 builder.Add(RecursiveAnchorJsonPropertyName, recursiveAnchor__);
             }
 
-            if (vocabulary is Corvus.Json.Draft201909.Core.VocabularyValue vocabulary__)
+            if (vocabulary is Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue vocabulary__)
             {
                 builder.Add(VocabularyJsonPropertyName, vocabulary__);
             }
@@ -703,7 +703,7 @@ public static Core Create(Corvus.Json.Draft201909.Core.IdValue? id = null, Corvu
                 builder.Add(CommentJsonPropertyName, comment__);
             }
 
-            if (defs is Corvus.Json.Draft201909.Core.DefsValue defs__)
+            if (defs is Corvus.Json.JsonSchema.Draft201909.Core.DefsValue defs__)
             {
                 builder.Add(DefsJsonPropertyName, defs__);
             }
@@ -716,7 +716,7 @@ public static Core Create(Corvus.Json.Draft201909.Core.IdValue? id = null, Corvu
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Core WithId(Corvus.Json.Draft201909.Core.IdValue value)
+        public Core WithId(Corvus.Json.JsonSchema.Draft201909.Core.IdValue value)
         {
             return this.SetProperty(IdJsonPropertyName, value);
         }
@@ -736,7 +736,7 @@ public Core WithSchema(Corvus.Json.JsonUri value)
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Core WithAnchor(Corvus.Json.Draft201909.Core.AnchorValue value)
+        public Core WithAnchor(Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue value)
         {
             return this.SetProperty(AnchorJsonPropertyName, value);
         }
@@ -766,7 +766,7 @@ public Core WithRecursiveRef(Corvus.Json.JsonUriReference value)
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Core WithRecursiveAnchor(Corvus.Json.Draft201909.Core.RecursiveAnchorValue value)
+        public Core WithRecursiveAnchor(Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue value)
         {
             return this.SetProperty(RecursiveAnchorJsonPropertyName, value);
         }
@@ -776,7 +776,7 @@ public Core WithRecursiveAnchor(Corvus.Json.Draft201909.Core.RecursiveAnchorValu
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Core WithVocabulary(Corvus.Json.Draft201909.Core.VocabularyValue value)
+        public Core WithVocabulary(Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue value)
         {
             return this.SetProperty(VocabularyJsonPropertyName, value);
         }
@@ -796,7 +796,7 @@ public Core WithComment(Corvus.Json.JsonString value)
         /// </summary>
         /// <param name = "value">The value to set.</param>
         /// <returns>The entity with the updated property.</returns>
-        public Core WithDefs(Corvus.Json.Draft201909.Core.DefsValue value)
+        public Core WithDefs(Corvus.Json.JsonSchema.Draft201909.Core.DefsValue value)
         {
             return this.SetProperty(DefsJsonPropertyName, value);
         }
@@ -1117,7 +1117,7 @@ private static ImmutableDictionary<string, PropertyValidator<Core>> CreateLocalP
 
         private static ValidationContext __CorvusValidateId(in Core that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Core.IdValue property = that.Id;
+            Corvus.Json.JsonSchema.Draft201909.Core.IdValue property = that.Id;
             return property.Validate(validationContext, level);
         }
 
@@ -1129,7 +1129,7 @@ private static ValidationContext __CorvusValidateSchema(in Core that, in Validat
 
         private static ValidationContext __CorvusValidateAnchor(in Core that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Core.AnchorValue property = that.Anchor;
+            Corvus.Json.JsonSchema.Draft201909.Core.AnchorValue property = that.Anchor;
             return property.Validate(validationContext, level);
         }
 
@@ -1147,13 +1147,13 @@ private static ValidationContext __CorvusValidateRecursiveRef(in Core that, in V
 
         private static ValidationContext __CorvusValidateRecursiveAnchor(in Core that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Core.RecursiveAnchorValue property = that.RecursiveAnchor;
+            Corvus.Json.JsonSchema.Draft201909.Core.RecursiveAnchorValue property = that.RecursiveAnchor;
             return property.Validate(validationContext, level);
         }
 
         private static ValidationContext __CorvusValidateVocabulary(in Core that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Core.VocabularyValue property = that.Vocabulary;
+            Corvus.Json.JsonSchema.Draft201909.Core.VocabularyValue property = that.Vocabulary;
             return property.Validate(validationContext, level);
         }
 
@@ -1165,7 +1165,7 @@ private static ValidationContext __CorvusValidateComment(in Core that, in Valida
 
         private static ValidationContext __CorvusValidateDefs(in Core that, in ValidationContext validationContext, ValidationLevel level)
         {
-            Corvus.Json.Draft201909.Core.DefsValue property = that.Defs;
+            Corvus.Json.JsonSchema.Draft201909.Core.DefsValue property = that.Defs;
             return property.Validate(validationContext, level);
         }
 
@@ -3071,16 +3071,16 @@ public void WriteTo(Utf8JsonWriter writer)
             /// <summary>
             /// Enumerate the object as the given item type
             /// </summary>
-            public JsonObjectEnumerator<Corvus.Json.Draft201909.Schema> EnumerateProperties()
+            public JsonObjectEnumerator<Corvus.Json.JsonSchema.Draft201909.Schema> EnumerateProperties()
             {
                 if (this.objectBacking is ImmutableDictionary<string, JsonAny> properties)
                 {
-                    return new JsonObjectEnumerator<Corvus.Json.Draft201909.Schema>(properties);
+                    return new JsonObjectEnumerator<Corvus.Json.JsonSchema.Draft201909.Schema>(properties);
                 }
 
                 if (this.jsonElementBacking.ValueKind == JsonValueKind.Object)
                 {
-                    return new JsonObjectEnumerator<Corvus.Json.Draft201909.Schema>(this.jsonElementBacking);
+                    return new JsonObjectEnumerator<Corvus.Json.JsonSchema.Draft201909.Schema>(this.jsonElementBacking);
                 }
 
                 return default;
@@ -3323,7 +3323,7 @@ private ValidationContext ValidateObject(JsonValueKind valueKind, in ValidationC
                     string propertyName = property.Name;
                     if (!result.HasEvaluatedLocalProperty(propertyCount))
                     {
-                        result = property.ValueAs<Corvus.Json.Draft201909.Schema>().Validate(result, level);
+                        result = property.ValueAs<Corvus.Json.JsonSchema.Draft201909.Schema>().Validate(result, level);
                         if (level == ValidationLevel.Flag && !result.IsValid)
                         {
                             return result;