Ronald Barendse
8fefca557f
Improve Central Package Management, update dependencies and fix package validation/MSBuild warnings ( #15362 )
...
* Use version overrides for ImageSharp 2
* Move Directory.Packages.props to root, use GlobalPackageReference and replace Microsoft.CSharp with Microsoft.CodeAnalysis.CSharp
* Replace NPoco.SqlServer with NPoco and remove unused System dependencies
* Fix package validation and MSBuild warnings
* Add nuget.config and enable package source mapping
* Remove explicitly set C# language version
* Add empty Directory.Packages.props file for acceptance test
* Downgrade SixLabors.ImageSharp back to 3.0.2 because of breaking changes
* Update ImageSharp/ImageSharp.Web to 3.1.0 and use ComputeHMAC
2023-12-06 08:19:46 +01:00
Bjarke Berg
ab781560bc
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
...
# Conflicts:
# build/azure-pipelines.yml
# src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# tests/Umbraco.Tests.AcceptanceTest/package-lock.json
2023-11-27 19:47:24 +01:00
Bjarke Berg
d6751e2832
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
...
# Conflicts:
# version.json
2023-11-13 18:30:50 +01:00
Bjarke Berg
e263db7b3b
post merge fix
2023-09-20 10:02:58 +02:00
Bjarke Berg
4dd3c295e0
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
2023-09-20 09:43:41 +02:00
Bjarke Berg
3c81f968c3
post merge clean up
2023-06-21 08:53:18 +02:00
Bjarke Berg
7ab6598d0b
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
...
# Conflicts:
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
2023-06-21 08:41:35 +02:00
Bjarke Berg
61a33c734c
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
...
# Conflicts:
# src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
2023-03-29 10:30:16 +02:00
Nikolaj Geisle
79a9d73a90
Remove old proj ref to core from cs proj ( #13870 )
...
Co-authored-by: Zeegaan <nge@umbraco.dk >
2023-02-21 12:17:17 +01:00
Bjarke Berg
776f5ce1a0
Merge remote-tracking branch 'origin/v10/dev' into v11/dev
2023-02-15 14:06:39 +01:00
Ronald Barendse
2e54579a2f
Simplify JSON schema, generation, copying and updating ( #13427 )
...
* Simplify JSON schema and only generate appsettings-schema.Umbraco.Cms.json
* Use Umbraco.JsonSchema.Extensions to dynamically add JSON schema references
* Move DependentUpon items to shared MSBuild props
* Update LangVersion to latest
* Update Umbraco.GitVersioning.Extensions to 0.2.0
* Remove JSON schemas on clean
* Remove Umbraco.JsonSchema.Core project
* Fix JSON schema nullability
* Ignore additional JSON schema files in template
* Update CompatibilitySuppressions.xml
* Remove GlobalSettings.UmbracoPath from JSON schema again
* Remove RemoveUmbracoJsonSchemaFiles target
* Update Umbraco.JsonSchema.Extensions to 0.2.0 and add weights
* Flatten generated JSON schema hierarchy
* Remove LicensesSettings from CMS codebase
* Change AdditionalParameters to IDictionary
2022-11-22 12:48:11 +01:00
