Merge pull request #35753 from dotnet/merges/release/dev16.2-preview1…

…-to-release/dev16.2-preview1-vs-deps Merge release/dev16.2-preview1 to release/dev16.2-preview1-vs-deps
dotnet · May 16, 2019 · 04c76c9 · 04c76c9
2 parents 535127a + c4bb38d
commit 04c76c9
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/src/Compilers/Core/MSBuildTask/Csc.cs b/src/Compilers/Core/MSBuildTask/Csc.cs
@@ -151,10 +151,30 @@ public string WarningsNotAsErrors
 
         public string Nullable
         {
-            set { _store[nameof(Nullable)] = value; }
+            set
+            {
+                // We merge values into Nullable, prioritizing Nullable value over NullableContextOptions value
+                if (!string.IsNullOrEmpty(value))
+                {
+                    _store[nameof(Nullable)] = value;
+                }
+            }
             get { return (string)_store[nameof(Nullable)]; }
         }
 
+        public string NullableContextOptions
+        {
+            set
+            {
+                // We merge values into Nullable, prioritizing Nullable value over NullableContextOptions value
+                if (string.IsNullOrEmpty(Nullable))
+                {
+                    Nullable = value;
+                }
+            }
+            get { return Nullable; }
+        }
+
         #endregion
 
         #region Tool Members

diff --git a/src/Compilers/Core/MSBuildTaskTests/CscTests.cs b/src/Compilers/Core/MSBuildTaskTests/CscTests.cs
@@ -351,6 +351,38 @@ public void NullableReferenceTypes_Disabled()
             Assert.Equal("/nullable:disable /out:test.exe test.cs", csc.GenerateResponseFileContents());
         }
 
+        [Theory]
+        [InlineData(null, "disable")]
+        [InlineData("", "disable")]
+        [InlineData("enable", "disable")]
+        [InlineData("other", "disable")]
+        [InlineData("disable", null)]
+        [InlineData("disable", "")]
+        public void NullableReferenceTypes_NullableWins_Disable(string nullableContextOptions, string nullable)
+        {
+            var csc = new Csc();
+            csc.Sources = MSBuildUtil.CreateTaskItems("test.cs");
+            csc.NullableContextOptions = nullableContextOptions;
+            csc.Nullable = nullable;
+            Assert.Equal("/nullable:disable /out:test.exe test.cs", csc.GenerateResponseFileContents());
+        }
+
+        [Theory]
+        [InlineData(null, "enable")]
+        [InlineData("", "enable")]
+        [InlineData("disable", "enable")]
+        [InlineData("other", "enable")]
+        [InlineData("enable", null)]
+        [InlineData("enable", "")]
+        public void NullableReferenceTypes_NullableWins_Enable(string nullableContextOptions, string nullable)
+        {
+            var csc = new Csc();
+            csc.Sources = MSBuildUtil.CreateTaskItems("test.cs");
+            csc.NullableContextOptions = nullableContextOptions;
+            csc.Nullable = nullable;
+            Assert.Equal("/nullable:enable /out:test.exe test.cs", csc.GenerateResponseFileContents());
+        }
+
         [Fact]
         public void NullableReferenceTypes_Safeonly()
         {