diff --git a/Directory.Build.props b/Directory.Build.props
index b9439a50ea..56ab2370c3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,6 @@
net8.0
- 11.0
Umbraco HQ
Umbraco
Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))
@@ -17,6 +16,7 @@
nullable
enable
true
+ false
@@ -35,21 +35,16 @@
true
-
-
-
-
-
-
-
-
-
-
-
+
$(MSBuildThisFileDirectory)
+
+
+
+
+
diff --git a/src/Directory.Packages.props b/Directory.Packages.props
similarity index 70%
rename from src/Directory.Packages.props
rename to Directory.Packages.props
index bfa71d3932..0f28210de3 100644
--- a/src/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,8 +2,49 @@
true
- NU1507
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14,35 +55,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
@@ -55,16 +77,20 @@
-
-
+
+
-
-
-
-
-
-
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000000..e94f426fac
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs
index afcd0f35a2..25c964186f 100644
--- a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs
+++ b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs
@@ -130,11 +130,7 @@ public sealed class ImageSharpImageUrlGenerator : IImageUrlGenerator
{
var uri = QueryHelpers.AddQueryString(options.ImageUrl, queryString);
- // It's important that we call the async version here.
- // This is because if we call the synchronous version, we ImageSharp will start a new Task ever single time.
- // This becomes a huge problem if the site is under load, and will result in massive spikes in response time.
- // See https://github.com/SixLabors/ImageSharp.Web/blob/main/src/ImageSharp.Web/AsyncHelper.cs#L24
- var token = _requestAuthorizationUtilities.ComputeHMACAsync(uri, CommandHandling.Sanitize).GetAwaiter().GetResult();
+ var token = _requestAuthorizationUtilities.ComputeHMAC(uri, CommandHandling.Sanitize);
if (string.IsNullOrEmpty(token) is false)
{
queryString.Add(RequestAuthorizationUtilities.TokenCommand, token);
diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj b/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj
index bb9b44cf51..13126a24b5 100644
--- a/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj
+++ b/src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj
@@ -2,7 +2,6 @@
Umbraco CMS - Imaging - ImageSharp
Adds imaging support using ImageSharp/ImageSharp.Web to Umbraco CMS.
- false
diff --git a/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj
index d55479d8ec..1dcba40ab6 100644
--- a/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj
+++ b/src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj
@@ -2,12 +2,11 @@
Umbraco CMS - Imaging - ImageSharp 2
Adds imaging support using ImageSharp/ImageSharp.Web version 2 to Umbraco CMS.
- false
-
-
+
+
diff --git a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
index b930ff1bc0..a02370bb1e 100644
--- a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
+++ b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
@@ -4,9 +4,6 @@
Installs Umbraco CMS with minimal dependencies in your ASP.NET Core project.
false
false
-
- false
- false
@@ -24,7 +21,7 @@
NU5100;NU5128
-
+
diff --git a/src/Umbraco.Cms/Umbraco.Cms.csproj b/src/Umbraco.Cms/Umbraco.Cms.csproj
index 8b0dcb8a87..39a3b03c56 100644
--- a/src/Umbraco.Cms/Umbraco.Cms.csproj
+++ b/src/Umbraco.Cms/Umbraco.Cms.csproj
@@ -4,7 +4,6 @@
Installs Umbraco CMS with all default dependencies in your ASP.NET Core project.
false
false
- false
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index a9fef3d046..c5a60e8dcc 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -12,35 +12,31 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
-
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 0609c216eb..8e2241564e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -3,20 +3,23 @@
Umbraco.Cms.Web.UI
false
false
- false
-
-
+
+
+
+
+
+
-
+
diff --git a/templates/Directory.Build.props b/templates/Directory.Build.props
index c4e40e3e06..4d993c78c8 100644
--- a/templates/Directory.Build.props
+++ b/templates/Directory.Build.props
@@ -1,4 +1,5 @@
+
-
+
diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj
index 6a4d0460d1..0ccbab5e19 100644
--- a/templates/Umbraco.Templates.csproj
+++ b/templates/Umbraco.Templates.csproj
@@ -9,7 +9,6 @@
true
.
NU5128
- false
@@ -44,7 +43,7 @@
-
+
diff --git a/templates/UmbracoPackage/UmbracoPackage.csproj b/templates/UmbracoPackage/UmbracoPackage.csproj
index 98f5bac3ad..309bf6b2d2 100644
--- a/templates/UmbracoPackage/UmbracoPackage.csproj
+++ b/templates/UmbracoPackage/UmbracoPackage.csproj
@@ -1,16 +1,20 @@
net8.0
+ enable
+ enable
.
- UmbracoPackage
+ UmbracoPackage
+
+
+
UmbracoPackage
+ UmbracoPackage
UmbracoPackage
...
umbraco plugin package
- UmbracoPackage
- false
-
+
diff --git a/templates/UmbracoProject/UmbracoProject.csproj b/templates/UmbracoProject/UmbracoProject.csproj
index 1c530223ad..ee8dd5e56e 100644
--- a/templates/UmbracoProject/UmbracoProject.csproj
+++ b/templates/UmbracoProject/UmbracoProject.csproj
@@ -4,7 +4,6 @@
enable
enable
Umbraco.Cms.Web.UI
- false
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 1d532e6664..49f18af1bd 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -1,6 +1,7 @@
+
-
+
diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props
index 41398eed6e..a8031cc500 100644
--- a/tests/Directory.Packages.props
+++ b/tests/Directory.Packages.props
@@ -1,24 +1,25 @@
-
- true
- NU1507
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Packages.props b/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Packages.props
new file mode 100644
index 0000000000..8db7958e54
--- /dev/null
+++ b/tests/Umbraco.Tests.AcceptanceTest/misc/Directory.Packages.props
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 09a4600005..189d69ac31 100644
--- a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -3,7 +3,6 @@
Exe
false
false
- false
false
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index c4d3070472..56898cebf5 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -7,6 +7,7 @@
Umbraco.Cms.Tests.Integration
true
$(BaseEnablePackageValidation)
+ NU5100
diff --git a/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj b/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj
index 8b66986898..3e3b2792a8 100644
--- a/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj
+++ b/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj
@@ -3,12 +3,11 @@
Exe
false
false
- false
-
-
+
+
diff --git a/umbraco.sln b/umbraco.sln
index 98a353a387..517b3959e9 100644
--- a/umbraco.sln
+++ b/umbraco.sln
@@ -129,12 +129,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitignore = .gitignore
.globalconfig = .globalconfig
Directory.Build.props = Directory.Build.props
+ Directory.Packages.props = Directory.Packages.props
+ global.json = global.json
icon.png = icon.png
LICENSE.md = LICENSE.md
umbraco.sln.DotSettings = umbraco.sln.DotSettings
+ nuget.config = nuget.config
version.json = version.json
- global.json = global.json
- src\Directory.Packages.props = src\Directory.Packages.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{20CE9C97-9314-4A19-BCF1-D12CF49B7205}"