Skip to content

Commit

Permalink
Move to net9 (#820)
Browse files Browse the repository at this point in the history
* move to net9

* Update Directory.Build.props
  • Loading branch information
SimonCropp authored Dec 11, 2024
1 parent 9c50a30 commit f05a9dc
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 18 deletions.
37 changes: 31 additions & 6 deletions src/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
root = true
# EditorConfig: http://EditorConfig.org

# top-most EditorConfig file

[*]
indent_style = space


[*.cs]
indent_size = 4
charset = utf-8
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Version>14.1.0</Version>
<Version>15.0.0</Version>
<LangVersion>preview</LangVersion>
<AssemblyVersion>1.0.0</AssemblyVersion>
<Description>Low level .net wrapper for the SQL Server transport.</Description>
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
<PackageVersion Include="Fody" Version="6.9.1" />
<PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
Expand All @@ -19,7 +19,7 @@
<PackageVersion Include="NServiceBus.Newtonsoft.Json" Version="4.0.0" />
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.6" />
<PackageVersion Include="Polyfill" Version="7.5.0" />
<PackageVersion Include="ProjectDefaults" Version="1.0.145" />
<PackageVersion Include="ProjectDefaults" Version="1.0.147" />
<PackageVersion Include="Verify.SqlServer" Version="10.1.0" />
<PackageVersion Include="Verify.XunitV3" Version="28.4.0" />
<PackageVersion Include="xunit.v3" Version="0.7.0-pre.15" />
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down
2 changes: 1 addition & 1 deletion src/SqlServer.Deduplication/SqlServer.Deduplication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>NServiceBus.SqlServer.Deduplication</AssemblyName>
<PackageName>NServiceBus.SqlServer.Deduplication</PackageName>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Description>Message deduplication for the SQL Server transport.</Description>
<DefineConstants>$(DefineConstants);SqlServerDedupe</DefineConstants>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Content Include="test.html">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>NServiceBus.SqlServer.HttpPassthrough</AssemblyName>
<PackageName>NServiceBus.SqlServer.HttpPassthrough</PackageName>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Description>HTTP passthrough for the SQL Server transport.</Description>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down
2 changes: 1 addition & 1 deletion src/SqlServer.Native.Tests/SqlServer.Native.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
<NoWarn>xUnit1051</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SqlServer.Native/SqlServer.Native.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>NServiceBus.SqlServer.Native</AssemblyName>
<PackageName>NServiceBus.SqlServer.Native</PackageName>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<TargetFrameworks>net48;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" />
Expand Down

0 comments on commit f05a9dc

Please sign in to comment.