yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,496 Commits 4 Branches 7 Tags
62fb7a6f19763c7127fa1a046cc2331df416dcaa
Commit Graph

46 Commits

Author SHA1 Message Date
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
Bjarke Berg
ef128f9fab Merge remote-tracking branch 'origin/v9/dev' into v10/dev 2022-04-26 11:19:26 +02:00
Andy Butland
c9b8ebc6f8 Updated references to latest versions of Forms and Deploy in JSONSchema project. (#12305) 2022-04-26 11:15:11 +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
Bjarke Berg
2f1cb4b20a Fix build/tests + cleanup duplicate dependencies 2022-04-20 15:54:09 +02:00
Bjarke Berg
b19dab5f3a Fix merge issues 2022-04-20 15:42:27 +02:00
Bjarke Berg
23a49161d6 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/build.ps1
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/dotnetcli.host.json
#	build/templates/UmbracoProject/.template.config/ide.host.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	umbraco-netcore-only.sln
 2022-04-20 11:09:28 +02:00
Ronald Barendse
c0b0a47612 Merge branch 'v9/dev' into v9/feature/projecttemplate-cleanup 2022-04-12 11:16:16 +02:00
Bjarke Berg
fe1c2f5d4f Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Repositories.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/HostedServices/HealthCheckNotifier.cs
#	src/Umbraco.Infrastructure/HostedServices/RecurringHostedServiceBase.cs
#	src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TrackedReferencesRepository.cs
#	src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
#	tests/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
#	tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SqlServerTableByTableTest.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
 2022-03-31 12:51:55 +02:00
Andy Butland
02e76c8227 Configuration to control the creation of default data (#12122) 
* Added configuration and checks for creation of default Umbraco data.

* Fixed configuration binding issues.

* Updated comments.

* Added DefaultDataCreationSettings to the JSON schema.

* Removed option to not install default relation types as Umbraco relies on (and will recreate) them if they aren't there.

* Renamed configuration class used for install of default data and converted to named optios.

* Fix to failing unit tests.

* Fixes for integration tests.

* Apply suggestions from code review

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

* Further fix from code review.

* Updated naming as per PR review suggestions.

* Update src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2022-03-25 08:58:07 +01:00
Ronald Barendse
c511f19cc8 Merge branch 'v9/feature/move-templates-to-root' into v9/feature/projecttemplate-cleanup 2022-03-24 13:57:38 +01:00
Bjarke Berg
981e66a673 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	src/Umbraco.Core/Telemetry/TelemetryService.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/HostedServices/ScheduledPublishing.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/DashboardController.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs
 2022-03-10 14:36:30 +01:00
Andy Butland
215bf69cb0 Updates JSON schema to reference latest Forms and Deploy. (#12106) 2022-03-08 16:33:43 +01:00
Ronald Barendse
2dc9ccda6d Disable packaging of JsonSchema and test projects 2022-02-24 10:24:27 +01:00
Bjarke Berg
a228f4e941 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
 2022-02-13 13:39:13 +01:00
Mole
3261a6f71d Fix up for V9 2022-01-26 12:12:59 +01:00
Mole
2ddb3e13e5 Fix breaking changes 2022-01-26 10:05:01 +01:00
Bjarke Berg
e92abf7d51 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
 2022-01-23 13:46:10 +01:00
Elitsa Marinovska
229ca989eb V9: Allowlisting remote URLs for displaying content on the content dashboard (#11825) 
* Fixing ContentDashboardSettings to work when set in the config

* Moving file in Models folder and adding ContentDashboardUrlAllowlist setting

* Implementing allowlist for content dashboard base url

* Cleanup

* Error msg vs log msg
 2022-01-18 15:37:31 +01:00
Paul Johnson
235918ecfc Merge branch 'v9/dev' into v10/feature/merge-v9-dev 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/Actions/ActionAssignDomain.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
 2022-01-18 11:37:43 +00:00
Andy Butland
1af09c7f13 Updates Forms and adds Deploy JSON schema. (#11739) 2021-12-21 15:19:55 +01:00
Bjarke Berg
47c1058195 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
 2021-12-15 14:41:49 +01:00
Bjarke Berg
915f1cb34c V9: Fix for migration of non-default configurated users/members (#11684) 
* https://github.com/umbraco/Umbraco-CMS/issues/11366
Fallback to try login using super legacy HMACSHA1 even when the algorithm is stated as being HMACSHA256. The issue is that v8 saves HMACSHA256 on the user, but when configured to use legacy encoding it actually uses HMACSHA1

* Support migration of members with:
UseLegacyEncoding+Clear
UseLegacyEncoding+Encrypted (Requires machine key)
UseLegacyEncoding+Hashed

* Fixes unit tests

* Avoid exceptions + unit tests

* Save unknown algorithm if we dont know it, instead of persisting a wrong algorithm.

* Added setting to enable clear text password rehashes.

* Removed support for migration of clear text passwords

* Fixed unit test
 2021-12-02 10:54:24 +00:00
Bjarke Berg
78dc2d5721 Merge remote-tracking branch 'origin/v9/dev' into v10/dev 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ContentService.cs
#	src/Umbraco.PublishedCache.NuCache/DataSource/BTree.ContentDataSerializer.cs
#	src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
 2021-11-22 19:43:20 +01: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
be65f12ed7 Updated nuget dependencies 2021-11-03 14:29:59 +01:00
Bjarke Berg
ca9dc94392 Fixed StyleCop issues in JsonSchema project 2021-10-19 13:11:02 +02:00
Bjarke Berg
2a29cdc6c6 Allow opt out of import embedded schema file (#11296) 
* Introduce an opt-out options from the import of embedded schema files.

* Moved the initialization of the static service provider into CoreRuntime as this runs before the IStartupFilters, and otherwise the static service provider is not available in hosted services. E.g. for migrations

* fix build

* Minor code tidy and naming alignment.

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

* Removed default installation of starter kit.

Co-authored-by: Andy Butland <abutland73@gmail.com>
 2021-10-06 11:13:59 +02:00
Elitsa Marinovska
50f6b230a9 Further renaming 2021-08-18 11:23:19 +02:00
Bjarke Berg
a030506c6a Merge remote-tracking branch 'origin/v9/dev' into v9/update-all-the-things 2021-08-06 13:39:53 +02:00
Warren Buckley
ffe9f4c4e4 Update NJsonSchema used for auto generating schema file for our options/config 2021-08-06 10:36:48 +01:00
Bjarke Berg
0e7f9d93ca Introduced IBasicAuthService 2021-08-06 09:51:08 +02:00
Bjarke Berg
98e78fc22d Removed core debug from schema files 2021-07-06 07:34:56 +02:00
Warren Buckley
cd36d050c5 Merge remote-tracking branch 'origin/v9/cyclehack/autogeneration_of_json_schema' into v9/cyclehack/autogeneration_of_json_schema 
# Conflicts:
#	src/JsonSchema/UmbracoJsonSchemaGeneratorSettings.cs
 2021-07-05 09:26:03 +01:00
Warren Buckley
1b9a00d2fd More JSONSchema config 
We dont want to serialize anything with [Obsolete] attribute and any XML C# comments with <example></example> will get generated as examples in the JSON schema
 2021-06-28 12:21:04 +01:00
Bjarke Berg
c4bd991546 Only serialize writeable properties to the schema 2021-06-28 12:54:05 +02:00
Bjarke Berg
7449bf2947 Clean up 2021-06-25 10:56:49 +02:00
Bjarke Berg
c170123f3a Clean up and fix for xml docs for forms (at least locally) 2021-06-25 09:35:39 +02:00
Bjarke Berg
cc99c3be16 Added forms config 2021-06-24 15:18:00 +02:00
Bjarke Berg
a071969fd2 More clean 2021-06-24 14:49:11 +02:00
Bjarke Berg
a36489e8d3 Clean up + async fix 2021-06-24 13:37:57 +02:00
Bjarke Berg
69cc340c5a Merge with official schema 2021-06-24 13:24:57 +02:00
Bjarke Berg
b3b0c44deb Added schema by default and reference it from the appsettings files. 
+ Do not suggest null values instead of objects
 2021-06-24 10:06:57 +02:00
Bjarke Berg
88bd437fce Default path and write to console location of file 2021-06-24 09:58:38 +02:00
Bjarke Berg
e439ebcd1d Refactor 2021-06-24 09:45:52 +02:00
Bjarke Berg
74e2b7aca2 Refactored the initialization of settings and started a json schema project 2021-06-24 08:47:37 +02:00