Slowly mitigating post-merge and target update build errors

daveaglick · daveaglick · commit 277bc573b132 · 2025-12-29T15:26:23.000-05:00
diff --git a/.editorconfig b/.editorconfig
@@ -97,8 +97,8 @@ dotnet_diagnostic.CA1703.severity = warning
 dotnet_diagnostic.CA1704.severity = warning
 dotnet_diagnostic.CA1707.severity = warning
 dotnet_diagnostic.CA1709.severity = warning
-dotnet_diagnostic.CA1710.severity = warning
-dotnet_diagnostic.CA1711.severity = warning
+dotnet_diagnostic.CA1710.severity = none
+dotnet_diagnostic.CA1711.severity = none
 dotnet_diagnostic.CA1712.severity = warning
 dotnet_diagnostic.CA1713.severity = warning
 dotnet_diagnostic.CA1714.severity = warning
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,17 +1,17 @@
 <Project>
   <PropertyGroup>
-    <Version Condition="'$(StatiqWebVersion)' == ''">1.0.0</Version>
-    <Version Condition="'$(StatiqWebVersion)' != ''">$(StatiqWebVersion)</Version>
+    <Version Condition="'$(StatiqVersion)' == ''">1.0.0</Version>
+    <Version Condition="'$(StatiqVersion)' != ''">$(StatiqVersion)</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <AssemblyVersion>$(Version.Split('-')[0])</AssemblyVersion>
     <FileVersion>$(Version.Split('-')[0])</FileVersion>
-    <Product>Statiq Web</Product>
+    <Product>Statiq</Product>
     <Copyright>Copyright © Statiq/Dave Glick</Copyright>
     <Authors>Dave Glick, Other Awesome Contributors</Authors>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://github.com/statiqdev/Statiq.Web</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/statiqdev/Statiq.Web.git</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/statiqdev/Statiq</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/statiqdev/Statiq.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj b/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Statiq.Web\Statiq.Web.csproj" />
+    <ProjectReference Include="..\..\src\extensions\Statiq.Web\Statiq.Web.csproj" />
   </ItemGroup>
   
 </Project>
diff --git a/src/core/Statiq.Common/Bootstrapper/IBaseCommand.cs b/src/core/Statiq.Common/Bootstrapper/IBaseCommand.cs
@@ -1,6 +1,8 @@
 ﻿namespace Statiq.Common
 {
+#pragma warning disable CA1040
     public interface IBaseCommand
     {
     }
-}
+#pragma warning restore CA1040
+}
diff --git a/src/core/Statiq.Common/Configuration/IConfigurable.cs b/src/core/Statiq.Common/Configuration/IConfigurable.cs
@@ -1,9 +1,13 @@
-﻿namespace Statiq.Common
+﻿using System.Diagnostics.CodeAnalysis;
+
+namespace Statiq.Common
 {
     /// <summary>
     /// A marker interface that indicates a given object can be configured by the bootstrapper.
     /// </summary>
+#pragma warning disable CA1040
     public interface IConfigurable
     {
     }
-}
+#pragma warning restore CA1040
+}
diff --git a/src/core/Statiq.Common/Documents/DocumentPathTree{TDocument}.cs b/src/core/Statiq.Common/Documents/DocumentPathTree{TDocument}.cs
@@ -93,11 +93,11 @@ private NormalizedPath ResolvePath(TDocument document)
             return path;
         }
 
-        public TDocument Get(NormalizedPath path)
+        public TDocument Get(NormalizedPath destinationPath)
         {
             foreach ((NormalizedPath, TDocument) item in _documents)
             {
-                if (_pathFunc(item.Item2).Equals(path))
+                if (_pathFunc(item.Item2).Equals(destinationPath))
                 {
                     return item.Item2;
                 }
diff --git a/src/core/Statiq.Common/Documents/FilteredDocumentList{TDocument}.cs b/src/core/Statiq.Common/Documents/FilteredDocumentList{TDocument}.cs
@@ -28,7 +28,7 @@ internal FilteredDocumentList(
 
         public override FilteredDocumentList<TDocument> this[params string[] patterns] => _filterFunc(this, patterns);
 
-        public TDocument Get(NormalizedPath path) => _tree.Get(path);
+        public TDocument Get(NormalizedPath destinationPath) => _tree.Get(destinationPath);
 
         public DocumentList<TDocument> GetAncestorsOf(TDocument document, bool includeSelf) => _tree.GetAncestorsOf(document, includeSelf);
 
@@ -40,4 +40,4 @@ internal FilteredDocumentList(
 
         public DocumentList<TDocument> GetSiblingsOf(TDocument document, bool includeSelf) => _tree.GetSiblingsOf(document, includeSelf);
     }
-}
+}
diff --git a/src/core/Statiq.Common/Documents/ObjectDocument{T}.cs b/src/core/Statiq.Common/Documents/ObjectDocument{T}.cs
@@ -30,7 +30,9 @@ public sealed class ObjectDocument<T> : IDocument
         /// <summary>
         /// The underlying object.
         /// </summary>
+#pragma warning disable CA1720
         public T Object { get; }
+#pragma warning restore CA1720
 
         /// <inheritdoc />
         public NormalizedPath Source { get; }
diff --git a/src/core/Statiq.Common/Html/IDocumentHtmlExtensions.cs b/src/core/Statiq.Common/Html/IDocumentHtmlExtensions.cs
@@ -18,8 +18,11 @@ public static class IDocumentHtmlExtensions
 
         internal static void ClearHtmlDocumentCache() => _htmlDocumentCache.Reset();
 
+// This is updating a cache of Task<IHtmlDocument>, so we don't want to await the resulting Task
+#pragma warning disable VSTHRD110
         internal static void AddOrUpdateCache(IContentProvider contentProvider, IHtmlDocument htmlDocument) =>
             _htmlDocumentCache.AddOrUpdate(contentProvider, _ => Task.FromResult(htmlDocument), (_, __) => Task.FromResult(htmlDocument));
+#pragma warning restore VSTHRD110
 
         /// <summary>
         /// Gets an <see cref="IHtmlDocument"/> by parsing the content of an <see cref="IDocument"/>.
diff --git a/src/core/Statiq.Common/IO/IReadOnlyFileSystemExtensions.cs b/src/core/Statiq.Common/IO/IReadOnlyFileSystemExtensions.cs
@@ -168,9 +168,9 @@ public static NormalizedPath GetContainingInputPath(this IReadOnlyFileSystem fil
             // Then try to find a directory
             return fileSystem.GetUnmappedInputPaths(path, out _)
                 .Reverse()
-                .Select(x => (x, fileSystem.GetDirectory(x)))
-                .Where(x => x.Item2.Exists)
-                .Select(x => x.Item1.Parent)
+                .Select(x => (Path: x, Directory: fileSystem.GetDirectory(x)))
+                .Where(x => x.Directory.Exists)
+                .Select(x => x.Path.Parent)
                 .FirstOrDefault();
         }
 
@@ -689,4 +689,4 @@ private class FilePathEqualityComparer : IEqualityComparer<IFile>
             public int GetHashCode([DisallowNull] IFile obj) => obj.Path.GetHashCode();
         }
     }
-}
+}
diff --git a/src/core/Statiq.Common/Util/ItemStreams/ItemStream{TItem}.cs b/src/core/Statiq.Common/Util/ItemStreams/ItemStream{TItem}.cs
@@ -88,8 +88,8 @@ public virtual void Reset()
         public sealed override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             => Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 
-        public sealed override ValueTask<int> ReadAsync(Memory<byte> memory, CancellationToken cancellationToken)
-            => new ValueTask<int>(Read(memory.Span));
+        public sealed override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken)
+            => new ValueTask<int>(Read(buffer.Span));
 
         public sealed override int Read(Span<byte> buffer)
         {
@@ -232,4 +232,4 @@ public sealed override int Read(Span<byte> buffer)
 
         public sealed override void WriteByte(byte value) => base.WriteByte(value);
     }
-}
+}
diff --git a/src/core/Statiq.Common/Util/LockingStreamWrapper.cs b/src/core/Statiq.Common/Util/LockingStreamWrapper.cs
@@ -23,7 +23,9 @@ public LockingStreamWrapper(Stream stream, bool disposeStream)
             _disposeStream = disposeStream;
         }
 
+#pragma warning disable CA1721
         protected Stream Stream { get; }
+#pragma warning restore CA1721
 
         /// <summary>
         /// Gets the wrapped stream and locks access until it's disposed.
diff --git a/src/core/Statiq.Common/Util/ParallelAsyncExtensions.cs b/src/core/Statiq.Common/Util/ParallelAsyncExtensions.cs
@@ -17,9 +17,9 @@ public static async Task<IEnumerable<TSource>> ParallelWhereAsync<TSource>(
             this IEnumerable<TSource> items,
             Func<TSource, Task<bool>> asyncPredicate,
             CancellationToken cancellationToken = default) =>
-                (await Task.WhenAll(items.Select(x => Task.Run(async () => (x, await asyncPredicate(x)), cancellationToken))))
-                    .Where(x => x.Item2)
-                    .Select(x => x.Item1);
+                (await Task.WhenAll(items.Select(x => Task.Run(async () => (Item: x, Pedicate: await asyncPredicate(x)), cancellationToken))))
+                    .Where(x => x.Pedicate)
+                    .Select(x => x.Item);
 
         /// <summary>
         /// Invokes an async selector in parallel.
@@ -63,4 +63,4 @@ public static Task ParallelForEachAsync<TSource>(
             CancellationToken cancellationToken = default) =>
                 Task.WhenAll(items.Select(x => Task.Run(() => asyncFunc(x), cancellationToken)));
     }
-}
+}
diff --git a/src/core/Statiq.Common/Util/StringStream.cs b/src/core/Statiq.Common/Util/StringStream.cs
@@ -46,7 +46,9 @@ protected override void Dispose(bool disposing)
             }
         }
 
+#pragma warning disable CA1720
         public string String { get; }
+#pragma warning restore CA1720
 
         public override bool CanRead => true;
 
@@ -105,8 +107,8 @@ public virtual void Reset()
         public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             => Task.FromResult(Read(new Span<byte>(buffer, offset, count)));
 
-        public override ValueTask<int> ReadAsync(Memory<byte> memory, CancellationToken cancellationToken)
-            => new ValueTask<int>(Read(memory.Span));
+        public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken)
+            => new ValueTask<int>(Read(buffer.Span));
 
         public sealed override int Read(Span<byte> buffer)
         {
@@ -180,4 +182,4 @@ public sealed override int Read(Span<byte> buffer)
             }
         }
     }
-}
+}
diff --git a/src/core/Statiq.Testing/Analyzers/TestAnalyzerContext.cs b/src/core/Statiq.Testing/Analyzers/TestAnalyzerContext.cs
@@ -23,12 +23,14 @@ public TestAnalyzerContext(IEnumerable<IDocument> inputs)
         {
         }
 
+#pragma warning disable CA1721
         public LogLevel LogLevel { get; set; } = LogLevel.Warning;
+#pragma warning restore CA1721
 
         public ConcurrentBag<TestAnalyzerResult> AnalyzerResults { get; } = new ConcurrentBag<TestAnalyzerResult>();
 
         public void AddAnalyzerResult(IDocument document, string message) => AnalyzerResults.Add(new TestAnalyzerResult(document, message));
 
         public LogLevel GetLogLevel(IDocument document) => LogLevel;
     }
-}
+}
diff --git a/src/core/Statiq.Testing/Execution/TestPipelineCollection.cs b/src/core/Statiq.Testing/Execution/TestPipelineCollection.cs
@@ -48,7 +48,7 @@ public void Add(KeyValuePair<string, IPipeline> item)
 
         public bool Contains(KeyValuePair<string, IPipeline> item) => ((IDictionary<string, IPipeline>)_pipelines).Contains(item);
 
-        public bool ContainsKey(string name) => _pipelines.ContainsKey(name);
+        public bool ContainsKey(string key) => _pipelines.ContainsKey(key);
 
         public void CopyTo(KeyValuePair<string, IPipeline>[] array, int arrayIndex) =>
             ((IDictionary<string, IPipeline>)_pipelines).CopyTo(array, arrayIndex);
@@ -58,8 +58,8 @@ public void CopyTo(KeyValuePair<string, IPipeline>[] array, int arrayIndex) =>
         public bool Remove(KeyValuePair<string, IPipeline> item) =>
             ((IDictionary<string, IPipeline>)_pipelines).Remove(item);
 
-        public bool TryGetValue(string name, out IPipeline value) =>
-            _pipelines.TryGetValue(name, out value);
+        public bool TryGetValue(string key, out IPipeline value) =>
+            _pipelines.TryGetValue(key, out value);
 
         public IEnumerator<KeyValuePair<string, IPipeline>> GetEnumerator() =>
             ((IDictionary<string, IPipeline>)_pipelines).GetEnumerator();
@@ -89,4 +89,4 @@ public bool TryGetValue(string key, [MaybeNullWhen(false)] out IReadOnlyPipeline
         IEnumerator<KeyValuePair<string, IReadOnlyPipeline>> IEnumerable<KeyValuePair<string, IReadOnlyPipeline>>.GetEnumerator() =>
             _pipelines.Select(x => new KeyValuePair<string, IReadOnlyPipeline>(x.Key, x.Value)).GetEnumerator();
     }
-}
+}
diff --git a/src/core/Statiq.Testing/IO/TestDirectory.cs b/src/core/Statiq.Testing/IO/TestDirectory.cs
@@ -80,16 +80,16 @@ public IEnumerable<IFile> GetFiles(SearchOption searchOption = SearchOption.TopD
                 .Where(x => x.Exists);
         }
 
-        public IDirectory GetDirectory(NormalizedPath path)
+        public IDirectory GetDirectory(NormalizedPath directory)
         {
-            path.ThrowIfNull(nameof(path));
+            directory.ThrowIfNull(nameof(directory));
 
-            if (!path.IsRelative)
+            if (!directory.IsRelative)
             {
-                throw new ArgumentException("Path must be relative", nameof(path));
+                throw new ArgumentException("Path must be relative", nameof(directory));
             }
 
-            return _fileSystem.GetDirectory(Path.Combine(path));
+            return _fileSystem.GetDirectory(Path.Combine(directory));
         }
 
         public IFile GetFile(NormalizedPath path)
diff --git a/src/extensions/Statiq.Feeds/GenerateFeeds.cs b/src/extensions/Statiq.Feeds/GenerateFeeds.cs
@@ -519,7 +519,8 @@ private static string MakeLinksAbsolute(HtmlParser parser, HtmlMarkupFormatter f
             {
                 IHtmlDocument dom = parser.ParseDocument(string.Empty);
                 INodeList nodes = parser.ParseFragment(value, dom.Body);
-                IEnumerable<IElement> elements = nodes.SelectMany(x => x.Descendents<IElement>().Where(y => y.HasAttribute("href") || y.HasAttribute("src")));
+                IEnumerable<IElement> elements = nodes
+                    .SelectMany(x => x.Descendants<IElement>().Where(y => y.HasAttribute("href") || y.HasAttribute("src")));
                 bool replaced = false;
                 foreach (IElement element in elements)
                 {
diff --git a/src/extensions/Statiq.Feeds/Syndication/Rss/RssItem.cs b/src/extensions/Statiq.Feeds/Syndication/Rss/RssItem.cs
@@ -223,6 +223,7 @@ public bool EnclosureSpecified
         }
 
         [XmlElement("guid")]
+#pragma warning disable CA1720
         public RssGuid Guid
         {
             get
@@ -235,6 +236,7 @@ public RssGuid Guid
                 _guid = value;
             }
         }
+#pragma warning restore CA1720
 
         [XmlIgnore]
         public bool GuidSpecified
diff --git a/src/extensions/Statiq.Web.Aws/Statiq.Web.Aws.csproj b/src/extensions/Statiq.Web.Aws/Statiq.Web.Aws.csproj
@@ -3,21 +3,11 @@
     <Description>Statiq is a configurable static content generation framework. This library provides support for interacting with AWS.</Description>
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine AmazonWebServices AWS</PackageTags>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
-  <Choose>
-    <When Condition=" '$(StatiqFrameworkVersion)' == ''">
-      <ItemGroup>
-        <ProjectReference Include="..\..\..\Statiq.Framework\src\core\Statiq.Common\Statiq.Common.csproj" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <PackageReference Include="Statiq.Common" Version="$(StatiqFrameworkVersion)" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
 </Project>
diff --git a/src/extensions/Statiq.Web.Azure/Statiq.Web.Azure.csproj b/src/extensions/Statiq.Web.Azure/Statiq.Web.Azure.csproj
@@ -3,22 +3,12 @@
     <Description>Statiq is a configurable static content generation framework. This library provides support for interacting with Azure.</Description>
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine Azure AppService</PackageTags>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Search.Documents" Version="11.2.1" />
     <PackageReference Include="Polly" Version="8.6.5" />
   </ItemGroup>
 
-  <Choose>
-    <When Condition=" '$(StatiqFrameworkVersion)' == ''">
-      <ItemGroup>
-        <ProjectReference Include="..\..\..\Statiq.Framework\src\core\Statiq.Common\Statiq.Common.csproj" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <PackageReference Include="Statiq.Common" Version="$(StatiqFrameworkVersion)" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
 </Project>
diff --git a/src/extensions/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj b/src/extensions/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj
@@ -3,20 +3,9 @@
     <Description>GitHub modules for Statiq including GitHub Pages deployment support.</Description>
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine GitHub GitHubPages</PackageTags>
   </PropertyGroup>
-
-  <Choose>
-    <When Condition=" '$(StatiqFrameworkVersion)' == ''">
-      <ItemGroup>
-        <ProjectReference Include="..\..\..\Statiq.Framework\src\core\Statiq.Common\Statiq.Common.csproj" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <PackageReference Include="Statiq.Common" Version="$(StatiqFrameworkVersion)" />
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <PackageReference Include="Polly" Version="8.6.5" />
diff --git a/src/extensions/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj b/src/extensions/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj
diff --git a/src/extensions/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj b/src/extensions/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj
diff --git a/src/extensions/Statiq.Web/Statiq.Web.csproj b/src/extensions/Statiq.Web/Statiq.Web.csproj
diff --git a/tests/extensions/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj b/tests/extensions/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj
diff --git a/tests/extensions/Statiq.Web.Tests/Statiq.Web.Tests.csproj b/tests/extensions/Statiq.Web.Tests/Statiq.Web.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`namespace Statiq.Common`
`2`	`2`	`{`
	`3`	`+#pragma warning disable CA1040`
`3`	`4`	`public interface IBaseCommand`
`4`	`5`	`{`
`5`	`6`	`}`
`6`		`-}`
	`7`	`+#pragma warning restore CA1040`
	`8`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`		`-namespace Statiq.Common`
	`1`	`+using System.Diagnostics.CodeAnalysis;`
	`2`	`+`
	`3`	`+namespace Statiq.Common`
`2`	`4`	`{`
`3`	`5`	`/// <summary>`
`4`	`6`	`/// A marker interface that indicates a given object can be configured by the bootstrapper.`
`5`	`7`	`/// </summary>`
	`8`	`+#pragma warning disable CA1040`
`6`	`9`	`public interface IConfigurable`
`7`	`10`	`{`
`8`	`11`	`}`
`9`		`-}`
	`12`	`+#pragma warning restore CA1040`
	`13`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ private NormalizedPath ResolvePath(TDocument document)`
`93`	`93`	`return path;`
`94`	`94`	`}`
`95`	`95`
`96`		`- public TDocument Get(NormalizedPath path)`
	`96`	`+ public TDocument Get(NormalizedPath destinationPath)`
`97`	`97`	`{`
`98`	`98`	`foreach ((NormalizedPath, TDocument) item in _documents)`
`99`	`99`	`{`
`100`		`- if (_pathFunc(item.Item2).Equals(path))`
	`100`	`+ if (_pathFunc(item.Item2).Equals(destinationPath))`
`101`	`101`	`{`
`102`	`102`	`return item.Item2;`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal FilteredDocumentList(`
`28`	`28`
`29`	`29`	`public override FilteredDocumentList<TDocument> this[params string[] patterns] => _filterFunc(this, patterns);`
`30`	`30`
`31`		`- public TDocument Get(NormalizedPath path) => _tree.Get(path);`
	`31`	`+ public TDocument Get(NormalizedPath destinationPath) => _tree.Get(destinationPath);`
`32`	`32`
`33`	`33`	`public DocumentList<TDocument> GetAncestorsOf(TDocument document, bool includeSelf) => _tree.GetAncestorsOf(document, includeSelf);`
`34`	`34`
`@@ -40,4 +40,4 @@ internal FilteredDocumentList(`
`40`	`40`
`41`	`41`	`public DocumentList<TDocument> GetSiblingsOf(TDocument document, bool includeSelf) => _tree.GetSiblingsOf(document, includeSelf);`
`42`	`42`	`}`
`43`		`-}`
	`43`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ public static NormalizedPath GetContainingInputPath(this IReadOnlyFileSystem fil`
`168`	`168`	`// Then try to find a directory`
`169`	`169`	`return fileSystem.GetUnmappedInputPaths(path, out _)`
`170`	`170`	`.Reverse()`
`171`		`- .Select(x => (x, fileSystem.GetDirectory(x)))`
`172`		`- .Where(x => x.Item2.Exists)`
`173`		`- .Select(x => x.Item1.Parent)`
	`171`	`+ .Select(x => (Path: x, Directory: fileSystem.GetDirectory(x)))`
	`172`	`+ .Where(x => x.Directory.Exists)`
	`173`	`+ .Select(x => x.Path.Parent)`
`174`	`174`	`.FirstOrDefault();`
`175`	`175`	`}`
`176`	`176`
`@@ -689,4 +689,4 @@ private class FilePathEqualityComparer : IEqualityComparer<IFile>`
`689`	`689`	`public int GetHashCode([DisallowNull] IFile obj) => obj.Path.GetHashCode();`
`690`	`690`	`}`
`691`	`691`	`}`
`692`		`-}`
	`692`	`+}`