Skip to content

Simplify JSON schema, generation, copying and updating #13427

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

Merged
nikolajlauridsen merged 18 commits into from
Nov 22, 2022
Merged

Simplify JSON schema, generation, copying and updating #13427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
73a86c8
Simplify JSON schema and only generate appsettings-schema.Umbraco.Cms…
ronaldbarendse Nov 16, 2022
87c1f5a
Use Umbraco.JsonSchema.Extensions to dynamically add JSON schema refe…
ronaldbarendse Nov 16, 2022
e8c0e6b
Move DependentUpon items to shared MSBuild props
ronaldbarendse Nov 16, 2022
90b6871
Update LangVersion to latest
ronaldbarendse Nov 16, 2022
c1629f6
Update Umbraco.GitVersioning.Extensions to 0.2.0
ronaldbarendse Nov 16, 2022
9d7ba2d
Remove JSON schemas on clean
ronaldbarendse Nov 16, 2022
75085f9
Remove Umbraco.JsonSchema.Core project
ronaldbarendse Nov 16, 2022
f518845
Fix JSON schema nullability
ronaldbarendse Nov 16, 2022
f72a834
Merge branch 'release/11.0' into v11/feature/json-schema
ronaldbarendse Nov 17, 2022
1690a93
Ignore additional JSON schema files in template
ronaldbarendse Nov 17, 2022
62ef411
Update CompatibilitySuppressions.xml
ronaldbarendse Nov 17, 2022
fbd7720
Remove GlobalSettings.UmbracoPath from JSON schema again
ronaldbarendse Nov 17, 2022
fe81b10
Remove RemoveUmbracoJsonSchemaFiles target
ronaldbarendse Nov 18, 2022
e07ddcb
Update Umbraco.JsonSchema.Extensions to 0.2.0 and add weights
ronaldbarendse Nov 18, 2022
74c7978
Flatten generated JSON schema hierarchy
ronaldbarendse Nov 18, 2022
e8338c2
Merge branch 'release/11.0' into v11/feature/json-schema
ronaldbarendse Nov 22, 2022
a917f85
Remove LicensesSettings from CMS codebase
ronaldbarendse Nov 22, 2022
ab417da
Change AdditionalParameters to IDictionary
ronaldbarendse Nov 22, 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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ preserve.belle
/tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/

# Ignore auto-generated schema
/src/Umbraco.Cms.Targets/appsettings-schema.json
/src/Umbraco.Cms.Targets/tasks/
/src/Umbraco.Cms.Targets/appsettings-schema.*.json
/src/Umbraco.Web.UI/appsettings-schema.json
/src/Umbraco.Web.UI/appsettings-schema.*.json
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>preview</LangVersion>
<LangVersion>latest</LangVersion>
<Company>Umbraco HQ</Company>
<Authors>Umbraco</Authors>
<Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
Expand Down Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" IsImplicitlyDefined="true" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" IsImplicitlyDefined="true" />
<PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
<PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
<PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" PrivateAssets="all" IsImplicitlyDefined="true" />
</ItemGroup>

<ItemGroup>
Expand Down
81 changes: 0 additions & 81 deletions src/JsonSchema/AppSettings.cs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/JsonSchema/Options.cs
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions src/JsonSchema/Program.cs
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions src/JsonSchema/UmbracoJsonSchemaGenerator.cs
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/JsonSchema/UmbracoJsonSchemaGeneratorSettings.cs
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions src/JsonSchema/appsettings-schema.json
View file
Open in desktop

This file was deleted.

Loading