diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b24450d..a39d733 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,13 +4,7 @@
   <PropertyGroup Label="CI" Condition="'$(CI)' == ''">
     <CI>false</CI>
     <!-- GH, CircleCI, GitLab and BitBucket already use CI -->
-    <CI Condition="'$(TF_BUILD)' == 'true' or 
-                   '$(TEAMCITY_VERSION)' != '' or 
-                   '$(APPVEYOR)' != '' or 
-                   '$(BuildRunner)' == 'MyGet' or 
-                   '$(JENKINS_URL)' != '' or 
-                   '$(TRAVIS)' == 'true' or 
-                   '$(BUDDY)' == 'true'">true</CI>
+    <CI Condition="'$(TF_BUILD)' == 'true' or                     '$(TEAMCITY_VERSION)' != '' or                     '$(APPVEYOR)' != '' or                     '$(BuildRunner)' == 'MyGet' or                     '$(JENKINS_URL)' != '' or                     '$(TRAVIS)' == 'true' or                     '$(BUDDY)' == 'true'">true</CI>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -152,7 +146,7 @@
     <Using Include="System.ArgumentNullException" Static="true" />
   </ItemGroup>
 
-  <Import Project="Directory.props" Condition="Exists('Directory.props')"/>
+  <Import Project="Directory.props" Condition="Exists('Directory.props')" />
   <Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
 
   <!-- If the imported props changed ManagePackageVersionsCentrally, we need to replicate 
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 6232750..973d538 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -37,26 +37,14 @@
     <!-- Only difference is we don't copy either to output directory -->
 
     <!-- Project-level icon/readme will already be part of None items -->
-    <None Update="@(None -> WithMetadataValue('Filename', 'icon'))" 
-          Pack="true" PackagePath="%(Filename)%(Extension)" 
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackageIcon)' != ''" />
-
-    <None Update="@(None -> WithMetadataValue('Filename', 'readme'))" 
-          Pack="true" PackagePath="%(Filename)%(Extension)" 
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
+    <None Update="@(None -&gt; WithMetadataValue('Filename', 'icon'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackageIcon)' != ''" />
+
+    <None Update="@(None -&gt; WithMetadataValue('Filename', 'readme'))" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and '$(PackageReadmeFile)' != ''" />
     
     <!-- src-level will need explicit inclusion -->
-    <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" 
-          Pack="true" PackagePath="%(Filename)%(Extension)"
-          CopyToOutputDirectory="Never"
-          Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
-
-    <None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md"  
-          Pack="true" PackagePath="%(Filename)%(Extension)"
-          CopyToOutputDirectory="Never"
-          Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
+    <None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png" Visible="false" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="Exists('$(MSBuildThisFileDirectory)icon.png') and !Exists('$(MSBuildProjectDirectory)\icon.png')" />
+
+    <None Include="$(MSBuildThisFileDirectory)readme.md" Link="readme.md" Pack="true" PackagePath="%(Filename)%(Extension)" CopyToOutputDirectory="Never" Condition="'$(PackReadme)' != 'false' and Exists('$(MSBuildThisFileDirectory)readme.md') and !Exists('$(MSBuildProjectDirectory)\readme.md')" />
   </ItemGroup>
 
   <!-- Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultAssemblyInfo.targets does this and is imported 
@@ -115,7 +103,7 @@
     <!-- Consider the project out of date if any of these files changes -->
     <UpToDateCheck Include="@(None);@(Content);@(EmbeddedResource)" />
     <!-- Opt-in to typed resource generation by setting custom tool to MSBuild:Compile -->
-    <EmbeddedResource Update="@(EmbeddedResource -> WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
+    <EmbeddedResource Update="@(EmbeddedResource -&gt; WithMetadataValue('Generator', 'MSBuild:Compile'))" Type="Resx">
       <!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
       <StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
       <StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
@@ -141,10 +129,7 @@
   </ItemGroup>
 
   <!-- Make sure the source control info is available before calling source generators -->
-  <Target Name="EnsureProjectInformation" 
-          BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun"
-          AfterTargets="InitializeSourceControlInformation"
-          DependsOnTargets="InitializeSourceControlInformation">
+  <Target Name="EnsureProjectInformation" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" AfterTargets="InitializeSourceControlInformation" DependsOnTargets="InitializeSourceControlInformation">
     
     <PropertyGroup Condition="'$(SourceControlInformationFeatureSupported)' == 'true'">
       <!-- The project must specify PublishRepositoryUrl=true in order to publish the URL, in order to prevent inadvertent leak of internal URL. -->
@@ -160,7 +145,7 @@
 
     <!-- Add SourceRoot as a project property too -->
     <ItemGroup>
-      <_GitSourceRoot Include="@(SourceRoot -> WithMetadataValue('SourceControl', 'git'))" />
+      <_GitSourceRoot Include="@(SourceRoot -&gt; WithMetadataValue('SourceControl', 'git'))" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -169,11 +154,7 @@
 
   </Target>
 
-  <Target Name="UpdatePackageMetadata"
-          BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack"
-          DependsOnTargets="EnsureProjectInformation"
-          Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And
-                     '$(IsPackable)' == 'true'">
+  <Target Name="UpdatePackageMetadata" BeforeTargets="PrepareForBuild;GenerateMSBuildEditorConfigFileShouldRun;GetAssemblyVersion;GetPackageMetadata;GenerateNuspec;Pack" DependsOnTargets="EnsureProjectInformation" Condition="'$(SourceControlInformationFeatureSupported)' == 'true' And                      '$(IsPackable)' == 'true'">
     <PropertyGroup>
       <PackageProjectUrl Condition="'$(PackageProjectUrl)' == '' and '$(PublishRepositoryUrl)' == 'true'">$(RepositoryUrl)</PackageProjectUrl>
       <PackageDescription>$(Description)</PackageDescription>
@@ -182,7 +163,7 @@
   </Target>
 
   <!-- Import before UsingTask because first to declare tasks wins -->
-  <Import Project="Directory.targets" Condition="Exists('Directory.targets')"/>
+  <Import Project="Directory.targets" Condition="Exists('Directory.targets')" />
   <Import Project="Directory.targets.user" Condition="Exists('Directory.targets.user')" />
 
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 2078c13..babe207 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -12,7 +12,7 @@
     <PackageVersion Include="IFluentInterface" Version="2.1.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.49.1" />
+    <PackageVersion Include="Spectre.Console" Version="0.50.0" />
     <PackageVersion Include="System.Composition.AttributedModel" Version="6.0.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
diff --git a/src/SponsorLink/SponsorLink.Analyzer.Tests.targets b/src/SponsorLink/SponsorLink.Analyzer.Tests.targets
index 4687e1e..7102500 100644
--- a/src/SponsorLink/SponsorLink.Analyzer.Tests.targets
+++ b/src/SponsorLink/SponsorLink.Analyzer.Tests.targets
@@ -18,31 +18,20 @@
   <Target Name="AddSponsorLinkAnalyzerDependencies" BeforeTargets="CoreCompile" DependsOnTargets="ResolveLockFileCopyLocalFiles">
     <ItemGroup>
       <!-- NOTE: keep in sync with ILRepack'ed assemblies as needed -->
-      <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' 
-        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))
-        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('ThisAssembly', StringComparison.OrdinalIgnoreCase))" />
+      <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll'          And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))         And !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('ThisAssembly', StringComparison.OrdinalIgnoreCase))" />
 
-      <CandidateAnalyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="
-        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And
-        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CSharp', StringComparison.OrdinalIgnoreCase)) And
-        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.', StringComparison.OrdinalIgnoreCase))"
-      />
+      <CandidateAnalyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CSharp', StringComparison.OrdinalIgnoreCase)) And         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.', StringComparison.OrdinalIgnoreCase))" />
       <!-- Brings in System/Microsoft.IdentityModel, System.Text.Encodings.Web, System.Text.Json, Humanizer  -->
-      <CandidateAnalyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="
-        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
-        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
-        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.Text', StringComparison.OrdinalIgnoreCase)) Or
-        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Humanizer', StringComparison.OrdinalIgnoreCase))"
-      />
+      <CandidateAnalyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="         $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or         $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or         $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.Text', StringComparison.OrdinalIgnoreCase)) Or         $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Humanizer', StringComparison.OrdinalIgnoreCase))" />
     </ItemGroup>
 
     <ItemGroup>
-      <UniqueCandidateAnalyzer Include="@(CandidateAnalyzer -> Distinct())" />
+      <UniqueCandidateAnalyzer Include="@(CandidateAnalyzer -&gt; Distinct())" />
       <UniqueCandidateAnalyzer>
         <NetStandard>$([MSBuild]::ValueOrDefault('%(FullPath)', '').Replace('net6.0', 'netstandard2.0').Replace('net8.0', 'netstandard2.0').Replace('netcoreapp3.1', 'netstandard2.0'))</NetStandard>
       </UniqueCandidateAnalyzer>
       <!-- Analyzer assemblies cannot target anything other than NS2.0 -->
-      <Analyzer Include="@(UniqueCandidateAnalyzer -> '%(NetStandard)')" Condition="Exists('%(UniqueCandidateAnalyzer.NetStandard)')"/>
+      <Analyzer Include="@(UniqueCandidateAnalyzer -&gt; '%(NetStandard)')" Condition="Exists('%(UniqueCandidateAnalyzer.NetStandard)')" />
     </ItemGroup>
   </Target>
 
diff --git a/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets b/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
index eb4c61b..9bd306b 100644
--- a/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
+++ b/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
@@ -39,7 +39,7 @@
   <Target Name="SL" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" DependsOnTargets="$(SLDependsOn)">
     <ItemGroup>
       <!-- Make manifests visible to analyzers -->
-      <AdditionalFiles Include="@(SponsorManifest -> Distinct())" />
+      <AdditionalFiles Include="@(SponsorManifest -&gt; Distinct())" />
     </ItemGroup>
   </Target>
 
@@ -47,15 +47,13 @@
     <!-- Makes direct dependencies visible to the compiler, so that sponsoring checks can selectively skip indirectly referenced analyzer -->
     <!-- An analyzer can check for the presense of a global property named after the package id (which will contain the instaled version) -->
     <ItemGroup>
-      <DirectDependency Include="@(_RestoreGraphEntry -> HasMetadata('Id'))"
-                        Condition="'%(_RestoreGraphEntry.Type)' == 'Dependency' and
-                                   '%(_RestoreGraphEntry.ProjectUniqueName)' == '$(MSBuildProjectFullPath)'">
+      <DirectDependency Include="@(_RestoreGraphEntry -&gt; HasMetadata('Id'))" Condition="'%(_RestoreGraphEntry.Type)' == 'Dependency' and                                    '%(_RestoreGraphEntry.ProjectUniqueName)' == '$(MSBuildProjectFullPath)'">
         <Id>$([MSBuild]::ValueOrDefault('%(_RestoreGraphEntry.Id)', '').Replace('.', '_'))</Id>
       </DirectDependency>
-      <CompilerVisibleProperty Include="@(DirectDependency -> '%(Id)')" />
+      <CompilerVisibleProperty Include="@(DirectDependency -&gt; '%(Id)')" />
     </ItemGroup>
     <CreateProperty Condition="'@(DirectDependency)' != ''" Value="%(DirectDependency.VersionRange)">
-      <Output TaskParameter="Value" PropertyName="%(DirectDependency.Id)"/>
+      <Output TaskParameter="Value" PropertyName="%(DirectDependency.Id)" />
     </CreateProperty>
   </Target>
 
@@ -67,7 +65,7 @@
        <!--Used to determine installation time, for example, by looking up the analyzer assembly in additional files with: 
               build_metadata.Analyzer.ItemType = Analyzer
               build_metadata.Analyzer.NuGetPackageId = [PackageId] -->
-      <AdditionalFiles Include="@(Analyzer -> WithMetadataValue('NuGetPackageId', '$(_FundingPackageId)'))" />
+      <AdditionalFiles Include="@(Analyzer -&gt; WithMetadataValue('NuGetPackageId', '$(_FundingPackageId)'))" />
     </ItemGroup>
   </Target>
 
@@ -85,8 +83,7 @@
       <Output TaskParameter="Lines" ItemName="SLConfig" />
     </ReadLinesFromFile>
     <ItemGroup>
-      <SLConfigAutoSync Include="$([MSBuild]::ValueOrDefault(%(SLConfig.Identity), '').Trim())"
-                        Condition="$([MSBuild]::ValueOrDefault(%(SLConfig.Identity), '').Trim().StartsWith('autosync'))" />
+      <SLConfigAutoSync Include="$([MSBuild]::ValueOrDefault(%(SLConfig.Identity), '').Trim())" Condition="$([MSBuild]::ValueOrDefault(%(SLConfig.Identity), '').Trim().StartsWith('autosync'))" />
     </ItemGroup>
     <PropertyGroup>
       <SLConfigAutoSync>%(SLConfigAutoSync.Identity)</SLConfigAutoSync>