From f05a9dc3d5eac02509dcee554f164272963ffbe2 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Wed, 11 Dec 2024 12:28:00 +1100 Subject: [PATCH] Move to net9 (#820) * move to net9 * Update Directory.Build.props --- src/.editorconfig | 37 ++++++++++++++++--- src/Directory.Build.props | 2 +- src/Directory.Packages.props | 4 +- src/Shared/Shared.csproj | 2 +- ...Server.Deduplication.SampleEndpoint.csproj | 2 +- .../SqlServer.Deduplication.csproj | 2 +- ...rver.HttpPassthrough.SampleEndpoint.csproj | 2 +- ...SqlServer.HttpPassthrough.SampleWeb.csproj | 2 +- .../SqlServer.HttpPassthrough.csproj | 2 +- ...r.Native.SubscriptionSampleEndpoint.csproj | 2 +- .../SqlServer.Native.Tests.csproj | 2 +- src/SqlServer.Native/SqlServer.Native.csproj | 2 +- 12 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/.editorconfig b/src/.editorconfig index 03026225..f0d34695 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -1,12 +1,8 @@ root = true -# EditorConfig: http://EditorConfig.org - -# top-most EditorConfig file [*] indent_style = space - [*.cs] indent_size = 4 charset = utf-8 @@ -17,12 +13,42 @@ resharper_redundant_accessor_body_highlighting = error # Replace with field keyword resharper_replace_with_field_keyword_highlighting = error +# Replace with single call to Single(..) +resharper_replace_with_single_call_to_single_highlighting = error + +# Replace with single call to SingleOrDefault(..) +resharper_replace_with_single_call_to_single_or_default_highlighting = error + +# Replace with single call to LastOrDefault(..) +resharper_replace_with_single_call_to_last_or_default_highlighting = error + +# Replace with single call to Last(..) +resharper_replace_with_single_call_to_last_highlighting = error + +# Replace with single call to First(..) +resharper_replace_with_single_call_to_first_highlighting = error + +# Replace with single call to FirstOrDefault(..) +resharper_replace_with_single_call_to_first_or_default_highlighting = error + +# Replace with single call to Any(..) +resharper_replace_with_single_call_to_any_highlighting = error + +# Replace with single call to Count(..) +resharper_replace_with_single_call_to_count_highlighting = error + # Declare types in namespaces -dotnet_diagnostic.CA1050.severity = None +dotnet_diagnostic.CA1050.severity = none # Use Literals Where Appropriate dotnet_diagnostic.CA1802.severity = error +# Potentially misleading parameter name in lambda or local function +resharper_all_underscore_local_parameter_name_highlighting = none + +# Redundant explicit collection creation in argument of 'params' parameter +resharper_redundant_explicit_params_array_creation_highlighting = error + # Do not initialize unnecessarily dotnet_diagnostic.CA1805.severity = error @@ -152,7 +178,6 @@ dotnet_diagnostic.CA1869.severity = error # Use a cached 'SearchValues' instance dotnet_diagnostic.CA1870.severity = error - # Microsoft .NET properties trim_trailing_whitespace = true csharp_preferred_modifier_order = public, private, protected, internal, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async:suggestion diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fc5974a5..cd487dfe 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - 14.1.0 + 15.0.0 preview 1.0.0 Low level .net wrapper for the SQL Server transport. diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index e35eb834..1b67acf0 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj index 83f59029..283b8623 100644 --- a/src/Shared/Shared.csproj +++ b/src/Shared/Shared.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 diff --git a/src/SqlServer.Deduplication.SampleEndpoint/SqlServer.Deduplication.SampleEndpoint.csproj b/src/SqlServer.Deduplication.SampleEndpoint/SqlServer.Deduplication.SampleEndpoint.csproj index 262513de..8ff54a6b 100644 --- a/src/SqlServer.Deduplication.SampleEndpoint/SqlServer.Deduplication.SampleEndpoint.csproj +++ b/src/SqlServer.Deduplication.SampleEndpoint/SqlServer.Deduplication.SampleEndpoint.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 diff --git a/src/SqlServer.Deduplication/SqlServer.Deduplication.csproj b/src/SqlServer.Deduplication/SqlServer.Deduplication.csproj index b32e6e1d..c4584649 100644 --- a/src/SqlServer.Deduplication/SqlServer.Deduplication.csproj +++ b/src/SqlServer.Deduplication/SqlServer.Deduplication.csproj @@ -2,7 +2,7 @@ NServiceBus.SqlServer.Deduplication NServiceBus.SqlServer.Deduplication - net8.0 + net9.0 Message deduplication for the SQL Server transport. $(DefineConstants);SqlServerDedupe diff --git a/src/SqlServer.HttpPassthrough.SampleEndpoint/SqlServer.HttpPassthrough.SampleEndpoint.csproj b/src/SqlServer.HttpPassthrough.SampleEndpoint/SqlServer.HttpPassthrough.SampleEndpoint.csproj index cb518fa8..aa816956 100644 --- a/src/SqlServer.HttpPassthrough.SampleEndpoint/SqlServer.HttpPassthrough.SampleEndpoint.csproj +++ b/src/SqlServer.HttpPassthrough.SampleEndpoint/SqlServer.HttpPassthrough.SampleEndpoint.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 diff --git a/src/SqlServer.HttpPassthrough.SampleWeb/SqlServer.HttpPassthrough.SampleWeb.csproj b/src/SqlServer.HttpPassthrough.SampleWeb/SqlServer.HttpPassthrough.SampleWeb.csproj index 855cffdf..2f3d73c9 100644 --- a/src/SqlServer.HttpPassthrough.SampleWeb/SqlServer.HttpPassthrough.SampleWeb.csproj +++ b/src/SqlServer.HttpPassthrough.SampleWeb/SqlServer.HttpPassthrough.SampleWeb.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 diff --git a/src/SqlServer.HttpPassthrough/SqlServer.HttpPassthrough.csproj b/src/SqlServer.HttpPassthrough/SqlServer.HttpPassthrough.csproj index 4b276fcb..355ca764 100644 --- a/src/SqlServer.HttpPassthrough/SqlServer.HttpPassthrough.csproj +++ b/src/SqlServer.HttpPassthrough/SqlServer.HttpPassthrough.csproj @@ -2,7 +2,7 @@ NServiceBus.SqlServer.HttpPassthrough NServiceBus.SqlServer.HttpPassthrough - net8.0 + net9.0 HTTP passthrough for the SQL Server transport. diff --git a/src/SqlServer.Native.SubscriptionSampleEndpoint/SqlServer.Native.SubscriptionSampleEndpoint.csproj b/src/SqlServer.Native.SubscriptionSampleEndpoint/SqlServer.Native.SubscriptionSampleEndpoint.csproj index 16cc9a8c..5a5f3d6b 100644 --- a/src/SqlServer.Native.SubscriptionSampleEndpoint/SqlServer.Native.SubscriptionSampleEndpoint.csproj +++ b/src/SqlServer.Native.SubscriptionSampleEndpoint/SqlServer.Native.SubscriptionSampleEndpoint.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 diff --git a/src/SqlServer.Native.Tests/SqlServer.Native.Tests.csproj b/src/SqlServer.Native.Tests/SqlServer.Native.Tests.csproj index fed70f41..c016b4db 100644 --- a/src/SqlServer.Native.Tests/SqlServer.Native.Tests.csproj +++ b/src/SqlServer.Native.Tests/SqlServer.Native.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 Exe xUnit1051 diff --git a/src/SqlServer.Native/SqlServer.Native.csproj b/src/SqlServer.Native/SqlServer.Native.csproj index b5b54e02..195ed8dc 100644 --- a/src/SqlServer.Native/SqlServer.Native.csproj +++ b/src/SqlServer.Native/SqlServer.Native.csproj @@ -2,7 +2,7 @@ NServiceBus.SqlServer.Native NServiceBus.SqlServer.Native - net48;net8.0 + net48;net9.0