Update sdk to .NET 8

nessos · Nov 19, 2023 · 1b2c028 · 1b2c028
1 parent a1f09e4
commit 1b2c028
Show file tree

Hide file tree

Showing 29 changed files with 129 additions and 79 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+[*.cs]
+
+# CA1000: Do not declare static members on generic types
+dotnet_diagnostic.CA1000.severity = none
+
+# CA1865: Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char
+dotnet_diagnostic.CA1865.severity = none
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,19 +1,7 @@
-<Project ToolsVersion="15.0">
+<Project>
   <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <IncludeSymbols>true</IncludeSymbols>
-    <Company>Nessos Information Technologies</Company>
-    <Authors>Nessos Information Technologies</Authors>
-    <Owners>Nessos Information Technologies</Owners>
-    <RepositoryUrl>https://github.com/nessos/Eff</RepositoryUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Programming with effects and handlers in C#</description>
-    <PackageReleaseNotes>https://github.com/nessos/Eff/blob/master/CHANGELOG.md</PackageReleaseNotes>
-    <copyright>Copyright 2020</copyright>
-    <tags>C# effects handlers</tags>
     <Nullable>enable</Nullable>
+    <LangVersion>12.0</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 </Project>
diff --git a/Directory.packages.props b/Directory.packages.props
@@ -0,0 +1,24 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Build Infra & Packaging -->
+    <PackageVersion Include="PolySharp" Version="1.13.1" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageVersion Include="MinVer" Version="4.3.0" />
+    <!-- Testing dependencies -->
+    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.8" />
+    <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.8" />
+    <!-- Samples dependencies -->
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageVersion Include="Eff" Version="2.0.2" />
+  </ItemGroup>
+</Project>
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.14
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine
 
 RUN apk add git make
 

diff --git a/samples/Eff.Examples.AspNetCore/Eff.Examples.AspNetCore.csproj b/samples/Eff.Examples.AspNetCore/Eff.Examples.AspNetCore.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>CS1998;CS1591;$(NoWarn)</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <!-- Use NuGet build for easier debugging -->
     <UseNugetEff>true</UseNugetEff>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="Eff" Version="2.0.2" Condition="'$(UseNugetEff)' == 'True'" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
+    <PackageReference Include="Eff" Condition="'$(UseNugetEff)' == 'True'" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.AspNetCore/EffBindings/EffectLogger.cs b/samples/Eff.Examples.AspNetCore/EffBindings/EffectLogger.cs
@@ -83,7 +83,7 @@ public void WriteToAwaiter<TResult>(EffAwaiter<TResult> awaiter)
             if (IsException)
             {
                 var exn = JsonConvert.DeserializeObject<Exception>(Value);
-                awaiter.SetException(exn);
+                awaiter.SetException(exn!);
             }
             else
             {

diff --git a/samples/Eff.Examples.AspNetCore/EffBindings/ReplayTokenHeaderHelpers.cs b/samples/Eff.Examples.AspNetCore/EffBindings/ReplayTokenHeaderHelpers.cs
@@ -24,7 +24,7 @@ public static class ReplayTokenHeaderHelpers
 
         public static void AddReplayTokenHeader(this HttpResponse response, string replayToken)
         {
-            response.Headers.Add(EffReplayTokenHeaderName, replayToken);
+            response.Headers.Append(EffReplayTokenHeaderName, replayToken);
         }
     }
 

diff --git a/samples/Eff.Examples.CancellationToken/Eff.Examples.CancellationToken.csproj b/samples/Eff.Examples.CancellationToken/Eff.Examples.CancellationToken.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Eff.Examples.Config/Eff.Examples.Config.csproj b/samples/Eff.Examples.Config/Eff.Examples.Config.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.Console/Eff.Examples.Console.csproj b/samples/Eff.Examples.Console/Eff.Examples.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Eff.Examples.Continuation/Eff.Examples.Continuation.csproj b/samples/Eff.Examples.Continuation/Eff.Examples.Continuation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.DependencyInjection/Eff.Examples.DependencyInjection.csproj b/samples/Eff.Examples.DependencyInjection/Eff.Examples.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Eff.Examples.Maybe/Eff.Examples.Maybe.csproj b/samples/Eff.Examples.Maybe/Eff.Examples.Maybe.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.NonDeterminism/Eff.Examples.NonDeterminism.csproj b/samples/Eff.Examples.NonDeterminism/Eff.Examples.NonDeterminism.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Eff.Examples.RecordReplay/Eff.Examples.RecordReplay.csproj b/samples/Eff.Examples.RecordReplay/Eff.Examples.RecordReplay.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.Resumable/Eff.Examples.Resumable.csproj b/samples/Eff.Examples.Resumable/Eff.Examples.Resumable.csproj
@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Eff.Examples.StackTrace/Eff.Examples.StackTrace.csproj b/samples/Eff.Examples.StackTrace/Eff.Examples.StackTrace.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/samples/Eff.Examples.TraceLog/Eff.Examples.TraceLog.csproj b/samples/Eff.Examples.TraceLog/Eff.Examples.TraceLog.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,29 @@
+<Project>
+    <Import Project="..\Directory.Build.props" />
+
+    <PropertyGroup>
+        <AnalysisLevel>latest-recommended</AnalysisLevel>
+        <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+        <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
+        <WarningLevel>9999</WarningLevel>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <IncludeSymbols>true</IncludeSymbols>
+        <Company>Nessos Information Technologies</Company>
+        <Authors>Nessos Information Technologies</Authors>
+        <Owners>Nessos Information Technologies</Owners>
+        <RepositoryUrl>https://github.com/nessos/Eff</RepositoryUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <RepositoryType>git</RepositoryType>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Programming with effects and handlers in C#</description>
+        <PackageReleaseNotes>https://github.com/nessos/Eff/blob/master/CHANGELOG.md</PackageReleaseNotes>
+        <copyright>Copyright 2020</copyright>
+        <tags>C# effects handlers</tags>
+    </PropertyGroup>
+</Project>
diff --git a/src/Eff/Applications/DependencyInjection/DependencyEffect.cs b/src/Eff/Applications/DependencyInjection/DependencyEffect.cs
@@ -15,7 +15,7 @@ public abstract class DependencyEffect<TResult> : Effect<TResult>
         public abstract ValueTask<TResult> Handle(IContainer container);
     }
 
-    internal class FuncDependencyEffect<TDependency, TResult> : DependencyEffect<TResult>
+    internal sealed class FuncDependencyEffect<TDependency, TResult> : DependencyEffect<TResult>
     {
         public Func<TDependency, ValueTask<TResult>> Func { get; }
 
@@ -31,7 +31,7 @@ public override ValueTask<TResult> Handle(IContainer container)
         }
     }
 
-    internal class ContainerFuncDependencyEffect<TResult> : DependencyEffect<TResult>
+    internal sealed class ContainerFuncDependencyEffect<TResult> : DependencyEffect<TResult>
     {
         public Func<IContainer, ValueTask<TResult>> Func { get; }
 

diff --git a/src/Eff/Eff.csproj b/src/Eff/Eff.csproj
@@ -5,16 +5,22 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>Programming with effects and handlers in C#</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>10.0</LangVersion>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
+    <PackageReference Include="PolySharp">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="MinVer">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Eff/Handlers/EffAwaiter.cs b/src/Eff/Handlers/EffAwaiter.cs
@@ -31,7 +31,7 @@ internal EffAwaiter() { }
         /// <summary>
         ///   Gets or sets the line number at the source file at which the method is called.
         /// </summary>
-        public int CallerLineNumber { get; set; } = 0;
+        public int CallerLineNumber { get; set; }
 
         /// <summary>
         ///   Returns true if the awaiter has been completed with a result value.
@@ -122,7 +122,7 @@ public void GetResult()
     /// <typeparam name="TResult">Result type required by the awaiter.</typeparam>
     public abstract class EffAwaiter<TResult> : EffAwaiter
     {
-        private TResult? _result = default;
+        private TResult? _result;
 
         /// <summary>
         ///   Gets either the result value or throws the exception that have been stored in the awaiter.

diff --git a/src/Eff/Handlers/EffectHandler.cs b/src/Eff/Handlers/EffectHandler.cs
@@ -58,7 +58,7 @@ public virtual async ValueTask Handle<TResult>(EffStateMachine<TResult> stateMac
 
                     default:
                         Debug.Fail($"Unrecognized state machine position {stateMachine.Position}.");
-                        throw new Exception($"Internal error: unrecognized state machine position {stateMachine.Position}.");
+                        throw new InvalidOperationException($"Internal error: unrecognized state machine position {stateMachine.Position}.");
                 }
             }
         }

diff --git a/src/Eff/Unit.cs b/src/Eff/Unit.cs
@@ -14,11 +14,11 @@ namespace Nessos.Effects
         /// <summary>
         ///   Gets the Unit instance.
         /// </summary>
-        public static Unit Value => new Unit();
+        public static Unit Value => new();
         /// Implements unit hashcode
         public override int GetHashCode() => 1;
         /// Implements unit equality
-        public override bool Equals(object other) => other is Unit;
+        public override bool Equals(object? obj) => obj is Unit;
         /// Implements unit equality
         public bool Equals(Unit other) => true;
         /// Implements unit equality

diff --git a/src/Eff/Utils/TraceHelpers.cs b/src/Eff/Utils/TraceHelpers.cs
@@ -27,22 +27,21 @@ private static (string name, FieldInfo fieldInfo)[] GetParametersInfo(object sta
         {
             var fieldInfos = state.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-            var parametersInfo = fieldInfos
-                                       .Where(fieldInfo => !fieldInfo.Name.StartsWith("<"))
-                                       .Select(fieldInfo => (fieldInfo.Name, fieldInfo))
-                                       .ToArray();
-            return parametersInfo;
+            return fieldInfos
+                .Where(fieldInfo => !fieldInfo.Name.StartsWith("<", StringComparison.Ordinal))
+                .Select(fieldInfo => (fieldInfo.Name, fieldInfo))
+                .ToArray();
         }
+
         private static (string name, FieldInfo fieldInfo)[] GetLocalVariablesInfo(object state)
         {
             var fieldInfos = state.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-            var localVariablesInfo = fieldInfos
-                                           .Where(fieldInfo => !fieldInfo.Name.StartsWith("<>"))
-                                           .Where(fieldInfo => fieldInfo.Name.StartsWith("<"))
-                                           .Select(fieldInfo => (fieldInfo.Name.Substring(1, fieldInfo.Name.LastIndexOf(">") - 1), fieldInfo))
-                                           .ToArray();
-            return localVariablesInfo;
+            return fieldInfos
+                .Where(fieldInfo => !fieldInfo.Name.StartsWith("<>", StringComparison.Ordinal))
+                .Where(fieldInfo => fieldInfo.Name.StartsWith("<", StringComparison.Ordinal))
+                .Select(fieldInfo => (fieldInfo.Name[1..fieldInfo.Name.LastIndexOf('>')], fieldInfo))
+                .ToArray();
         }
 
         /// <summary>
@@ -95,8 +94,8 @@ public static string GetMethodName(this IAsyncStateMachine stateMachine)
             }
 
             var name = stateMachine.GetType().Name;
-            if (name.StartsWith("<"))
-                return name.Substring(1, name.LastIndexOf(">") - 1);
+            if (name.StartsWith("<", StringComparison.Ordinal))
+                return name[1..name.LastIndexOf('>')];
             else
                 return name;
         }

diff --git a/src/Eff/Utils/ValueTaskPromise.cs b/src/Eff/Utils/ValueTaskPromise.cs
@@ -20,10 +20,10 @@ private struct ContinuationContext
             public object? Scheduler;
         }
 
-        private volatile int _isTaskCompleted = 0;
-        private volatile int _subscriptionsInProgress = 0;
-        private volatile int _isFirstContinuationQueued = 0;
-        private ContinuationContext _firstContinuation = default;
+        private volatile int _isTaskCompleted;
+        private volatile int _subscriptionsInProgress;
+        private volatile int _isFirstContinuationQueued;
+        private ContinuationContext _firstContinuation;
         private ConcurrentQueue<ContinuationContext>? _additionalContinuations;
 
         public ValueTask Task => new ValueTask(this, 0);