Commit Graph

41548 Commits

Author SHA1 Message Date
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
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
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
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
Mole
e40049dcf1 Fix domain for invariant content nodes (#12405)
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
2022-05-18 15:32:13 +02:00
Elitsa Marinovska
a3692b887a Use SnippetCollection to when working with snippets (#12355)
* Introducing a new Snippet type

* Adding a SnippetCollection and SnippetCollectionBuilder

* Using snippetCollection to get the snippets instead of fileService

* Fixed fetching the correct content

* Make ISnippet non-discoverable

* Split the SnippetCollection into PartialViewSnippetCollection and PartialViewMacroSnippetCollection

* Update CodeFileController to use the 2 snippet collections

* Display the names with Empty.cshtml on top

* Remove merging embedded snippets with custom snippets from ~\Umbraco.Web.UI\umbraco\PartialViewMacros\Templates folder for the Partial View Collection

* Fix naming

* Fix another naming

* Cleanup + Use base items

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
(cherry picked from commit 9326cc5fc6)
2022-05-18 09:56:42 +02:00
patrickdemooij9
4f48a4937b Cherry picked from 4c08b44684 2022-05-18 09:50:44 +02:00
Bjarne Fyrstenborg
4fdbfee597 Show nicer overlay when clicking block card for deleted element type (#12140)
* Show nicer overlay when clicking block card for deleted element type

* Cleanup

* Remove stop-scrolling container

* Use flex-start instead on start

* Remove legacy flexbox fallback

* Remove unnecessary hack

* Use standard gap property instead

* Localization of message

* Fix translation

* End sentence with a dot

(cherry picked from commit ebb1dc21a9)
2022-05-18 09:18:51 +02:00
Henk Jan Pluim
3856bf8288 #fix 12254 return emptyresult
(cherry picked from commit 7993d19c1b)
2022-05-18 09:15:56 +02:00
Ronald Barendse
7087c3d9f6 v10: Use ForceCreateDatabase during unattended install and extend GetUmbracoConnectionString extension methods (#12397)
* Add extension methods to get the Umbraco connection string/provider name from configuration

* Added tests for configuration extension methods.

* Fix issue with InstallMissingDatabase and ForceCreateDatabase

* Fix comments

* Revert casing change in GenerateConnectionString

* Re-add AddOptions (without config binding) to fix test

* Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs

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

* Update src/Umbraco.Core/Configuration/Models/ConnectionStrings.cs

* Update src/Umbraco.Infrastructure/Runtime/RuntimeState.cs

* Whitespace and documentation updates

* Add DatabaseProviderMetadataExtensions

* Filter before ordering

* Replace DataDirectory placeholder when setting connection string

Co-authored-by: Andy Butland <abutland73@gmail.com>
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
(cherry picked from commit 8e6e262c7f)
2022-05-17 12:59:16 +02:00
Ronald Barendse
e90bf26577 v10: Support System.Data.SqlClient provider name (#12408)
* Add support for System.Data.SqlClient provider name

* Only update connection string when required

(cherry picked from commit e82bcb1b76)
2022-05-17 08:31:05 +02:00
Elitsa Marinovska
fd0637c96d 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>
(cherry picked from commit 2ed71a64ec)
2022-05-17 08:30:51 +02:00
Ronald Barendse
af4e3ca1a6 NRT amends for WithCollectionBuilder to improve API (#12387)
* Remove WithCollectionBuilder nullability to improve API

* Fix TryGetValue nullable out type
2022-05-10 19:29:55 +02:00
Bjarke Berg
1e3b806bd8 Merge remote-tracking branch 'origin/v10/10.0' into v10/dev
# Conflicts:
#	src/Umbraco.Core/Deploy/IValueConnector.cs
2022-05-10 09:56:17 +02:00
Andy Butland
62fb7a6f19 Fixed issue with null reference when obtaining a lock using a detached scope.
(cherry picked from commit 02cd139770)
2022-05-10 09:51:18 +02:00
Andy Butland
5810c2d35b Further NRT updates for Deploy (#12375)
* Nullability modifications to grid cell values and connector.

* Nullable updates to IDataTypeConfigurationConnector.

* Apply suggestions from code review

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

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
(cherry picked from commit 109d2f191e)
2022-05-10 09:51:01 +02:00
Andy Butland
ea77c9a4fc Further NRT amends (#12363)
* Amended nullability of base Deploy classes.

* Ensured ContentItemDisplay.Variants is non-nullable.

* Set IArtifactSignature.Dependencies to be non-nullable.

* Update template collection retrieval to be non-nullable.

* IMediaService.GetRootMedia to be non-nullable.

* Non-nullable collection for IMemberService.GetMembersByMemberType.

* Non-nullable collection for member role retrieval.

* Non-nullable collection for root dictionary items.

* Non-nullable collection for child dictionary items.

* Applied suggestions from code review

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

* Remove extra dot

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
(cherry picked from commit 63b77b7743)
2022-05-10 09:50:50 +02:00
Andy Butland
fbdf704567 Further amends to NRT definitions (#12356)
* Ensured all GetContainers methods in IDataTypeService return non-nullable collections.

* Further amends to ensure services return non-nullable collections.

* Aligned nullability of IMediaService.GetMediaFileContentStream(string

* Removed return of nullable streams from IFileService.

* Fixed nullability mismatch.

(cherry picked from commit 735086a747)
2022-05-10 09:50:41 +02:00
Andy Butland
b1ece9b202 NRT amends necessary for Deploy (#12357)
* Allowed null item retrievel in IDeployContext.

* Allowed null item retrievel in IImageSourceParser.

* Allowed null item retrievel in IMacroParser.

* Set null syntax for other Deploy interfaces.

(cherry picked from commit a42ff2c267)
2022-05-10 09:50:35 +02:00
Bjarke Berg
f5d7b5c2c7 Merge remote-tracking branch 'origin/v10/10.0' into v10/dev
# Conflicts:
#	src/Umbraco.Web.Common/Hosting/UmbracoHostBuilderDecorator.cs
2022-05-09 11:09:46 +02:00
Paul Johnson
4ab7f40ce5 Disable connection pooling for initial SQLite database create. 2022-05-09 09:52:16 +01:00
Nikolaj Geisle
c576bbea03 v10: Fix build warnings in Web.Common (#12349)
* Run code cleanup

* Run dotnet format

* Start manual cleanup in Web.Common

* Finish up manual cleanup

* Fix tests

* Fix up InMemoryModelFactory.cs

* Inject proper macroRenderer

* Update src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs

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

* Update src/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringAttribute.cs

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

* Fix based on review

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Mole <nikolajlauridsen@protonmail.ch>
2022-05-09 09:39:46 +02:00
Andy Butland
02cd139770 Fixed issue with null reference when obtaining a lock using a detached scope. 2022-05-07 12:06:33 +02:00
Andy Butland
109d2f191e Further NRT updates for Deploy (#12375)
* Nullability modifications to grid cell values and connector.

* Nullable updates to IDataTypeConfigurationConnector.

* Apply suggestions from code review

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

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
2022-05-06 18:04:26 +02:00