Releasing 0.26.1 (#994)

* Releasing 0.26.1 * Update CHANGELOG.md
belav · Nov 9, 2023 · 3d5768a · 3d5768a
1 parent a9c4ff1
commit 3d5768a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,33 @@
-# 0.26.0
+# 0.26.1
+## What's Changed
+#### Editorconfig with duplicated sections was freezing IDE's [#989](https://github.com/belav/csharpier/issues/989)
+CSharpier was unable to parse an `.editorconfig` file that contained duplicate sections and would crash. This would result in a hung IDE.
+```
+[*]
+insert_final_newline = true
+
+[*]
+spelling_languages = en-us
+```
+
+Thanks go to @echoix for helping track this down.
+
+#### A .csharpierrc file anywhere above a file now takes priority over any .editorconfig [#987](https://github.com/belav/csharpier/issues/987)
+Given the following setup
+```
+/src/.editorconfig
+/src/ProjectName/.editorconfig
+/src/.csharpierrc
+```
+
+Originally with 0.26.0, the `/src/ProjectName/.editorconfig` file would be used for determining the configuration options for a file within `src/ProjectName`. This resulted in the existing options within `.csharpierrc` being ignored.
+
+With 0.26.1, if a `.csharpierrc` exists anywhere above a given file, it will be used to determine the configuration options.
+
+Thanks go to @parched for reporting the issue.
+
+**Full Changelog**: https://github.com/belav/csharpier/compare/0.26.0...0.26.1
+# 0.26.0
 ## What's Changed
 #### EditorConfig Support
 CSharpier will now read configuration options from an `.editorconfig`. See https://csharpier.com/docs/Configuration for more details.
@@ -1439,3 +1468,4 @@ Thanks go to @pingzing
 **Full Changelog**: https://github.com/belav/csharpier/compare/0.9.0...0.9.1
 
 
+
diff --git a/Nuget/Build.props b/Nuget/Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.26.0</Version>
+    <Version>0.26.1</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/belav/csharpier</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

diff --git a/Src/Website/docs/Configuration.md b/Src/Website/docs/Configuration.md
@@ -7,8 +7,9 @@ CSharpier has support for a configuration file. You can use any of the following
 - A ```.csharpierrc.json``` or ```.csharpierrc.yaml``` file.
 - A ```.editorconfig``` file. See EditorConfig section below.
 
-The configuration file will be resolved starting from the location of the file being formatted, and searching up the file tree until a config file is (or isn’t) found.
-
+The configuration file will be resolved based on the location of the file being formatted.
+- If a `.csharpierrc` file exists somewhere at or above the given file, that will be used.
+- Otherwise if an `.editorconfig` file exists somewhere at or above the given file, that will be used. Respecting editorconfig inheritance.
 ### Configuration Options
 JSON
 ```json