From 8d5fb41ab77c74ea3c38e713a92bf6f0216dbd44 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 20 Sep 2022 09:08:28 +0200 Subject: [PATCH] Revert "Updated dependencies and fixed new NRT issues" This reverts commit b2b2903a6e83b42f8d64a8f97f5f7692fdb9e9d6. --- Directory.Build.props | 2 +- .../Serilog/Enrichers/ThreadAbortExceptionEnricher.cs | 6 +++--- .../Umbraco.Infrastructure.csproj | 10 +++++----- .../Umbraco.PublishedCache.NuCache.csproj | 2 +- .../Umbraco.Web.BackOffice.csproj | 2 +- .../Media/MediaPrependBasePathFileProvider.cs | 4 ++-- src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 8 +++----- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 -------- .../Umbraco.Tests.Benchmarks.csproj | 2 +- tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj | 2 +- .../Umbraco.Tests.Integration.csproj | 3 +-- 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 487c193812..8ae2e0baec 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ all - 3.5.109 + 3.5.107 diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs index 4083aa7311..45495de9e8 100644 --- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs +++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/ThreadAbortExceptionEnricher.cs @@ -38,9 +38,9 @@ public class ThreadAbortExceptionEnricher : ILogEventEnricher } } - private static bool IsTimeoutThreadAbortException(Exception? exception) + private static bool IsTimeoutThreadAbortException(Exception exception) { - if (exception is null || !(exception is ThreadAbortException abort)) + if (!(exception is ThreadAbortException abort)) { return false; } @@ -76,7 +76,7 @@ public class ThreadAbortExceptionEnricher : ILogEventEnricher // dump if configured, or if stacktrace contains Monitor.ReliableEnter var dump = _coreDebugSettings.DumpOnTimeoutThreadAbort || - IsMonitorEnterThreadAbortException(logEvent.Exception!); + IsMonitorEnterThreadAbortException(logEvent.Exception); // dump if it is ok to dump (might have a cap on number of dump...) dump &= MiniDump.OkToDump(_hostingEnvironment); diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 0f2163b6b8..7903f14f96 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -18,8 +18,8 @@ - - + + @@ -36,14 +36,14 @@ - + - + - + diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 7b729d5097..0eb68b99fe 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -18,7 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 21066d19bb..eb3a5c5f01 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/Umbraco.Web.Common/Media/MediaPrependBasePathFileProvider.cs b/src/Umbraco.Web.Common/Media/MediaPrependBasePathFileProvider.cs index 45d522d0de..c6ce59456d 100644 --- a/src/Umbraco.Web.Common/Media/MediaPrependBasePathFileProvider.cs +++ b/src/Umbraco.Web.Common/Media/MediaPrependBasePathFileProvider.cs @@ -70,7 +70,7 @@ internal class MediaPrependBasePathFileProvider : IFileProvider if (TryMapSubPath(subpath, out PathString newPath)) { // KJA changed: use explicit newPath.Value instead of implicit newPath string operator (which calls ToString()) - IFileInfo? result = _underlyingFileProvider.GetFileInfo(newPath.Value!); + IFileInfo? result = _underlyingFileProvider.GetFileInfo(newPath.Value); return result; } @@ -84,7 +84,7 @@ internal class MediaPrependBasePathFileProvider : IFileProvider if (TryMapSubPath(filter, out PathString newPath)) { // KJA changed: use explicit newPath.Value instead of implicit newPath string operator (which calls ToString()) - IChangeToken? result = _underlyingFileProvider.Watch(newPath.Value!); + IChangeToken? result = _underlyingFileProvider.Watch(newPath.Value); return result; } diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index bda3be4ebc..c75ddfe98f 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -37,14 +37,12 @@ - - - + - - + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2e9cca84fc..2ec54bc2d8 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -17,14 +17,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - diff --git a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index b8e9130d56..29e0a36353 100644 --- a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -23,7 +23,7 @@ - 0.13.2 + 0.13.1 6.0.0 diff --git a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj index e24424631f..05a5554db2 100644 --- a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj +++ b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj @@ -16,7 +16,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index 43c6aa2a1a..687f9dfca0 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -85,14 +85,13 @@ - - + all