Merge pull request #1722 from filipw/feature/nullable-annotations

added support for "annotations" in nullable context options
OmniSharp · Mar 9, 2020 · 88d2feb · 88d2feb
2 parents b60f3e4 + 03980f9
commit 88d2feb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## [1.34.14] - not yet released
+* Added support for `annotations` value of `Nullable` csproj property ([#1721](https://github.com/OmniSharp/omnisharp-roslyn/issues/1721), PR: [#1722](https://github.com/OmniSharp/omnisharp-roslyn/pull/1722))
+
 ## [1.34.13] - 2020-02-19
 * Fixed a bug where organizing usings clashed with other formatting settings (PR: [#1715](https://github.com/OmniSharp/omnisharp-roslyn/pull/1713))
 

diff --git a/src/OmniSharp.MSBuild/ProjectFile/PropertyConverter.cs b/src/OmniSharp.MSBuild/ProjectFile/PropertyConverter.cs
@@ -120,6 +120,7 @@ public static NullableContextOptions ToNullableContextOptions(string propertyVal
                 case "disable": return NullableContextOptions.Disable;
                 case "enable": return NullableContextOptions.Enable;
                 case "warnings": return NullableContextOptions.Warnings;
+                case "annotations": return NullableContextOptions.Annotations;
                 default: return NullableContextOptions.Disable;
             }
         }