Merge pull request #16 from nils-org/renovate/spectre.console.testing-0.x

(maint) Update Spectre.Console to v0.44.0

Author: nils-a

.gitignore

@@ -53,3 +53,4 @@ docs/input/tasks/*
 config.wyam.*
 /src/packages/
 .idea/
+.cake/

global.json

@@ -1,7 +1,7 @@
 {
     "sdk": {
         "allowPrerelease": true,
-        "version": "6.0.100",
+        "version": "6.0.200",
         "rollForward": "latestFeature"
     }
 }

recipe.cake

@@ -14,14 +14,44 @@ BuildParameters.SetParameters(
   twitterMessage: standardNotificationMessage,
   preferredBuildProviderType: BuildProviderType.GitHubActions,
   shouldRunDotNetCorePack: true,
-  shouldUseDeterministicBuilds: true);
+  shouldUseDeterministicBuilds: true,
+  shouldRunDupFinder: false, // dupFinder is missing since 2021.3.0-eap
+  shouldRunInspectCode: false // we're shipping a custom version of it below
+  );
 
 BuildParameters.PrintParameters(Context);
 
 // workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
 ToolSettings.SetToolPreprocessorDirectives(
-    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.0");
+    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.3.3");
 
 ToolSettings.SetToolSettings(context: Context);
 
+// additional workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
+// to suppress the --build/--no-build warning that is generated in the default
+BuildParameters.Tasks.InspectCodeTask = Task("InspectCode2021")
+    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
+    .Does<BuildData>(data => RequireTool(ToolSettings.ReSharperTools, () => {
+        var inspectCodeLogFilePath = BuildParameters.Paths.Directories.InspectCodeTestResults.CombineWithFilePath("inspectcode.xml");
+
+        var settings = new InspectCodeSettings() {
+            SolutionWideAnalysis = true,
+            OutputFile = inspectCodeLogFilePath,
+            ArgumentCustomization = x => x.Append("--no-build")
+        };
+
+        if (FileExists(BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName)))
+        {
+            settings.Profile = BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName);
+        }
+
+        InspectCode(BuildParameters.SolutionFilePath, settings);
+
+        // Pass path to InspectCode log file to Cake.Issues.Recipe
+        IssuesParameters.InputFiles.InspectCodeLogFilePath = inspectCodeLogFilePath;
+    })
+);
+BuildParameters.Tasks.AnalyzeTask.IsDependentOn("InspectCode2021");
+IssuesBuildTasks.ReadIssuesTask.IsDependentOn("InspectCode2021");
+
 Build.RunDotNetCore();

src/Spectre.Console.Registrars.SimpleInjector.Tests/Spectre.Console.Registrars.SimpleInjector.Tests.csproj

@@ -14,8 +14,8 @@
         <PackageReference Include="Moq" Version="4.17.2" />
         <PackageReference Include="Shouldly" Version="4.0.3" />
         <PackageReference Include="SimpleInjector" Version="5.3.2" />
-        <PackageReference Include="Spectre.Console" Version="0.43.0" />
-        <PackageReference Include="Spectre.Console.Testing" Version="0.43.0" />
+        <PackageReference Include="Spectre.Console" Version="0.44.0" />
+        <PackageReference Include="Spectre.Console.Testing" Version="0.44.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.analyzers" Version="0.10.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

src/Spectre.Console.Registrars.SimpleInjector/Spectre.Console.Registrars.SimpleInjector.csproj

@@ -34,7 +34,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SimpleInjector" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Spectre.Console" Version="0.43.0" PrivateAssets="all" />
+    <PackageReference Include="Spectre.Console" Version="0.44.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>