From cd2cc3692f12403494e477880ae50b60caf68cfd Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Tue, 12 Nov 2024 18:37:07 +0000 Subject: [PATCH 1/3] [Dependencies] Updating Microsoft.Extensions (Microsoft Extensions) to 9.0.0 --- CHANGELOG.md | 2 +- .../FunFair.BuildCheck.Helpers.csproj | 2 +- src/FunFair.BuildCheck/FunFair.BuildCheck.csproj | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b5f9915..4d250780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - SDK - Update DotNet to 9.0 RC1 - SDK - Updated DotNet SDK to 9.0.100-rc.2.24474.11 - Dependencies - Updated xunit to 2.9.2 -- Dependencies - Updated Microsoft.Extensions to 8.0.2 - Dependencies - Updated Microsoft.NET.Test.Sdk to 17.11.1 - Dependencies - Updated NuGet to 6.11.1 - Dependencies - Updated Roslynator.Analyzers to 4.12.9 @@ -26,6 +25,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release - Dependencies - Updated FunFair.CodeAnalysis to 7.0.32.711 - Dependencies - Updated FunFair.Test.Common to 6.1.238.970 - Dependencies - Updated Credfeto.Version.Information.Generator to 1.0.11.111 +- Dependencies - Updated Microsoft.Extensions to 9.0.0 ### Removed ### Deployment Changes diff --git a/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj b/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj index ef5292c3..c81028a8 100644 --- a/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj +++ b/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj b/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj index b0b75c61..1bb2de02 100644 --- a/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj +++ b/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj @@ -61,9 +61,9 @@ - - - + + + From e1b8ef944d7c25b86e32906acbc8d7ac71a2cfdc Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Mon, 18 Nov 2024 10:09:02 +0000 Subject: [PATCH 2/3] Removed unsupported dotnet versions --- .../FunFair.BuildCheck.Helpers.csproj | 2 +- .../FunFair.BuildCheck.Interfaces.csproj | 2 +- .../FunFair.BuildCheck.ProjectChecks.csproj | 2 +- .../FunFair.BuildCheck.Runner.Tests.csproj | 2 +- src/FunFair.BuildCheck.Runner/FunFair.BuildCheck.Runner.csproj | 2 +- .../FunFair.BuildCheck.SolutionChecks.csproj | 2 +- src/FunFair.BuildCheck.Tests/FunFair.BuildCheck.Tests.csproj | 2 +- src/FunFair.BuildCheck/FunFair.BuildCheck.csproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj b/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj index c81028a8..394c86eb 100644 --- a/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj +++ b/src/FunFair.BuildCheck.Helpers/FunFair.BuildCheck.Helpers.csproj @@ -26,7 +26,7 @@ Library false snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.Interfaces/FunFair.BuildCheck.Interfaces.csproj b/src/FunFair.BuildCheck.Interfaces/FunFair.BuildCheck.Interfaces.csproj index ae80d2cf..d4c5cda9 100644 --- a/src/FunFair.BuildCheck.Interfaces/FunFair.BuildCheck.Interfaces.csproj +++ b/src/FunFair.BuildCheck.Interfaces/FunFair.BuildCheck.Interfaces.csproj @@ -26,7 +26,7 @@ Library false snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.ProjectChecks/FunFair.BuildCheck.ProjectChecks.csproj b/src/FunFair.BuildCheck.ProjectChecks/FunFair.BuildCheck.ProjectChecks.csproj index c1f28690..b0018b75 100644 --- a/src/FunFair.BuildCheck.ProjectChecks/FunFair.BuildCheck.ProjectChecks.csproj +++ b/src/FunFair.BuildCheck.ProjectChecks/FunFair.BuildCheck.ProjectChecks.csproj @@ -26,7 +26,7 @@ Library false snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.Runner.Tests/FunFair.BuildCheck.Runner.Tests.csproj b/src/FunFair.BuildCheck.Runner.Tests/FunFair.BuildCheck.Runner.Tests.csproj index b846ec1c..ca20e514 100644 --- a/src/FunFair.BuildCheck.Runner.Tests/FunFair.BuildCheck.Runner.Tests.csproj +++ b/src/FunFair.BuildCheck.Runner.Tests/FunFair.BuildCheck.Runner.Tests.csproj @@ -24,7 +24,7 @@ speed Library false - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.Runner/FunFair.BuildCheck.Runner.csproj b/src/FunFair.BuildCheck.Runner/FunFair.BuildCheck.Runner.csproj index a7c2d47e..6d0ab0b3 100644 --- a/src/FunFair.BuildCheck.Runner/FunFair.BuildCheck.Runner.csproj +++ b/src/FunFair.BuildCheck.Runner/FunFair.BuildCheck.Runner.csproj @@ -26,7 +26,7 @@ Library false snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.SolutionChecks/FunFair.BuildCheck.SolutionChecks.csproj b/src/FunFair.BuildCheck.SolutionChecks/FunFair.BuildCheck.SolutionChecks.csproj index a488e175..7bac5aba 100644 --- a/src/FunFair.BuildCheck.SolutionChecks/FunFair.BuildCheck.SolutionChecks.csproj +++ b/src/FunFair.BuildCheck.SolutionChecks/FunFair.BuildCheck.SolutionChecks.csproj @@ -26,7 +26,7 @@ Library false snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck.Tests/FunFair.BuildCheck.Tests.csproj b/src/FunFair.BuildCheck.Tests/FunFair.BuildCheck.Tests.csproj index 751197a6..486238ed 100644 --- a/src/FunFair.BuildCheck.Tests/FunFair.BuildCheck.Tests.csproj +++ b/src/FunFair.BuildCheck.Tests/FunFair.BuildCheck.Tests.csproj @@ -24,7 +24,7 @@ speed Library false - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true diff --git a/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj b/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj index 1bb2de02..09a5f612 100644 --- a/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj +++ b/src/FunFair.BuildCheck/FunFair.BuildCheck.csproj @@ -30,7 +30,7 @@ false win-x64;win-arm64;osx-x64;osx-arm64;linux-x64;linux-arm64 snupkg - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 true true buildcheck From 8fcbf8467dfee855e62e7da4b289b13019030422 Mon Sep 17 00:00:00 2001 From: Mark Ridgwell Date: Mon, 18 Nov 2024 10:31:59 +0000 Subject: [PATCH 3/3] Fixed code analysis issues --- .../ReferencedPackages/MustNotDisableUnexpectedWarnings.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FunFair.BuildCheck.ProjectChecks/ReferencedPackages/MustNotDisableUnexpectedWarnings.cs b/src/FunFair.BuildCheck.ProjectChecks/ReferencedPackages/MustNotDisableUnexpectedWarnings.cs index 34382eeb..8f7b88cf 100644 --- a/src/FunFair.BuildCheck.ProjectChecks/ReferencedPackages/MustNotDisableUnexpectedWarnings.cs +++ b/src/FunFair.BuildCheck.ProjectChecks/ReferencedPackages/MustNotDisableUnexpectedWarnings.cs @@ -131,12 +131,12 @@ private static IReadOnlyList ExtractWarnings(string value) { return [ - ..value.Split(separator: ";") + ..value.Split(separator: ';') .Where(predicate: HasContent) - .SelectMany(selector: static s => s.Split(separator: ",") + .SelectMany(selector: static s => s.Split(separator: ',') .Where(predicate: HasContent)) .Where(predicate: static s => !string.IsNullOrWhiteSpace(s)) - .OrderBy(keySelector: static s => s, comparer: StringComparer.OrdinalIgnoreCase) + .Order(StringComparer.OrdinalIgnoreCase) ]; }