diff --git a/.gitignore b/.gitignore index 348474c8cb..418c9655dd 100644 --- a/.gitignore +++ b/.gitignore @@ -102,4 +102,5 @@ cypress.env.json /tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/ # Ignore auto-generated schema -/src/Umbraco.Web.UI/[Uu]mbraco/config/appsettings-schema.json +/src/Umbraco.Web.UI/appsettings-schema.json +/src/Umbraco.Cms/appsettings-schema.json diff --git a/src/JsonSchema/Options.cs b/src/JsonSchema/Options.cs index 83a2a8ef94..4471ee49ce 100644 --- a/src/JsonSchema/Options.cs +++ b/src/JsonSchema/Options.cs @@ -7,7 +7,7 @@ namespace JsonSchema { internal class Options { - [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/umbraco/config/appsettings-schema.json")] + [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/appsettings-schema.json")] public string OutputFile { get; set; } = null!; } } diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj index 8e27992ff9..e14abad8a1 100644 --- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj +++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj @@ -37,8 +37,6 @@ - - @@ -57,8 +55,6 @@ - - diff --git a/src/Umbraco.Cms/Umbraco.Cms.csproj b/src/Umbraco.Cms/Umbraco.Cms.csproj index 0036cacbda..3aea79587d 100644 --- a/src/Umbraco.Cms/Umbraco.Cms.csproj +++ b/src/Umbraco.Cms/Umbraco.Cms.csproj @@ -6,6 +6,7 @@ Umbraco.Cms Installs Umbraco CMS in your ASP.NET Core project + @@ -14,6 +15,29 @@ + + + $(ProjectDir)appsettings-schema.json + $(ProjectDir)../JsonSchema/ + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets new file mode 100644 index 0000000000..7f2d0cb2c4 --- /dev/null +++ b/src/Umbraco.Cms/buildTransitive/Umbraco.Cms.targets @@ -0,0 +1,16 @@ + + + $(MSBuildThisFileDirectory)..\appsettings-schema.json + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 790d2e70eb..54ab69b37e 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -41,7 +41,8 @@ - $(ProjectDir)umbraco/config/appsettings-schema.json + $(ProjectDir)appsettings-schema.json + $(ProjectDir)../JsonSchema/JsonSchema.csproj @@ -58,7 +59,8 @@ - + + diff --git a/src/Umbraco.Web.UI/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json index 9cac2c3dd9..33c5dd2fae 100644 --- a/src/Umbraco.Web.UI/appsettings.Development.template.json +++ b/src/Umbraco.Web.UI/appsettings.Development.template.json @@ -1,5 +1,5 @@ { - "$schema" : "./umbraco/config/appsettings-schema.json", + "$schema" : "./appsettings-schema.json", "Serilog": { "MinimumLevel": { "Default": "Information", diff --git a/src/Umbraco.Web.UI/appsettings.template.json b/src/Umbraco.Web.UI/appsettings.template.json index 2a291c5bc6..ed03407c0b 100644 --- a/src/Umbraco.Web.UI/appsettings.template.json +++ b/src/Umbraco.Web.UI/appsettings.template.json @@ -1,5 +1,5 @@ { - "$schema": "./umbraco/config/appsettings-schema.json", + "$schema": "./appsettings-schema.json", "ConnectionStrings": { "umbracoDbDSN": "" }, diff --git a/templates/UmbracoProject/appsettings.Development.json b/templates/UmbracoProject/appsettings.Development.json index 7567335326..d789f6cd32 100644 --- a/templates/UmbracoProject/appsettings.Development.json +++ b/templates/UmbracoProject/appsettings.Development.json @@ -1,5 +1,5 @@ { - "$schema": "./umbraco/config/appsettings-schema.json", + "$schema": "./appsettings-schema.json", "Serilog": { "MinimumLevel": { "Default": "Information" diff --git a/templates/UmbracoProject/appsettings.json b/templates/UmbracoProject/appsettings.json index 121e907020..5e866a77a3 100644 --- a/templates/UmbracoProject/appsettings.json +++ b/templates/UmbracoProject/appsettings.json @@ -1,5 +1,5 @@ { - "$schema": "./umbraco/config/appsettings-schema.json", + "$schema": "./appsettings-schema.json", "Serilog": { "MinimumLevel": { "Default": "Information",