From 2c1e4ea76906f1d1cbb5332506228802b9cba24f Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Wed, 7 Mar 2018 08:56:08 -0800
Subject: [PATCH 1/6] Log an error if MSBuildProjectExtensionsPath is modified
 after it is used

---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 10 ++++++++++
 src/Tasks/Microsoft.Common.props                  |  7 +++++++
 src/Tasks/Resources/Strings.resx                  |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index f85d2936ee7..e0df99c2e03 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -766,6 +766,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <PropertyGroup Condition="'$(Prefer32Bit)' == 'true' and ('$(PlatformTarget)' == 'AnyCPU' or '$(PlatformTarget)' == '') and '$(PlatformTargetAsMSBuildArchitectureExplicitlySet)' != 'true'">
       <PlatformTargetAsMSBuildArchitecture>x86</PlatformTargetAsMSBuildArchitecture>
     </PropertyGroup>
+
+    <!--
+      Log an error if the user set MSBuildProjectExtensionsPath in the body of a project. In an SDK style project
+      if you set a value in the body, the value is not used by the top implicit import but is used by the bottom.
+      This can lead to non-deterministic behavior and builds can fail for obscure reasons.
+    -->
+    <Error Condition=" '$(_InitialMSBuildProjectExtensionsPath)' != '' And '$(MSBuildProjectExtensionsPath)' != '$(_InitialMSBuildProjectExtensionsPath)' "
+           Code="MSB3540"
+           Text="The value of the property &quot;MSBuildProjectExtensionsPath&quot; was modified after it was used by MSBuild which can lead to unexpected build results.  To set this property, you must do so before Microsoft.Common.props is imported, for example by using Directory.Build.props."
+            />
   </Target>
 
   <!--
diff --git a/src/Tasks/Microsoft.Common.props b/src/Tasks/Microsoft.Common.props
index b04ff5bf458..0f5b4d1fbec 100644
--- a/src/Tasks/Microsoft.Common.props
+++ b/src/Tasks/Microsoft.Common.props
@@ -58,6 +58,13 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <MSBuildProjectExtensionsPath Condition="'$([System.IO.Path]::IsPathRooted($(MSBuildProjectExtensionsPath)))' == 'false'">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(MSBuildProjectExtensionsPath)'))</MSBuildProjectExtensionsPath>
     <MSBuildProjectExtensionsPath Condition="!HasTrailingSlash('$(MSBuildProjectExtensionsPath)')">$(MSBuildProjectExtensionsPath)\</MSBuildProjectExtensionsPath>
     <ImportProjectExtensionProps Condition="'$(ImportProjectExtensionProps)' == ''">true</ImportProjectExtensionProps>
+
+    <!--
+      Save the value of MSBuildProjectExtensionsPath to verify during a build that it was not changed in the body of a project.  In an SDK style project
+      if you set a value in the body, the value is not used by the top implicit import but is used by the bottom.  This can lead to non-deterministic behavior
+      and builds can fail for obscure reasons.
+    -->
+    <_InitialMSBuildProjectExtensionsPath Condition=" '$(ImportProjectExtensionProps)' == 'true' ">$(MSBuildProjectExtensionsPath)</_InitialMSBuildProjectExtensionsPath>
   </PropertyGroup>
 
   <Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.props" Condition="'$(ImportProjectExtensionProps)' == 'true' and exists('$(MSBuildProjectExtensionsPath)')" />
diff --git a/src/Tasks/Resources/Strings.resx b/src/Tasks/Resources/Strings.resx
index cadec20e0a0..adc1db629d5 100644
--- a/src/Tasks/Resources/Strings.resx
+++ b/src/Tasks/Resources/Strings.resx
@@ -2681,7 +2681,7 @@
             MSB3501 - MSB3510   Task: ReadLinesFromFile
             MSB3511 - MSB3520   Task: Message
             MSB3521 - MSB3530   Task: Warning
-            MSB3531 - MSB3540   Task: Error
+            MSB3531 - MSB3540   Task: Error    // MSB3540 is used in Microsoft.Common.CurrentVersion.targets to log an error, do no reuse
             MSB3541 - MSB3550   Task: FindUnderPath
             MSB3551 - MSB3580   Task: GenerateResource     // MSB3561, MSB3571 not used but already shipped, do not reuse
             MSB3581 - MSB3600   Task: ResolveNonMSBuildProjectOutput

From 7397e1b45cfc753d6cf06304847a8b75550b28ba Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Tue, 13 Mar 2018 08:37:49 -0700
Subject: [PATCH 2/6] Add warning for BaseIntermediateOutputPath changing

Add fwlink
---
 .../Microsoft.Common.CurrentVersion.targets     | 17 ++++++++++++++++-
 src/Tasks/Microsoft.Common.props                |  8 ++------
 src/Tasks/Resources/Strings.resx                |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index e0df99c2e03..af7f365289e 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -774,8 +774,23 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     -->
     <Error Condition=" '$(_InitialMSBuildProjectExtensionsPath)' != '' And '$(MSBuildProjectExtensionsPath)' != '$(_InitialMSBuildProjectExtensionsPath)' "
            Code="MSB3540"
-           Text="The value of the property &quot;MSBuildProjectExtensionsPath&quot; was modified after it was used by MSBuild which can lead to unexpected build results.  To set this property, you must do so before Microsoft.Common.props is imported, for example by using Directory.Build.props."
+           Text="The value of the property &quot;MSBuildProjectExtensionsPath&quot; was modified after it was used by MSBuild which can lead to unexpected build results.  To set this property, you must do so before Microsoft.Common.props is imported, for example by using Directory.Build.props.  For more information, please visit https://go.microsoft.com/fwlink/?linkid=869650"
             />
+
+    <!--
+      Log a warning if:
+        1. $(EnableBaseIntermediateOutputPathMismatchWarning) is 'true'
+        2. $(BaseIntermediateOutputPath) was set in the body of a project after its default value was set in Microsoft.Common.props
+        3. $(BaseIntermediateOutputPath) is not the same as $(MSBuildProjectExtensionsPath)
+
+      Similar to the error above, there are cases when users set $(BaseIntermediateOutputPath) in the body of their project and things build but only by coincedence.
+      MSBuild does not know if $(BaseIntermediateOutputPath) changing would cause problems so tools like NuGet must set $(EnableBaseIntermediateOutputPathMismatchWarning)
+      to 'true'.
+    -->
+    <Warning Condition=" '$(EnableBaseIntermediateOutputPathMismatchWarning)' == 'true' And '$(_InitialBaseIntermediateOutputPath)' != '$(BaseIntermediateOutputPath)' And '$(BaseIntermediateOutputPath)' != '$(MSBuildProjectExtensionsPath)' "
+             Code="MSB3539"
+             Text="The value of the property &quot;BaseIntermediateOutputPath&quot; was modified after it was used by MSBuild which can lead to unexpected build results. Tools such as NuGet will write outputs to the path specified by the &quot;MSBuildProjectExtensionsPath&quot; instead. To set this property, you must do so before Microsoft.Common.props is imported, for example by using Directory.Build.props.  For more information, please visit https://go.microsoft.com/fwlink/?linkid=869650"
+             />
   </Target>
 
   <!--
diff --git a/src/Tasks/Microsoft.Common.props b/src/Tasks/Microsoft.Common.props
index 0f5b4d1fbec..02f3e944935 100644
--- a/src/Tasks/Microsoft.Common.props
+++ b/src/Tasks/Microsoft.Common.props
@@ -49,6 +49,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         -->
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">obj\</BaseIntermediateOutputPath>
     <BaseIntermediateOutputPath Condition="!HasTrailingSlash('$(BaseIntermediateOutputPath)')">$(BaseIntermediateOutputPath)\</BaseIntermediateOutputPath>
+    <_InitialBaseIntermediateOutputPath>$(BaseIntermediateOutputPath)</_InitialBaseIntermediateOutputPath>
+
     <MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == '' ">$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
     <!--
         Import paths that are relative default to be relative to the importing file.  However, since MSBuildExtensionsPath
@@ -58,12 +60,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <MSBuildProjectExtensionsPath Condition="'$([System.IO.Path]::IsPathRooted($(MSBuildProjectExtensionsPath)))' == 'false'">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(MSBuildProjectExtensionsPath)'))</MSBuildProjectExtensionsPath>
     <MSBuildProjectExtensionsPath Condition="!HasTrailingSlash('$(MSBuildProjectExtensionsPath)')">$(MSBuildProjectExtensionsPath)\</MSBuildProjectExtensionsPath>
     <ImportProjectExtensionProps Condition="'$(ImportProjectExtensionProps)' == ''">true</ImportProjectExtensionProps>
-
-    <!--
-      Save the value of MSBuildProjectExtensionsPath to verify during a build that it was not changed in the body of a project.  In an SDK style project
-      if you set a value in the body, the value is not used by the top implicit import but is used by the bottom.  This can lead to non-deterministic behavior
-      and builds can fail for obscure reasons.
-    -->
     <_InitialMSBuildProjectExtensionsPath Condition=" '$(ImportProjectExtensionProps)' == 'true' ">$(MSBuildProjectExtensionsPath)</_InitialMSBuildProjectExtensionsPath>
   </PropertyGroup>
 
diff --git a/src/Tasks/Resources/Strings.resx b/src/Tasks/Resources/Strings.resx
index adc1db629d5..c3aeffe2ab6 100644
--- a/src/Tasks/Resources/Strings.resx
+++ b/src/Tasks/Resources/Strings.resx
@@ -2681,7 +2681,7 @@
             MSB3501 - MSB3510   Task: ReadLinesFromFile
             MSB3511 - MSB3520   Task: Message
             MSB3521 - MSB3530   Task: Warning
-            MSB3531 - MSB3540   Task: Error    // MSB3540 is used in Microsoft.Common.CurrentVersion.targets to log an error, do no reuse
+            MSB3531 - MSB3540   Task: Error    // MSB3539, MSB3540 is used in Microsoft.Common.CurrentVersion.targets, do no reuse
             MSB3541 - MSB3550   Task: FindUnderPath
             MSB3551 - MSB3580   Task: GenerateResource     // MSB3561, MSB3571 not used but already shipped, do not reuse
             MSB3581 - MSB3600   Task: ResolveNonMSBuildProjectOutput

From 5b8e22fbcc99048af6c18bb939d6f299346d478e Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Tue, 13 Mar 2018 12:26:11 -0700
Subject: [PATCH 3/6] Address comments

---
 src/Tasks/Microsoft.Common.CurrentVersion.targets | 4 ++--
 src/Tasks/Resources/Strings.resx                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tasks/Microsoft.Common.CurrentVersion.targets b/src/Tasks/Microsoft.Common.CurrentVersion.targets
index af7f365289e..7f29228ca6a 100644
--- a/src/Tasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/Tasks/Microsoft.Common.CurrentVersion.targets
@@ -770,7 +770,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <!--
       Log an error if the user set MSBuildProjectExtensionsPath in the body of a project. In an SDK style project
       if you set a value in the body, the value is not used by the top implicit import but is used by the bottom.
-      This can lead to non-deterministic behavior and builds can fail for obscure reasons.
+      This can lead to confusing behavior and builds can fail for obscure reasons.
     -->
     <Error Condition=" '$(_InitialMSBuildProjectExtensionsPath)' != '' And '$(MSBuildProjectExtensionsPath)' != '$(_InitialMSBuildProjectExtensionsPath)' "
            Code="MSB3540"
@@ -783,7 +783,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         2. $(BaseIntermediateOutputPath) was set in the body of a project after its default value was set in Microsoft.Common.props
         3. $(BaseIntermediateOutputPath) is not the same as $(MSBuildProjectExtensionsPath)
 
-      Similar to the error above, there are cases when users set $(BaseIntermediateOutputPath) in the body of their project and things build but only by coincedence.
+      Similar to the error above, there are cases when users set $(BaseIntermediateOutputPath) in the body of their project and things build but only by coincidence.
       MSBuild does not know if $(BaseIntermediateOutputPath) changing would cause problems so tools like NuGet must set $(EnableBaseIntermediateOutputPathMismatchWarning)
       to 'true'.
     -->
diff --git a/src/Tasks/Resources/Strings.resx b/src/Tasks/Resources/Strings.resx
index c3aeffe2ab6..7b093ca9009 100644
--- a/src/Tasks/Resources/Strings.resx
+++ b/src/Tasks/Resources/Strings.resx
@@ -2681,7 +2681,7 @@
             MSB3501 - MSB3510   Task: ReadLinesFromFile
             MSB3511 - MSB3520   Task: Message
             MSB3521 - MSB3530   Task: Warning
-            MSB3531 - MSB3540   Task: Error    // MSB3539, MSB3540 is used in Microsoft.Common.CurrentVersion.targets, do no reuse
+            MSB3531 - MSB3540   Task: Error    // MSB3539, MSB3540 is used in Microsoft.Common.CurrentVersion.targets, do not reuse
             MSB3541 - MSB3550   Task: FindUnderPath
             MSB3551 - MSB3580   Task: GenerateResource     // MSB3561, MSB3571 not used but already shipped, do not reuse
             MSB3581 - MSB3600   Task: ResolveNonMSBuildProjectOutput

From 835980b6d29e1714cf18efe9ef8e3a8c5ffe88e2 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Mon, 19 Mar 2018 08:57:09 -0700
Subject: [PATCH 4/6] Add ErrorIfChangedInBodyOfProject test

---
 .../ProjectExtensionsImportTestBase.cs        | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
index 38dc1447331..18e21d5cc24 100644
--- a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
+++ b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
@@ -3,6 +3,8 @@
 using Microsoft.Build.Evaluation;
 using System;
 using System.IO;
+using System.Linq;
+using Shouldly;
 using Xunit;
 
 namespace Microsoft.Build.UnitTests
@@ -148,5 +150,30 @@ public void ImportsProjectIfExists()
             Assert.Equal("true", project.GetPropertyValue(PropertyNameToEnableImport), StringComparer.OrdinalIgnoreCase);
             Assert.Equal("true", project.GetPropertyValue(PropertyNameToSignalImportSucceeded), StringComparer.OrdinalIgnoreCase);
         }
+
+        /// <summary>
+        /// Ensures that an error is logged if MSBuildProjectExtensionsPath is modified after it was set by Microsoft.Common.props.
+        /// </summary>
+        [Fact]
+        public void ErrorIfChangedInBodyOfProject()
+        {
+            Project project = ObjectModelHelpers.LoadProjectFileInTempProjectDirectory(ObjectModelHelpers.CreateFileInTempProjectDirectory(_projectRelativePath, @"
+                <Project DefaultTargets=`Build` ToolsVersion=`msbuilddefaulttoolsversion` xmlns=`http://schemas.microsoft.com/developer/msbuild/2003`>
+                    <Import Project=`$(MSBuildBinPath)\Microsoft.Common.props` />
+
+                    <PropertyGroup>
+                        <MSBuildProjectExtensionsPath>foo</MSBuildProjectExtensionsPath>
+                    </PropertyGroup>
+
+                    <Import Project=`$(MSBuildBinPath)\Microsoft.CSharp.targets` />
+                </Project>
+            "));
+
+            MockLogger logger = new MockLogger();
+
+            project.Build(new[] {logger}).ShouldBeFalse();
+
+            logger.Errors.Select(i => i.Code).FirstOrDefault().ShouldBe("MSB3540");
+        }
     }
-}
\ No newline at end of file
+}

From ef58539a3002dc8cc156c284551ded0455c173ac Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Mon, 19 Mar 2018 09:33:25 -0700
Subject: [PATCH 5/6] Unit test for BaseIntermediateOutputPath

---
 .../ProjectExtensionsImportTestBase.cs        | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
index 18e21d5cc24..214abc5e8d2 100644
--- a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
+++ b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
@@ -171,9 +171,36 @@ public void ErrorIfChangedInBodyOfProject()
 
             MockLogger logger = new MockLogger();
 
-            project.Build(new[] {logger}).ShouldBeFalse();
+            project.Build("_CheckForInvalidConfigurationAndPlatform", new[] {logger}).ShouldBeFalse();
 
             logger.Errors.Select(i => i.Code).FirstOrDefault().ShouldBe("MSB3540");
         }
+
+        /// <summary>
+        /// Ensures that an error is logged if BaseIntermediateOutputPath is modified after it was set by Microsoft.Common.props and 
+        /// EnableBaseIntermediateOutputPathMismatchWarning is 'true'.
+        /// </summary>
+        [Fact]
+        public void WarningIfBaseIntermediateOutputPathIsChangedInBodyOfProject()
+        {
+            Project project = ObjectModelHelpers.LoadProjectFileInTempProjectDirectory(ObjectModelHelpers.CreateFileInTempProjectDirectory(_projectRelativePath, @"
+                <Project DefaultTargets=`Build` ToolsVersion=`msbuilddefaulttoolsversion` xmlns=`http://schemas.microsoft.com/developer/msbuild/2003`>
+                    <Import Project=`$(MSBuildBinPath)\Microsoft.Common.props` />
+
+                    <PropertyGroup>
+                        <EnableBaseIntermediateOutputPathMismatchWarning>true</EnableBaseIntermediateOutputPathMismatchWarning>
+                        <BaseIntermediateOutputPath>foo</BaseIntermediateOutputPath>
+                    </PropertyGroup>
+
+                    <Import Project=`$(MSBuildBinPath)\Microsoft.CSharp.targets` />
+                </Project>
+            "));
+
+            MockLogger logger = new MockLogger();
+
+            project.Build("_CheckForInvalidConfigurationAndPlatform", new[] { logger }).ShouldBeTrue();
+
+            logger.Warnings.Select(i => i.Code).FirstOrDefault().ShouldBe("MSB3539");
+        }
     }
 }

From 4b5f6c32910ece213ea27249052ce31c41ac9715 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Mon, 19 Mar 2018 09:08:49 -0700
Subject: [PATCH 6/6] Migrate other test cases to Shouldly

---
 .../ProjectExtensionsImportTestBase.cs        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
index 214abc5e8d2..e72c228d93d 100644
--- a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
+++ b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs
@@ -59,10 +59,10 @@ public void DoesNotImportProjectIfNotExist()
 
             string projectExtensionsPath = project.GetPropertyValue("MSBuildProjectExtensionsPath");
 
-            Assert.True(!String.IsNullOrWhiteSpace(projectExtensionsPath), "The property 'MSBuildProjectExtensionsPath' should not be empty during project evaluation.");
-            Assert.True(!Directory.Exists(projectExtensionsPath), $"The project extension directory '{projectExtensionsPath}' should not exist.");
-            Assert.Equal("true", project.GetPropertyValue(PropertyNameToEnableImport), StringComparer.OrdinalIgnoreCase);
-            Assert.Equal(String.Empty, project.GetPropertyValue(PropertyNameToSignalImportSucceeded), StringComparer.OrdinalIgnoreCase);
+            projectExtensionsPath.ShouldNotBeNullOrWhiteSpace();
+            Directory.Exists(projectExtensionsPath).ShouldBeFalse();
+            project.GetPropertyValue(PropertyNameToEnableImport).ShouldBe("true");
+            project.GetPropertyValue(PropertyNameToSignalImportSucceeded).ShouldBeEmpty();
         }
 
         /// <summary>
@@ -94,10 +94,10 @@ public void DoesNotImportProjectWhenDisabled()
 
             string projectExtensionsDirectory = Path.Combine(ObjectModelHelpers.TempProjectDir, Path.GetDirectoryName(ImportProjectPath));
 
-            Assert.Equal("false", project.GetPropertyValue(PropertyNameToEnableImport), StringComparer.OrdinalIgnoreCase);
-            Assert.Equal(String.Empty, project.GetPropertyValue(PropertyNameToSignalImportSucceeded), StringComparer.OrdinalIgnoreCase);
-            Assert.True(Directory.Exists(projectExtensionsDirectory), $"The directory '{projectExtensionsDirectory}' should exist but doesn't.");
-            Assert.Equal($@"{projectExtensionsDirectory}{Path.DirectorySeparatorChar}", project.GetPropertyValue("MSBuildProjectExtensionsPath"));
+            project.GetPropertyValue(PropertyNameToEnableImport).ShouldBe("false");
+            project.GetPropertyValue(PropertyNameToSignalImportSucceeded).ShouldBeEmpty();
+            Directory.Exists(projectExtensionsDirectory).ShouldBeTrue();
+            project.GetPropertyValue("MSBuildProjectExtensionsPath").ShouldBe($@"{projectExtensionsDirectory}{Path.DirectorySeparatorChar}");
         }
 
         /// <summary>
@@ -123,8 +123,8 @@ public void ImportsProjectIfCustomPath()
                 </Project>
             "));
 
-            Assert.Equal("true", project.GetPropertyValue(PropertyNameToEnableImport), StringComparer.OrdinalIgnoreCase);
-            Assert.Equal("true", project.GetPropertyValue(PropertyNameToSignalImportSucceeded), StringComparer.OrdinalIgnoreCase);
+            project.GetPropertyValue(PropertyNameToEnableImport).ShouldBe("true");
+            project.GetPropertyValue(PropertyNameToSignalImportSucceeded).ShouldBe("true");
         }
 
         /// <summary>
@@ -147,8 +147,8 @@ public void ImportsProjectIfExists()
                 </Project>
             "));
 
-            Assert.Equal("true", project.GetPropertyValue(PropertyNameToEnableImport), StringComparer.OrdinalIgnoreCase);
-            Assert.Equal("true", project.GetPropertyValue(PropertyNameToSignalImportSucceeded), StringComparer.OrdinalIgnoreCase);
+            project.GetPropertyValue(PropertyNameToEnableImport).ShouldBe("true");
+            project.GetPropertyValue(PropertyNameToSignalImportSucceeded).ShouldBe("true");
         }
 
         /// <summary>