diff --git a/.gitignore b/.gitignore
index 5775b2c708..348474c8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,74 +37,69 @@ _NCrunch_*/
tools/NDepend/
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
-[sS]ource
-[sS]andbox
+[Ss]ource
+[Ss]andbox
node_modules
lib-bower
*.psess
*.vspx
-NDependOut/*
+NDependOut/
QueryResult.htm
-tools/docfx/*
+tools/docfx/
# Ignore rule for clearing out Belle (avoid rebuilding all the time)
preserve.belle
# Ignore rule for output of generated documentation files from grunt docserve
-src/Umbraco.Web.UI.Docs/api
-src/Umbraco.Web.UI.Docs/package-lock.json
+/src/Umbraco.Web.UI.Docs/api/
+/src/Umbraco.Web.UI.Docs/package-lock.json
# Build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
+/build.out/
+/build.tmp/
+/build/hooks/
+/build/temp/
# Build output
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/ApiDocs/api/*
+/build/docs.zip
+/build/ui-docs.zip
+/build/csharp-docs.zip
+/build/ApiDocs/
+/src/ApiDocs/api/
+/src/Umbraco.Cms.StaticAssets/wwwroot/umbraco/
# Environment specific data
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/TESTS-*.xml
-src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs
-src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/*
-src/Umbraco.Web.UI/appsettings.Development.json
-src/Umbraco.Web.UI/appsettings.json
-src/Umbraco.Web.UI/appsettings.Local.json
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
-src/Umbraco.Web.UI/wwwroot/Media/*
-src/Umbraco.Web.UI/Smidge/
-src/Umbraco.Web.UI/App_Code/
-src/Umbraco.Web.UI/App_Plugins/
-src/Umbraco.Web.UI/Views/
-!src/Umbraco.Web.UI/Views/Partials/blocklist/
-!src/Umbraco.Web.UI/Views/Partials/grid/
-!src/Umbraco.Web.UI/Views/_ViewImports.cshtml
+/src/Umbraco.Web.UI.Client/[Bb]uild/
+/src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+/src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+/src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/Umbraco.Web.UI/wwwroot/[Mm]edia/
+/src/Umbraco.Web.UI/App_Code/
+/src/Umbraco.Web.UI/App_Plugins/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/
+/src/Umbraco.Web.UI/Views/
+!/src/Umbraco.Web.UI/Views/Partials/blocklist/
+!/src/Umbraco.Web.UI/Views/Partials/grid/
+!/src/Umbraco.Web.UI/Views/_ViewImports.cshtml
+/src/Umbraco.Web.UI/appsettings.json
+/src/Umbraco.Web.UI/appsettings.Development.json
+/src/Umbraco.Web.UI/appsettings.Local.json
# Tests
cypress.env.json
-tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
-tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
-tests/Umbraco.Tests.AcceptanceTest/cypress/videos/
-tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
-tests/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
-tests/Umbraco.Tests.Integration/appsettings.Tests.Local.json
-tests/Umbraco.Tests.Integration/TEMP/*
-tests/Umbraco.Tests.Integration/umbraco/Data/
-tests/Umbraco.Tests.Integration/umbraco/logs/
-tests/Umbraco.Tests.Integration/Views/
-tests/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
+/tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
+/tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
+/tests/Umbraco.Tests.AcceptanceTest/cypress/videos/
+/tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
+/tests/Umbraco.Tests.Integration.SqlCe/[Uu]mbraco/[Dd]ata/TEMP/
+/tests/Umbraco.Tests.Integration/appsettings.Tests.Local.json
+/tests/Umbraco.Tests.Integration/TEMP/
+/tests/Umbraco.Tests.Integration/[Uu]mbraco/[Dd]ata/
+/tests/Umbraco.Tests.Integration/[Uu]mbraco/[Ll]ogs/
+/tests/Umbraco.Tests.Integration/Views/
+/tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/
# Ignore auto-generated schema
-src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json
+/src/Umbraco.Web.UI/[Uu]mbraco/config/appsettings-schema.json
diff --git a/build/NuSpecs/UmbracoCms.StaticAssets.nuspec b/build/NuSpecs/UmbracoCms.StaticAssets.nuspec
deleted file mode 100644
index 86ad68dd5f..0000000000
--- a/build/NuSpecs/UmbracoCms.StaticAssets.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Umbraco.Cms.StaticAssets
- 9.0.0
- Umbraco Cms Static Assets
- Umbraco HQ
- Umbraco HQ
- MIT
- https://umbraco.com/
- https://umbraco.com/dist/nuget/logo-small.png
- false
- Contains the static assets that is required to run Umbraco CMS.
- Contains the static assets that is required to run Umbraco CMS.
- en-US
- umbraco
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 127fd28220..f105f33cda 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -2,7 +2,7 @@
Umbraco.Cms
- 9.0.0
+ 10.0.0
Umbraco Cms
Umbraco HQ
Umbraco HQ
@@ -24,12 +24,8 @@
-
-
-
-
+
+
+
diff --git a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
deleted file mode 100644
index 2ef0a44a9c..0000000000
--- a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
- $(MSBuildThisFileDirectory)..\content\umbraco\**\*.*
- $(MSBuildThisFileDirectory)..\content\wwwroot\umbraco\**\*.*
- umbraco
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_AppPluginsFiles Include="App_Plugins\**" />
-
-
-
-
-
-
-
-
- <_UmbracoFolderFiles Include="umbraco\config\**" />
- <_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" />
- <_UmbracoFolderFiles Include="umbraco\UmbracoBackOffice\**" />
- <_UmbracoFolderFiles Include="umbraco\UmbracoInstall\**" />
- <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
- <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
- <_UmbracoFolderFiles Include="umbraco\Licenses\**" />
-
-
- <_UmbracoFolderFiles Include="umbraco\Deploy\**" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.props b/build/NuSpecs/buildTransitive/Umbraco.Cms.props
similarity index 100%
rename from build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.props
rename to build/NuSpecs/buildTransitive/Umbraco.Cms.props
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
index feecac1c10..58c1ff9ee1 100644
--- a/build/azure-pipelines.yml
+++ b/build/azure-pipelines.yml
@@ -271,7 +271,7 @@ stages:
gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js
targets: build
workingDirectory: src\Umbraco.Web.UI.Client
- - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
+ - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj /Umbraco:CMS:Global:Id=0000000-0000-0000-0000-000000000042"
displayName: dotnet run
# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj
# displayName: dotnet run
@@ -375,7 +375,7 @@ stages:
displayName: dotnet run
inputs:
targetType: 'inline'
- script: 'nohup dotnet run --no-build -p ./src/Umbraco.Web.UI/ > $(Build.ArtifactStagingDirectory)/dotnet_run_log_linux.txt &'
+ script: 'nohup dotnet run --no-build -p ./src/Umbraco.Web.UI/ /Umbraco:CMS:Global:Id=0000000-0000-0000-0000-000000000042 > $(Build.ArtifactStagingDirectory)/dotnet_run_log_linux.txt &'
- task: Bash@3
displayName: Generate Cypress.env.json
inputs:
diff --git a/build/build.ps1 b/build/build.ps1
index c2be223a2c..0c2780fb03 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -192,7 +192,6 @@
$this.RemoveFile($excludeFiles)
# copy rest of the files into WebApp
- $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco")
$excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\lib","$($this.BuildTemp)\WebApp\umbraco\Data","$($this.BuildTemp)\WebApp\umbraco\Logs")
$this.RemoveDirectory($excludeUmbracoDirs)
$this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Views", "*", "$($this.BuildTemp)\WebApp\Views")
@@ -301,13 +300,6 @@
$_.CreationTime = $_.CreationTime.AddHours(-11)
$_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
}
-
- # copy Belle
- Write-Host "Copy Belle"
- $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets")
- $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js")
- $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib")
- $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views")
})
@@ -365,12 +357,6 @@
-Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
- &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.StaticAssets.nuspec" `
- -Properties BuildTmp="$($this.BuildTemp)" `
- -Version "$($this.Version.Semver.ToString())" `
- -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsstaticassets.log"
- if (-not $?) { throw "Failed to pack NuGet UmbracoCms.StaticAssets." }
-
&$this.BuildEnv.NuGet Pack "$templates\Umbraco.Templates.nuspec" `
-Properties BuildTmp="$($this.BuildTemp)" `
-Version "$($this.Version.Semver.ToString())" `
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9fd8703f84..6eaa51e431 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
10.0.0
10.0.0
- 10.0.0-rc
+ 10.0.0-rc1
10.0.0
10.0
en-US
@@ -19,6 +19,9 @@
umbraco
git
https://github.com/umbraco/umbraco-cms
+ enable
+ Nullable
+ enable
diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index 0851baba2e..e80666038c 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -16,7 +16,7 @@ namespace JsonSchema
///
/// Gets or sets the Umbraco
///
- public UmbracoDefinition Umbraco { get; set; }
+ public UmbracoDefinition? Umbraco { get; set; }
///
/// Configuration of Umbraco CMS and packages
@@ -24,76 +24,76 @@ namespace JsonSchema
internal class UmbracoDefinition
{
// ReSharper disable once InconsistentNaming
- public CmsDefinition CMS { get; set; }
+ public CmsDefinition? CMS { get; set; }
- public FormsDefinition Forms { get; set; }
+ public FormsDefinition? Forms { get; set; }
- public DeployDefinition Deploy { get; set; }
+ public DeployDefinition? Deploy { get; set; }
///
/// Configurations for the Umbraco CMS
///
public class CmsDefinition
{
- public ActiveDirectorySettings ActiveDirectory { get; set; }
+ public ActiveDirectorySettings? ActiveDirectory { get; set; }
- public ContentSettings Content { get; set; }
+ public ContentSettings? Content { get; set; }
- public ExceptionFilterSettings ExceptionFilter { get; set; }
+ public ExceptionFilterSettings? ExceptionFilter { get; set; }
- public ModelsBuilderSettings ModelsBuilder { get; set; }
+ public ModelsBuilderSettings? ModelsBuilder { get; set; }
- public GlobalSettings Global { get; set; }
+ public GlobalSettings? Global { get; set; }
- public HealthChecksSettings HealthChecks { get; set; }
+ public HealthChecksSettings? HealthChecks { get; set; }
- public HostingSettings Hosting { get; set; }
+ public HostingSettings? Hosting { get; set; }
- public ImagingSettings Imaging { get; set; }
+ public ImagingSettings? Imaging { get; set; }
- public IndexCreatorSettings Examine { get; set; }
+ public IndexCreatorSettings? Examine { get; set; }
- public KeepAliveSettings KeepAlive { get; set; }
+ public KeepAliveSettings? KeepAlive { get; set; }
- public LoggingSettings Logging { get; set; }
+ public LoggingSettings? Logging { get; set; }
- public MemberPasswordConfigurationSettings MemberPassword { get; set; }
+ public MemberPasswordConfigurationSettings? MemberPassword { get; set; }
- public NuCacheSettings NuCache { get; set; }
+ public NuCacheSettings? NuCache { get; set; }
- public RequestHandlerSettings RequestHandler { get; set; }
+ public RequestHandlerSettings? RequestHandler { get; set; }
- public RuntimeSettings Runtime { get; set; }
+ public RuntimeSettings? Runtime { get; set; }
- public SecuritySettings Security { get; set; }
+ public SecuritySettings? Security { get; set; }
- public TourSettings Tours { get; set; }
+ public TourSettings? Tours { get; set; }
- public TypeFinderSettings TypeFinder { get; set; }
+ public TypeFinderSettings? TypeFinder { get; set; }
- public UserPasswordConfigurationSettings UserPassword { get; set; }
+ public UserPasswordConfigurationSettings? UserPassword { get; set; }
- public WebRoutingSettings WebRouting { get; set; }
+ public WebRoutingSettings? WebRouting { get; set; }
- public UmbracoPluginSettings Plugins { get; set; }
+ public UmbracoPluginSettings? Plugins { get; set; }
- public UnattendedSettings Unattended { get; set; }
+ public UnattendedSettings? Unattended { get; set; }
- public RichTextEditorSettings RichTextEditor { get; set; }
+ public RichTextEditorSettings? RichTextEditor { get; set; }
- public RuntimeMinificationSettings RuntimeMinification { get; set; }
+ public RuntimeMinificationSettings? RuntimeMinification { get; set; }
- public BasicAuthSettings BasicAuth { get; set; }
+ public BasicAuthSettings? BasicAuth { get; set; }
- public PackageMigrationSettings PackageMigration { get; set; }
+ public PackageMigrationSettings? PackageMigration { get; set; }
- public LegacyPasswordMigrationSettings LegacyPasswordMigration { get; set; }
+ public LegacyPasswordMigrationSettings? LegacyPasswordMigration { get; set; }
- public ContentDashboardSettings ContentDashboard { get; set; }
+ public ContentDashboardSettings? ContentDashboard { get; set; }
- public HelpPageSettings HelpPage { get; set; }
+ public HelpPageSettings? HelpPage { get; set; }
- public InstallDefaultDataSettings DefaultDataCreation { get; set; }
+ public InstallDefaultDataSettings? DefaultDataCreation { get; set; }
}
///
@@ -101,24 +101,24 @@ namespace JsonSchema
///
public class FormsDefinition
{
- public FormDesignSettings FormDesign { get; set; }
+ public FormDesignSettings? FormDesign { get; set; }
- public PackageOptionSettings Options { get; set; }
+ public PackageOptionSettings? Options { get; set; }
- public Umbraco.Forms.Core.Configuration.SecuritySettings Security { get; set; }
+ public Umbraco.Forms.Core.Configuration.SecuritySettings? Security { get; set; }
- public FieldTypesDefinition FieldTypes { get; set; }
+ public FieldTypesDefinition? FieldTypes { get; set; }
///
/// Configurations for the Umbraco Forms Field Types
///
public class FieldTypesDefinition
{
- public DatePickerSettings DatePicker { get; set; }
+ public DatePickerSettings? DatePicker { get; set; }
- public Recaptcha2Settings Recaptcha2 { get; set; }
+ public Recaptcha2Settings? Recaptcha2 { get; set; }
- public Recaptcha3Settings Recaptcha3 { get; set; }
+ public Recaptcha3Settings? Recaptcha3 { get; set; }
}
}
@@ -127,11 +127,11 @@ namespace JsonSchema
///
public class DeployDefinition
{
- public DeploySettings Settings { get; set; }
+ public DeploySettings? Settings { get; set; }
- public DeployProjectConfig Project { get; set; }
+ public DeployProjectConfig? Project { get; set; }
- public DebugSettings Debug { get; set; }
+ public DebugSettings? Debug { get; set; }
}
}
}
diff --git a/src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs b/src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs
index 54ce0fdedf..137dd551cf 100644
--- a/src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs
+++ b/src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs
@@ -8,6 +8,6 @@ namespace JsonSchema
{
internal class NamespacePrefixedSchemaNameGenerator : DefaultSchemaNameGenerator
{
- public override string Generate(Type type) => type.Namespace.Replace(".", string.Empty) + base.Generate(type);
+ public override string Generate(Type type) => type.Namespace?.Replace(".", string.Empty) + base.Generate(type);
}
}
diff --git a/src/JsonSchema/Options.cs b/src/JsonSchema/Options.cs
index 9930210cd8..83a2a8ef94 100644
--- a/src/JsonSchema/Options.cs
+++ b/src/JsonSchema/Options.cs
@@ -8,6 +8,6 @@ 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")]
- public string OutputFile { get; set; }
+ public string OutputFile { get; set; } = null!;
}
}
diff --git a/src/JsonSchema/Program.cs b/src/JsonSchema/Program.cs
index 8b02068c46..98dae7ac22 100644
--- a/src/JsonSchema/Program.cs
+++ b/src/JsonSchema/Program.cs
@@ -31,7 +31,7 @@ namespace JsonSchema
var path = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, options.OutputFile));
Console.WriteLine("Path to use {0}", path);
- Directory.CreateDirectory(Path.GetDirectoryName(path));
+ Directory.CreateDirectory(Path.GetDirectoryName(path)!);
Console.WriteLine("Ensured directory exists");
await File.WriteAllTextAsync(path, schema);
diff --git a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs
index e06189d3b4..4422436d8d 100644
--- a/src/JsonSchema/UmbracoJsonSchemaGenerator.cs
+++ b/src/JsonSchema/UmbracoJsonSchemaGenerator.cs
@@ -43,14 +43,14 @@ namespace JsonSchema
var result = await response.Content.ReadAsStringAsync();
- return JsonConvert.DeserializeObject(result);
+ return JsonConvert.DeserializeObject(result)!;
}
private JObject GenerateUmbracoSchema()
{
NJsonSchema.JsonSchema schema = _innerGenerator.Generate(typeof(AppSettings));
- return JsonConvert.DeserializeObject(schema.ToJson());
+ return JsonConvert.DeserializeObject(schema.ToJson())!;
}
}
}
diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj
index d73e5293f7..e206cd8653 100644
--- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj
+++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj
@@ -2,9 +2,6 @@
net6.0
- enable
- enable
-
Umbraco.Cms.Persistence.SqlServer
Umbraco.Cms.Persistence.SqlServer
Adds support for SQL Server to Umbraco CMS.
diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj
index 8471b6db92..57055ec96b 100644
--- a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj
+++ b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj
@@ -2,9 +2,6 @@
net6.0
- enable
- enable
-
Umbraco.Cms.Persistence.Sqlite
Umbraco.Cms.Persistence.Sqlite
Adds support for SQLite to Umbraco CMS.
diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
new file mode 100644
index 0000000000..8e27992ff9
--- /dev/null
+++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
@@ -0,0 +1,83 @@
+
+
+
+ net6.0
+ true
+ Umbraco.Cms.StaticAssets
+ Contains the static assets that is required to run Umbraco CMS.
+ /
+
+
+
+
+ true
+ buildTransitive
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)wwwroot/umbraco
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_UmbracoFolderFiles Include="umbraco\config\**" />
+ <_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" />
+ <_UmbracoFolderFiles Include="umbraco\UmbracoBackOffice\**" />
+ <_UmbracoFolderFiles Include="umbraco\UmbracoInstall\**" />
+ <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
+ <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
+ <_UmbracoFolderFiles Include="umbraco\Licenses\**" />
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
similarity index 93%
rename from src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
rename to src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
index e45d48a911..ab45a61ed0 100644
--- a/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
@@ -59,15 +59,15 @@
@*And finally we can load in our angular app*@
-
+