Changes to support 2024.3 (#342)

* Changes to support 2024.3

* strip tests out 😡

* gh workflow

* artifacts

* name

* refs

* tidy csproj

Author: robertcoltheart

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Build
         run: ./build.ps1
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: |
             artifacts/*.nupkg

.github/workflows/publish.yml

@@ -23,7 +23,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./build.ps1 publish
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: |
             artifacts/*.nupkg

build/build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Machine.Specifications.Runner.ReSharper.Adapters/Discovery/Discoverer.cs

@@ -10,29 +10,15 @@
 
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Discovery;
 
-public class Discoverer
+public class Discoverer(
+    TestRequest request,
+    IMspecController controller,
+    ITestDiscoverySink sink,
+    RemoteTaskDepot depot,
+    CancellationToken token)
 {
-    private readonly TestRequest request;
-
-    private readonly IMspecController controller;
-
-    private readonly ITestDiscoverySink sink;
-
-    private readonly RemoteTaskDepot depot;
-
-    private readonly CancellationToken token;
-
     private readonly ILogger logger = Logger.GetLogger<Discoverer>();
 
-    public Discoverer(TestRequest request, IMspecController controller, ITestDiscoverySink sink, RemoteTaskDepot depot, CancellationToken token)
-    {
-        this.request = request;
-        this.controller = controller;
-        this.sink = sink;
-        this.depot = depot;
-        this.token = token;
-    }
-
     public void Discover()
     {
         logger.Info($"Discovering tests from {request.Container.Location}");

src/Machine.Specifications.Runner.ReSharper.Adapters/Discovery/DiscoveryCache.cs

@@ -7,10 +7,8 @@
 
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Discovery;
 
-public class DiscoveryCache
+public class DiscoveryCache(Assembly assembly)
 {
-    private readonly Assembly assembly;
-
     private readonly Dictionary<string, Type?> types = new();
 
     private readonly Dictionary<string, FieldInfo?> fields = new();
@@ -21,11 +19,6 @@ public class DiscoveryCache
 
     private readonly Dictionary<string, IBehaviorElement> behaviors = new();
 
-    public DiscoveryCache(Assembly assembly)
-    {
-        this.assembly = assembly;
-    }
-
     public IBehaviorElement? GetOrAddBehavior(IContextElement context, SpecificationInfo specification)
     {
         var behaviorField = GetOrAddBehaviorFieldByType(context.TypeName, specification.ContainingType);

src/Machine.Specifications.Runner.ReSharper.Adapters/Discovery/MspecController.cs

@@ -36,7 +36,7 @@ public void Find(IMspecDiscoverySink sink, string assemblyPath)
         var assemblyName = AssemblyName.GetAssemblyName(assemblyPath);
         var assembly = Assembly.Load(assemblyName);
 
-        var results = (string) invoker.Invoke(controller, new object[] {assembly});
+        var results = (string) invoker.Invoke(controller, [assembly]);
 
         var specifications = GetSpecifications(assembly, results);
 

src/Machine.Specifications.Runner.ReSharper.Adapters/Discovery/MspecDiscoverySink.cs

@@ -5,10 +5,8 @@
 
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Discovery;
 
-public class MspecDiscoverySink : IMspecDiscoverySink
+public class MspecDiscoverySink(CancellationToken token) : IMspecDiscoverySink
 {
-    private readonly CancellationToken token;
-
     private readonly TaskCompletionSource<IMspecElement[]> source = new();
 
     private readonly List<IMspecElement> elements = new();
@@ -21,11 +19,6 @@ public class MspecDiscoverySink : IMspecDiscoverySink
 
     public Task<IMspecElement[]> Elements => source.Task;
 
-    public MspecDiscoverySink(CancellationToken token)
-    {
-        this.token = token;
-    }
-
     public void OnSpecification(ISpecificationElement specification)
     {
         token.ThrowIfCancellationRequested();

src/Machine.Specifications.Runner.ReSharper.Adapters/Elements/BehaviorElement.cs

@@ -1,26 +1,17 @@
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Elements;
 
-public class BehaviorElement : IBehaviorElement
+public class BehaviorElement(IContextElement context, string typeName, string fieldName, string? ignoreReason)
+    : IBehaviorElement
 {
-    public BehaviorElement(IContextElement context, string typeName, string fieldName, string? ignoreReason)
-    {
-        Id = $"{context.TypeName}.{fieldName}";
-        AggregateId = $"{context.TypeName}.{typeName}";
-        Context = context;
-        TypeName = typeName;
-        FieldName = fieldName;
-        IgnoreReason = ignoreReason;
-    }
+    public string Id { get; } = $"{context.TypeName}.{fieldName}";
 
-    public string Id { get; }
+    public string AggregateId { get; } = $"{context.TypeName}.{typeName}";
 
-    public string AggregateId { get; }
+    public string? IgnoreReason { get; } = ignoreReason;
 
-    public string? IgnoreReason { get; }
+    public IContextElement Context { get; } = context;
 
-    public IContextElement Context { get; }
+    public string TypeName { get; } = typeName;
 
-    public string TypeName { get; }
-
-    public string FieldName { get; }
+    public string FieldName { get; } = fieldName;
 }

src/Machine.Specifications.Runner.ReSharper.Adapters/Elements/ContextElement.cs

@@ -1,22 +1,14 @@
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Elements;
 
-public class ContextElement : IContextElement
+public class ContextElement(string typeName, string subject, string? ignoreReason) : IContextElement
 {
-    public ContextElement(string typeName, string subject, string? ignoreReason)
-    {
-        Id = typeName;
-        TypeName = typeName;
-        Subject = subject;
-        IgnoreReason = ignoreReason;
-    }
-
-    public string Id { get; }
+    public string Id { get; } = typeName;
 
     public string AggregateId => Id;
 
-    public string? IgnoreReason { get; }
+    public string? IgnoreReason { get; } = ignoreReason;
 
-    public string TypeName { get; }
+    public string TypeName { get; } = typeName;
 
-    public string Subject { get; }
+    public string Subject { get; } = subject;
 }

src/Machine.Specifications.Runner.ReSharper.Adapters/Elements/SpecificationElement.cs

@@ -1,30 +1,25 @@
 namespace Machine.Specifications.Runner.ReSharper.Adapters.Elements;
 
-public class SpecificationElement : ISpecificationElement
+public class SpecificationElement(
+    IContextElement context,
+    string fieldName,
+    string? ignoreReason = null,
+    IBehaviorElement? behavior = null)
+    : ISpecificationElement
 {
-    public SpecificationElement(IContextElement context, string fieldName, string? ignoreReason = null, IBehaviorElement? behavior = null)
-    {
-        Id = behavior != null
-            ? $"{context.TypeName}.{behavior.FieldName}.{fieldName}"
-            : $"{context.TypeName}.{fieldName}";
-        AggregateId = behavior != null
-            ? $"{context.TypeName}.{behavior.TypeName}.{fieldName}"
-            : $"{context.TypeName}.{fieldName}";
-        IgnoreReason = ignoreReason;
-        Context = context;
-        FieldName = fieldName;
-        Behavior = behavior;
-    }
+    public string Id { get; } = behavior != null
+        ? $"{context.TypeName}.{behavior.FieldName}.{fieldName}"
+        : $"{context.TypeName}.{fieldName}";
 
-    public string Id { get; }
+    public string AggregateId { get; } = behavior != null
+        ? $"{context.TypeName}.{behavior.TypeName}.{fieldName}"
+        : $"{context.TypeName}.{fieldName}";
 
-    public string AggregateId { get; }
+    public string? IgnoreReason { get; } = ignoreReason;
 
-    public string? IgnoreReason { get; }
+    public IContextElement Context { get; } = context;
 
-    public IContextElement Context { get; }
+    public string FieldName { get; } = fieldName;
 
-    public string FieldName { get; }
-
-    public IBehaviorElement? Behavior { get; }
+    public IBehaviorElement? Behavior { get; } = behavior;
 }