feat: migrate to .NET 9 (#30)

Ne4to · web-flow · commit ed573f70c73f · 2024-12-29T23:13:27.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -81,14 +81,14 @@ csharp_style_var_for_built_in_types = false
 csharp_style_var_when_type_is_apparent = false
 
 # Expression-bodied members
-csharp_style_expression_bodied_accessors = true
-csharp_style_expression_bodied_constructors = false
-csharp_style_expression_bodied_indexers = true
-csharp_style_expression_bodied_lambdas = true
-csharp_style_expression_bodied_local_functions = false
-csharp_style_expression_bodied_methods = false
-csharp_style_expression_bodied_operators = false
-csharp_style_expression_bodied_properties = true
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
 
 # Pattern matching preferences
 csharp_style_pattern_matching_over_as_with_null_check = true
@@ -107,11 +107,11 @@ csharp_preferred_modifier_order = public,private,protected,internal,static,exter
 csharp_style_prefer_readonly_struct = true
 
 # Code-block preferences
-csharp_prefer_braces = true
-csharp_prefer_simple_using_statement = true
-csharp_style_namespace_declarations = block_scoped
-csharp_style_prefer_method_group_conversion = true
-csharp_style_prefer_top_level_statements = true
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
 
 # Expression-level preferences
 csharp_prefer_simple_default_expression = true
@@ -129,7 +129,7 @@ csharp_style_unused_value_assignment_preference = discard_variable
 csharp_style_unused_value_expression_statement_preference = discard_variable
 
 # 'using' directive preferences
-csharp_using_directive_placement = outside_namespace
+csharp_using_directive_placement = outside_namespace:silent
 
 # New line preferences
 csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
@@ -237,3 +237,23 @@ dotnet_naming_style.starts_with__.required_prefix = _
 dotnet_naming_style.starts_with__.required_suffix = 
 dotnet_naming_style.starts_with__.word_separator = 
 dotnet_naming_style.starts_with__.capitalization = camel_case
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
+
+[*.{cs,vb}]
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 2
+indent_size = 4
+end_of_line = crlf
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,13 @@
 ﻿<Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>0.8.1</VersionPrefix>
+    <VersionPrefix>0.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/Ne4to/Heartbeat</RepositoryUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/Heartbeat.sln b/Heartbeat.sln
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Diagnostics utility with web UI to analyze .NET application memory dump
 
 ### dotnet tool
 
-.NET 8 SDK is required
+.NET 9 SDK is required
 
 ```shell
 dotnet tool install --global Heartbeat
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.101",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }
diff --git a/scripts/update-ts-client.ps1 b/scripts/update-ts-client.ps1
@@ -4,7 +4,7 @@ $Configuration = 'DebugOpenAPI'
 $RepositoryRoot = Split-Path $PSScriptRoot
 $FrontendRoot = Join-Path $RepositoryRoot 'src/Heartbeat/ClientApp'
 $ContractPath = Join-Path $FrontendRoot 'api.yml'
-$DllPath = Join-Path $RepositoryRoot "src/Heartbeat/bin/$Configuration/net8.0/Heartbeat.dll"
+$DllPath = Join-Path $RepositoryRoot "src/Heartbeat/bin/$Configuration/net9.0/Heartbeat.dll"
 
 Push-Location
 try
diff --git a/src/DebugHost/DebugHost.csproj b/src/DebugHost/DebugHost.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.506101" />
+      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Heartbeat.Runtime/Analyzers/HttpClientAnalyzer.cs b/src/Heartbeat.Runtime/Analyzers/HttpClientAnalyzer.cs
@@ -20,7 +20,7 @@ public IReadOnlyCollection<HttpClientInfo> GetClientsInfo()
 
         foreach (var address in Context.EnumerateObjectAddressesByTypeName("System.Net.Http.HttpClient", ObjectGcStatus))
         {
-            var httpClientObjectType = Context.Heap.GetObjectType(address);
+            var httpClientObjectType = Context.Heap.GetObjectType(address)!;
             var timeoutField = httpClientObjectType.GetFieldByName("_timeout");
             if (timeoutField == null)
             {
diff --git a/src/Heartbeat.Runtime/Heartbeat.Runtime.csproj b/src/Heartbeat.Runtime/Heartbeat.Runtime.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <Using Include="Heartbeat.Domain"/>
+        <Using Include="Heartbeat.Domain" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -14,9 +14,9 @@
     <!--    </ItemGroup>-->
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.8.14">
+        <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/Heartbeat.Runtime/RuntimeContext.cs b/src/Heartbeat.Runtime/RuntimeContext.cs
@@ -54,13 +54,8 @@ public string GetStringLengthFieldName()
     
     public IEnumerable<ulong> EnumerateObjectAddressesByTypeName(string typeName, ObjectGCStatus? status)
     {
-        var clrType = Heap.GetTypeByName(typeName);
-
-        if (clrType == null)
-        {
-            throw new Exception($"Type '{typeName}' is not found");
-        }
-
+        var clrType = Heap.GetTypeByName(typeName) ?? throw new Exception($"Type '{typeName}' is not found");
+        
         return
             from clrObject in Heap.EnumerateObjects()
             let type = clrObject.Type
diff --git a/src/Heartbeat/Heartbeat.csproj b/src/Heartbeat/Heartbeat.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <RootNamespace>Heartbeat.Host</RootNamespace>
@@ -60,12 +60,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JWT" Version="10.1.1" />
-        <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.1" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="JWT" Version="11.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="9.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     </ItemGroup>
diff --git a/tests/DumpHelper/DumpHelper.csproj b/tests/DumpHelper/DumpHelper.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/DumpHelper/Program.cs b/tests/DumpHelper/Program.cs
@@ -45,7 +45,7 @@ private void BuildProject(FileInfo projectFile)
 
         private Process RunProject(FileInfo projectFile)
         {
-            var dir = Path.Combine(projectFile.DirectoryName, @"bin\Release\net8.0");
+            var dir = Path.Combine(projectFile.DirectoryName, @"bin\Release\net9.0");
             var exeFile = Path.ChangeExtension(projectFile.Name, "exe");
 
             ProcessStartInfo startInfo = new()
diff --git a/tests/MinimalRepo/MinimalRepo.csproj b/tests/MinimalRepo/MinimalRepo.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.456101" />
+      <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "9.0.101",`
`4`	`4`	`"rollForward": "latestMinor",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public IReadOnlyCollection<HttpClientInfo> GetClientsInfo()`
`20`	`20`
`21`	`21`	`foreach (var address in Context.EnumerateObjectAddressesByTypeName("System.Net.Http.HttpClient", ObjectGcStatus))`
`22`	`22`	`{`
`23`		`- var httpClientObjectType = Context.Heap.GetObjectType(address);`
	`23`	`+ var httpClientObjectType = Context.Heap.GetObjectType(address)!;`
`24`	`24`	`var timeoutField = httpClientObjectType.GetFieldByName("_timeout");`
`25`	`25`	`if (timeoutField == null)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ private void BuildProject(FileInfo projectFile)`
`45`	`45`
`46`	`46`	`private Process RunProject(FileInfo projectFile)`
`47`	`47`	`{`
`48`		`- var dir = Path.Combine(projectFile.DirectoryName, @"bin\Release\net8.0");`
	`48`	`+ var dir = Path.Combine(projectFile.DirectoryName, @"bin\Release\net9.0");`
`49`	`49`	`var exeFile = Path.ChangeExtension(projectFile.Name, "exe");`
`50`	`50`
`51`	`51`	`ProcessStartInfo startInfo = new()`