Commit Graph

41570 Commits

Author SHA1 Message Date
Ronald Barendse
b6e93116dc Merge pull request #12516 from umbraco/v10/feature/global-usings
v10: Add global usings
2022-06-07 11:04:47 +02:00
Nikolaj Geisle
559a85812f recase assigndomain (#12448) 2022-06-07 09:01:57 +02:00
Ronald Barendse
4dcb017afe v10: Wait for updated ConnectionStrings during install (#12536)
* Do not change/reload configuration

* Wait for updated connection string options
2022-06-07 08:44:03 +02:00
Bjarke Berg
9aa6ec9d79 Merge pull request #12532 from umbraco/v10/feature/merge_v9.5.1_into_v10
Merge v9.5.1 into v10
2022-06-03 06:27:32 +02:00
Bjarke Berg
0beaf19063 Fixed query after tests on sqlite 2022-06-02 21:57:59 +02:00
Bjarke Berg
3d8f81025b Fixed NRT issues 2022-06-02 20:54:07 +02:00
Bjarke Berg
d086b21332 Merge remote-tracking branch 'origin/v9/9.5' into v10/feature/merge_v9.5.1_into_v10
# Conflicts:
#	src/Directory.Build.props
#	src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TrackedReferencesRepository.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TwoFactorLoginRepository.cs
#	src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
#	src/Umbraco.PublishedCache.NuCache/ContentCache.cs
#	src/Umbraco.PublishedCache.NuCache/DomainCacheExtensions.cs
#	templates/UmbracoPackage/.template.config/template.json
#	templates/UmbracoProject/.template.config/template.json
2022-06-02 20:45:24 +02:00
Bjarke Berg
07f685679b Changes to Basic Auth to support external logins (#12434)
* Fixed issues with basic auth middleware to support Umbraco Cloud usecase

* Fix redirects to return url, now allows website urls

* Strip potential domain part of returnPath

* Fix default value in appsettings schema

* Reintroduce check of basic auth enabled.

* Fix wrong negation introduced in #12349

* Fixed issues with redirects

* Also check external login cookie, while authenticating backoffice
2022-06-02 12:24:26 +02:00
Bjarke Berg
cce0a7d816 Obsolete stuff not used anymore and remove from appsettings schema (#12520) 2022-06-01 19:35:10 +02:00
Paul Johnson
edc9e9623d v10: fix migrations fluent create table builder sqlite (#12518)
* Fix create table builder setup for migrations with SQLite.
2022-06-01 17:04:46 +01:00
Paul Johnson
2da8bfba7d Fix unable to authorize upgrade from versions < 9.3.0 (#12519)
(cherry picked from commit 97468896357083a18eb39893aebaf8f87d292ac6)
2022-06-01 16:53:34 +01:00
Paul Johnson
406576ddfa Fix unable to authorize upgrade from versions < 9.3.0 (#12494) 2022-06-01 17:26:27 +02:00
Ronald Barendse
8d5590471c Merge branch 'release/10.0.0' into v10/feature/global-usings 2022-06-01 16:05:22 +02:00
Paul Johnson
bee19f5404 Move HostBuilderExtensions to Microsoft.Extensions.DependencyInjection (#12515) 2022-06-01 15:01:00 +01:00
Ronald Barendse
87dbc8b287 Enable implicit usings 2022-06-01 15:50:37 +02:00
Ronald Barendse
588525e99f Add Umbraco specific global usings 2022-06-01 14:46:01 +02:00
Lasse Fredslund
57babbe441 Changed manic to marvelous (#12514) 2022-06-01 14:28:39 +02:00
Bjarke Berg
c08f7f211c Query optimization in TrackedReferencesRepository (#12488)
* Rewrote query

https://github.com/umbraco/Umbraco-CMS/issues/12308

* Reuse new query

* Updated the other queries in TrackedReferencesRepository

* Fix GetPagedRelationsForItem to not include self

* Update src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
2022-05-31 15:55:29 +02:00
Mole
156fe5976c Send content type notifications on copy (#12463) 2022-05-31 14:26:34 +02:00
Bjarke Berg
ac61f85e70 Fixes issue with redirects not being generated when an invariant cont… (#12453)
* Fixes issue with redirects not being generated when an invariant content has variant ancestors. In this case we wanna create redirects for all languages

https://github.com/umbraco/Umbraco-CMS/issues/12452

* Handle Url routing of invariant items with variant parents, when no culture is given

* Cleanup

* Update src/Umbraco.Core/Routing/UrlProvider.cs

Co-authored-by: Ronald Barendse <ronald@barend.se>

* Refactor styling and added else if

Co-authored-by: Ronald Barendse <ronald@barend.se>
2022-05-31 13:19:01 +02:00
Matt Brailsford
7f76893399 v10: Breaking Change Fixes (#12486)
* Add Execute with obsoleted IScopeProvider parameter

* Add ScopeContextualBase Get method that accepts an obsolete IScopeProvider

* Make LegacyIScope have all props/methods defined upon it as otherwise it causes method missing errors

* Added new keyword to hidden properties / methods

* Drop Context prop from Infrastructure.IScopeProvider

Co-authored-by: Paul Johnson <pmj@umbraco.com>
2022-05-30 16:05:30 +01:00
Paul Johnson
025658e611 Fix compiler warning for hidden inherited member on legacyscopeprovider 2022-05-30 15:20:52 +01:00
Matt Brailsford
6d3e4aaa78 Make ActionDelete.ActionAlias public again
(cherry picked from commit d0a752248e)
2022-05-26 14:13:58 +01:00
Paul Johnson
be2194a8b1 Bump version to 10.0.0-rc5 2022-05-26 08:28:53 +01:00
Matt Brailsford
cf461b2504 Don't use default params for AddUnique extension methods (breaks v9) (#12485)
(cherry picked from commit f3c4c677f3)
2022-05-26 08:28:17 +01:00
Ronald Barendse
9ff06eec6e v10: Instantly reload ConnectionStrings after saving configuration (#12475)
* Do not replace DataDirectory placeholder when setting connection string

* Ensure ConnectionStrings options are updated when configuration is reloaded

* Use CurrentValue to get default Umbraco connection string
2022-05-25 10:16:39 +01:00
Paul Johnson
fcee6dc06a Fix legacy scope provider no longer implementing ICoreScopeProvider (#12480) 2022-05-25 10:08:43 +01:00
Paul Johnson
88f3628d0a Fix options monitor setup for connectionstrings (#12472) 2022-05-25 09:49:33 +01:00
Johan Runsten
4eeb03e7fb Fixed null check typo in CacheInstructionService. Fixes #12473. (#12474)
* Fixed null check typo. Fixes #12473.

* Removed unneccessary null forgiving operator

Co-authored-by: Johan Runsten <johan.runsten@toxic.se>
2022-05-25 10:14:26 +02:00
Asbjørn Riis-Knudsen
d810d66e9a Fix #12454 by having Coalesce handle null values (#12456)
* Fix #12454 by having Coalesce handle null values

* Allow null values in Html.Coalesce #12454
2022-05-24 18:20:48 +02:00
Paul Johnson
963d4c5051 Ensure unique buildnumber for devops UI 2022-05-24 14:18:50 +01:00
Nikolaj
2f498be587 Bump version to 9.5.1 2022-05-24 14:57:26 +02:00
Bjarke Berg
175828ec43 Fixed issue in https://github.com/umbraco/Umbraco-CMS/issues/12384 (#12420)
We need to use invariant culture when doing ToString of user ints
2022-05-24 14:09:53 +02:00
Bjarke Berg
ad6ef2688d Changed back Attempt<int?> to Attempt<int> (#12468) 2022-05-24 13:36:31 +02:00
Nikolaj Geisle
7437feed10 Add TypeForwards file with type forwarding (#12467)
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
2022-05-24 12:37:48 +02:00
Paul Johnson
41a003e20e Ensure legacy scope returned when using legacy scope provider (#12465)
* Separate legacy scope provider interface and explicitly implement.

* Don't rely on legacy scope provider for existing tests.

* Assert correct type returned when using legacy scope provider.
2022-05-24 12:26:28 +02:00
Bjarke Berg
e12c2eca1b Move msbuild target to correct location (#12462)
* Move target to correct location

* Clean up

* Remove duplicate
2022-05-24 10:57:29 +02:00
Paul Johnson
c16f2e2752 Fix timeoutInMinutes added to incorrect job. 2022-05-24 08:54:24 +01:00
Bjarke Berg
56d9bf9847 Reintroduce MSBuild target that includes App_Plugins content when publishing (#12455)
* Reintroduced the IncludeAppPluginsContent target

* Bump version
2022-05-23 16:53:10 +02:00
Paul Johnson
ff6d064b29 Allow for slow integration test runs 2022-05-23 08:43:52 +01:00
Andy Butland
e6320a12ba Fixed null check in external login.
(cherry picked from commit 9981907532)
2022-05-23 08:27:41 +02:00
Paul Johnson
0f6630861e static assets nupkg fixes (#12440)
* Remove duplicate jsonschema build

* Don't attempt to --no-build for dotnet pack (fixes static assets)

* Bump version to 10.0.0-rc3

* Improve restoreKeys

* update Umbraco.GitVersioning.Extensions to 0.1.1

(cherry picked from commit 0ef34ab9c5)

* tag e2e container with current commit

* cache cypress binaries
2022-05-23 08:25:04 +02:00
Bjarke Berg
8d2fb538fd Fixed issue in https://github.com/umbraco/Umbraco-CMS/issues/12384 (#12420)
We need to use invariant culture when doing ToString of user ints
2022-05-23 08:19:59 +02:00
Nikolaj
9bafabf906 Disable include symbols 2022-05-20 10:12:45 +02:00
Paul Johnson
e0aa430d4c Fix typo in pipeline yaml 2022-05-19 10:00:57 +01:00
Paul Johnson
2ec450f2d6 Fix yaml conditions 2022-05-19 09:14:47 +01:00
Paul Johnson
c2d548039a Azure pipeline refactor (#12428)
* Skip symbols for Umbraco.Templates

* Resolve some test issues

+ Fixed whitespace dependant tests to pass regardless of build OS vs
run OS.

+ Snap dictionary tests were failing when Configuration was release

+ Removed hardcoded baseUrl from one of the acceptance tests

* Move docfx setup to ./build and fix

* Update UI docs title

* Added dockerfile that can be used when running the acceptance tests.

* Take explicit dependency on System.Security.Cryptography.Pkcs

* Refactor ci/cd pipeline
2022-05-19 10:02:50 +02:00
Mole
ee8359af75 V10: Reintroduce appsettings-schema.json (#12416)
* Reintroduce language files tests (#12367)

* Reintroducing language files tests

* Fix casing

* Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj

* Remove Umbraco.Templates from VerifyNuGet step

* Remove duplicate and unnecessary properties

* Generate json schema on build

* Add targets file

* Gitignore auto generated appsettings schema

* Fix build not copying file

* Use the new path in appsettings

* Update copy message

* Build json schema as release

* Update json schema options

Otherwise just running the project will put the file in the wrong place

* Generate schema if it doesn't exist in Web.Ui

* Update json schema options

Otherwise just running the project will put the file in the wrong place

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Ronald Barendse <ronald@barend.se>
2022-05-19 09:57:21 +02:00
Ronald Barendse
dd617ede80 v10: Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj (#12413)
* Reintroduce language files tests (#12367)

* Reintroducing language files tests

* Fix casing

* Update tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs

Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>

* Change Umbraco.Cms and Umbraco.Templates nuspecs to csproj

* Remove Umbraco.Templates from VerifyNuGet step

* Remove duplicate and unnecessary properties

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-05-19 09:51:11 +02:00
Ronald Barendse
b83216876f v10: Project template database/connection string improvements (#12407)
* Add new connection-string-provider-name parameter

* Use template value forms to correctly encode JSON values

* Add new development-database-type parameter

* Update package template and fix App_Plugins directory rename

* Remove conflicting short parameter name

* Lowercase framework parameter to align with MS templates

* Cleanup default template settings

* Write unattended install parameters when either connection string or development database is set

* Include RootNamespace in UmbracoPackage template

* Update Umbraco specific gitignore rules

* Revert "Lowercase framework parameter to align with MS templates"

This reverts commit 22de389272a7e119df569ec2e54190265f6d0ae0.

* Add exclude-gitignore parameter

* Update template schemas

* Add minimal-gitignore parameter
2022-05-19 08:37:06 +02:00