Commit Graph

74 Commits

Author SHA1 Message Date
Bjarke Berg
d206df0cac Updated dependencies and cleaned up 2022-09-23 14:56:23 +02:00
Bjarke Berg
d139f4acc0 Updated dependencies and fixed new NRT issues
(cherry picked from commit 803c044b60)
(cherry picked from commit b2b2903a6e)
2022-09-20 10:48:29 +02:00
Sebastiaan Janssen
40035aa629 Merge branch 'v10/dev' into v11/dev 2022-09-20 09:13:22 +02:00
Sebastiaan Janssen
8d5fb41ab7 Revert "Updated dependencies and fixed new NRT issues"
This reverts commit b2b2903a6e.
2022-09-20 09:08:28 +02:00
Sebastiaan Janssen
db5d05d641 Revert files that shouldn't change back in v11 2022-09-19 16:37:24 +02:00
Bjarke Berg
b2b2903a6e Updated dependencies and fixed new NRT issues
(cherry picked from commit 803c044b60)
2022-09-19 16:21:50 +02:00
Sebastiaan Janssen
87c06f5f98 Back to 10.2.0-ish 2022-09-19 16:14:16 +02:00
Bjarke Berg
803c044b60 Updated dependencies and fixed new NRT issues 2022-09-19 12:36:45 +02:00
Bjarke Berg
74c45ee60d Merge remote-tracking branch 'origin/v10/dev' into v11/dev
# Conflicts:
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
#	src/Umbraco.Core/Models/Mapping/DictionaryMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Install/InstallApiController.cs
#	version.json
2022-09-12 16:47:20 +02:00
Mole
748fb7d1f7 Implement new backoffice installer (#12790)
* Add new BackOfficeApi project

* Add swagger

* Add and route new install controller

* Add new install steps

* Add Setup endpoint

* Add missing RequiresExecution methods

* Fix nullability of databasemodel

* Move user information to separate model

* Remove ping method

* Add view models install data

* Move mapping folder

* Move ViewModels

* Add settings endpoint

* Remove unused binderprovider

* Postfix RequiresExecution with async

* Update NewDatabaseUpgradeStep to not depend on install step

* Add installstep collection

* Move registration into backoffice project

* Add InstallService

* Use service in controller

* Add upgrade to install service and use in controller

* Correctly check is database is configured

* Reorganize

* Reorganize into new core and infrastructure

* Rename steps

* Rename BackofficeApi to MangementApi

* Make install step an interface instead of abstract class

* Rename InstallStep to create CreateUserStep

* Move restart runtime and sign in user into install steps

* Move install service into new core project

* Map controllers in composer

* Restrict access to installcontroller based on runtime level

* Use FireAndForget when logging install

* Use actionresult instead of iactionresult

* Set new projects as not packable

* Link to backoffice in 201 response when installed

* Register installations

* Add custom backoffice routing template token

* Move umbraco path trimming out of application convention

* Make it easier to route to backoffice api

* Make swagger version aware and move behind backoffice path

* Obsolete old install classes

* Move maps into single file

This is all mappint to/from viewmodels in some manner

* Remove usage of InstallSetupResult

* Move new projects to the src folder

* Remove InstallationType from IInstallStep

This upgrade steps should implement their own IUpgradeStep interface

* Remove upgrade from service and controller

This should be its own service and controller

* Add xml docs

* Remove internals visible to

* Disable package validation for new projects

Quite the gotcha here, if the projects are brand new, there is no nuget packages to compare with, this causes the build to fail.

* Add ValidateDatabase endpoint

* Remove project references to new backoffice

We don't actually want to depend on this yet, it's just needed for testing/development

* Obsolete installationtype

* Add DatabaseSettingsFactory tests

* Add InstallServiceTests

* Fix InstallServiceTests

* Test RequireRuntimeLevelAttribute

* Implement new backoffice upgrader (#12818)

* Add UpgradeSettingsModel and viewmodel

* Add upgrade/settings endpoint

* Implement upgrade steps

* Add upgrade step collection

* Add UpgradeService

* Add authorize endpoint to UpgradeController

* Fix interface

* Add upgrade service tests

* Remove runtime check in databaseinstallstep

* Move RequireRuntimeLevel to controller

* Add a readme to the new backoffice part

* BackOffice not Backoffice

* Add conditional project references

* Fixes based on review

* Fix up

* Move running of steps into its own method in UpgradeService

* Make services transient

* More fixup

* Log exceptions when running steps
2022-08-29 09:50:48 +02:00
Nikolaj Geisle
1b5225f4cd V11/feature/update to dotnet 7 (#12712)
* Update projects to .NET 7

* Fix nullability errors

* Fix up pipelines to run 7.0

* Update langversion to preview

* Revert "Fix up pipelines to run 7.0"

This reverts commit d0fa8d01b8126a4eaa59832a3814a567705419ae.

* Fix up pipelines again, this time without indentation changes

* Include preview versions

* Versions not Version

* Fix ModelTypeTests

* Fix MemberPasswordHasherTests

Microsoft wants to use SHA512 instead of SHA256, so our old hashes will return SuccessRehashNeeded now

* Use dotnet cli instead of nuget restore

* Update src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

* Update dependencies

* Fix nullability issues

* Fix unit test

* Fix nullability in ChangingPasswordModel

OldPassword can be null, if we're changing the password with password reset enabled. Additionally, we might as well use the new required keyword instead of supressing null.

* Use required keyword instead of supressing null

* Fix up pipelines again

* fix up spelling-error

* Use dotnet cli instead of nuget restore

* Fix up another NuGet command

* Use dotnet version 7 before building

* Include preview versions

* Remove condition

* Use dotnet 7 before running powershell script

* Update templates to .net 7

* Download version 7 before running linux container

* Move use dotnet 7 even earlier in E2E process

* Remove dotnet 7

* Reintroduce .NET 7 task

* Update linux docker container and remove dotnet 7 from yml

* Fix up dockerfile with ARG

* Fix up docker file with nightly builds of dotnet 7

* Reintroduce dotnet 7 so windows can use it

* Use aspnet 7 in docker

Co-authored-by: Nikolaj <nikolajlauridsen@protonmail.ch>
Co-authored-by: Zeegaan <nge@umbraco.dk>
2022-08-23 11:31:05 +02:00
Mole
8ffede0441 V10: merge release branch 20220620 (#12590)
* Add Umbraco specific global usings

* Enable implicit usings

* v10: Wait for updated ConnectionStrings during install (#12536)

* Do not change/reload configuration

* Wait for updated connection string options

* recase assigndomain (#12448)

* Add depth property to ICoreScope (#12540)

* Remove ambient scope stack from httpcontext.items. (#12539)

This change makes it easier to use service calls in parallel whilst
a httpcontext is available.

* v10: Prefer SQLite primitive types to flexible types (#12541)

* Prefer SQLite primitive types to flexible types.

* SQLite - column mappings use TEXT for decimals

Thanks @mattbrailsford for sense check.

* Fix issue where languages files are not found in subdir of package dir (#12543)

* Make FindContent return type nullable (#12545)

* Updated nuget dependencies (07-06-2022) (#12525)

* Updated nuget dependencies

* Move Nerdbank.GitVersioning update to Directory.Build.props

* Updated more dependencies

* Improve FlagOutOfDateModels property behaviour.

(cherry picked from commit 54077725c373495fce0d3fbc5cdb6469aad3b676)

* Fix logic error WRT models builder flag out of date models. (#12548)

(cherry picked from commit 6b0149803a879d1c6902a5f61d1f2e9dc8545aac)

* Fixed issue with expected null value. (#12550)

Fixes https://github.com/umbraco/Umbraco-CMS/issues/12526

* Updated Examine to 3.0.0

* Fixes relation issue, when moving a root item to recycle bin, the "Relate Parent Media Folder On Delete"/"Relate Parent Document On Delete" cannot get the parent node type, because it is a fake root.

* Fix possible null error

* Bump version to 10.0.0 final

* Fix attempting to write lock files to LocalTempPath before it exists (#12563)

* Re fix usage statements

Co-authored-by: Ronald Barendse <ronald@barend.se>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Co-authored-by: Paul Johnson <pmj@umbraco.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2022-06-20 09:20:47 +02:00
Nikolaj Geisle
f23b57db65 V10: fix more nullable references (#12321)
* Add Nullable and WarningsAsErrors to Build.props

* Remove Nullable from cs proj, add ImplicitUsings to build.props

* Fix errors in core

* Fix in JsonSchema

* Fix infrastructure

* Add non-ambiguous using

* Fix Web/Lucene

* Fix backoffice

* Fix up new build errors from merge

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
2022-04-29 15:02:36 +02:00
Nikolaj Geisle
70a75d8c9b Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice
# Conflicts:
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/Models/Member.cs
#	src/Umbraco.Core/Models/Membership/User.cs
#	src/Umbraco.Core/Services/MemberService.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Security/MemberUserStore.cs
2022-04-22 12:32:57 +02:00
Bjarke Berg
379d2e3e4e Dependency updates (#12283)
* Upgraded MailKit

* Upgraded Microsoft.* packages

* Upgrades various nuget packages to latest version

* Upgrades various nuget packages related to test
2022-04-22 09:24:30 +02:00
Nikolaj Geisle
acf60ce84c Update csproj to nullable 2022-04-04 15:02:53 +02:00
Nikolaj Geisle
57ed0b7b4d start work on the backoffice project 2022-03-30 15:58:46 +02:00
Elitsa Marinovska
61f459670c Update to .NET6 and ASP.NET Core 6 (#11652)
* Changed targetFramework in nuspec file & project files + updated NuGet dependencies

* Updated .net version in pipelines

* Updated .net version in templates

* Update more dependencies

* Fixed ambiguous call to DistinctBy() - part of Umbraco.Extensions and System.Linq

* Disabling the Razor source generators in .NET 6 due to error: "Cannot find the fallback endpoint specified by route values..."

* Fixed unit tests

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-11-18 15:35:42 +01:00
Bjarke Berg
e95a759181 Updated nuget package dependencies 2021-09-20 12:59:14 +02:00
Bjarke Berg
025a7aca29 Updated nuget packages 2021-05-19 21:44:33 +02:00
Bjarke Berg
df6d4a603e Fix lucene reference for linux too 2021-05-19 15:05:30 +02:00
Warren Buckley
cb01e11586 Deterministic Builds for Sourcelink (#10237)
* Remove the properties from each .CSProj

* Move this into Directory.Build.props so all CSProj can get all these extra properties

* Add conditional to only add extra property to get the Deterministic green checkmark when running on Azure Pipleine
2021-05-06 19:56:43 +02:00
Warren Buckley
f43f37dc35 Umbraco V9 Adds SourceLink package from Microsoft for people to debug into the relevent build commit with GitHub source code (#10224)
We had this previously in Umbraco V8
2021-05-04 18:58:50 +02:00
Mole
51a720b16c Add references to Umbraco.Code as PrivateAsset (#10148)
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-27 09:07:10 +02:00
Andy Butland
19a9caf47b Removed project configuration to expose internals to Forms and made the two used internal dependencies public. 2021-04-15 12:49:47 +02:00
Andy Butland
12d5bdc552 Temporary commit to remove exposing of internals to Forms. 2021-04-15 12:06:13 +02:00
Andy Butland
aae7fc955f Made web layer internals visible to Umbraco Forms assemblies. 2021-04-02 11:48:21 +02:00
Bjarke Berg
d777d7dded Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 13:48:14 +01:00
Bjarke Berg
2b89839724 Netcore: Get rid of default files in config folder (#9966)
* TourController now uses the core tours from embedded resources

* Moved tinyMceConfig.*.config to IOptions

* Embedded the default grid.editors.config.js

* Fixed issue when saving grid with an empty media cell

* Logviewer now uses sql as database instead of file.

* Remove config folder from build script and nuget pacakges.

* Removing auto-generated Id added to appsettings.json

* Update src/Umbraco.Web.BackOffice/Controllers/TourController.cs

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
2021-03-11 13:20:46 +01:00
Bjarke Berg
8d743cbe2c Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-11 10:33:48 +01:00
Mole
d505c85551 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/individual-nuget-pr-assembly 2021-03-05 14:07:16 +01:00
Mole
f5df05d685 Add metadata to all packages and rename UmbracoCms.Lucene.nuspec to UmbracoCms.Examine.Lucene.nuspec 2021-03-05 13:56:41 +01:00
Mole
390cf6ca66 Pack all projects as individual packages and add them as dependency
Only have to add Umbraco.Cms.Web.Website and Umbraco.Cms.Web.BackOffice, rest will be indirect dependencies.
2021-03-04 14:10:55 +01:00
Shannon
d72c11821f Merge remote-tracking branch 'origin/netcore/dev' into netcore/bugfix/10196-ambient-scope
# Conflicts:
#	src/Umbraco.Core/HybridAccessorBase.cs
#	src/Umbraco.Core/Security/IBackOfficeSecurityFactory.cs
#	src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Security/BackofficeSecurityFactory.cs
2021-03-04 16:57:32 +11:00
Shannon
2d0389d53c Updates project dependencies to latest patch releases, removes Umbraco.Code from Umbraco.Web since it was causing conflicts for some reason - finally these conflict errors are gone. 2021-03-04 14:10:10 +11:00
Bjarke Berg
1c50ece986 Use c#9 + namespace fix 2021-03-02 16:20:44 +01:00
Mole
bf41c2eeaa Netcore: Align namespaces (#9801)
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
2021-02-18 11:06:02 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Bjarke Berg
e38972abf0 Updated to net5.0 and updated most nuget packages. Also fixed the nuspec files. + Fix typo Persistance => Persistence. 2021-01-20 21:01:45 +01:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Elitsa Marinovska
0f9595a5b1 Updates nuget packages versions to latest 2020-09-17 17:58:11 +02:00
Bjarke Berg
1599e74193 Removed Umbraco.Configuration project 2020-09-14 14:15:09 +02:00
Shannon
f84a93ae20 Adds IUmbracoBuilder to build the config so it's easier to split apart, ensures background tasks don't run in integration tests, uses a custom CoreRuntime to ensure we use SimpleMainDom, re-wires the UmbracoWebApplicationFactory so that duplicate Hosts are not running at the same time, fixes issues with overriding/shadowing, uses RAMDirectory in lucene for tests, fixes CoreRuntime's events that we're moved incorrectly and not backwards compat, adds new real non static events which we can use in integration tests to install the DB before the runtime state is calculated 2020-09-02 18:10:29 +10:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
091a777b62 Conditional load of netframework dlls 2020-08-19 19:51:06 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
2020-08-11 08:33:11 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-10 14:15:38 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget
NuGet package specifications for SQL CE
2020-07-10 13:49:42 +02:00