From d206df0cac00bed8e44f0733fad8ae662598fcf6 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 23 Sep 2022 14:56:23 +0200 Subject: [PATCH] Updated dependencies and cleaned up --- Directory.Build.props | 2 +- src/JsonSchema/JsonSchema.csproj | 9 ++---- .../Umbraco.Cms.Persistence.Sqlite.csproj | 3 +- src/Umbraco.Core/Umbraco.Core.csproj | 29 +++++++------------ .../Umbraco.Infrastructure.csproj | 27 +++++------------ .../Umbraco.Web.BackOffice.csproj | 3 -- .../Umbraco.Web.Common.csproj | 8 ++--- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- .../Umbraco.Web.Website.csproj | 3 -- .../Umbraco.Tests.Benchmarks.csproj | 2 +- .../Umbraco.Tests.Integration.csproj | 3 +- .../Umbraco.Tests.UnitTests.csproj | 5 ++-- 12 files changed, 28 insertions(+), 68 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 487c1938121b..9c1e87df4961 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ all - 3.5.109 + 3.5.113 diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj index 8fa11a4beef7..66e57588b208 100644 --- a/src/JsonSchema/JsonSchema.csproj +++ b/src/JsonSchema/JsonSchema.csproj @@ -11,13 +11,8 @@ - - - - - - 3.5.107 - + + diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj index 943757b3534f..5e0b1653cf3c 100644 --- a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj +++ b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj @@ -12,8 +12,7 @@ - - + diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 8ee0b780b0bb..3593c6b0c7f8 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -15,31 +15,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index cfc80b9a87a8..f8cec25c0402 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -20,22 +20,14 @@ - - - - - - - - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -57,18 +49,13 @@ - - + + - - all - - 3.5.107 - diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 7e4a3eb700ab..d556786dec2d 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -28,9 +28,6 @@ all - - 3.5.107 - diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 8e526e20534f..06ae26d19d20 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -35,12 +35,8 @@ - - - - - - + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ddec00129b4b..d732e2aca8c3 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index 94f3bfa479de..8d5bb1249ceb 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -35,9 +35,6 @@ all - - 3.5.107 - diff --git a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index c0b1d2d0e422..6b7ad5d5a8bc 100644 --- a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -26,7 +26,7 @@ 0.13.2 - 7.0.0-preview.7.22375.6 + 7.0.0-rc.1.* 4.18.1 diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index fb671795cc59..4df31ee009f3 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -85,11 +85,10 @@ - + - diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index e409f97fe1da..8561face407a 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -23,12 +23,11 @@ - - - + +