From 0afb0bcc9d2079667cd156ae5afb8ef0760075fc Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Fri, 10 Jan 2020 08:03:47 -0800
Subject: [PATCH] Avoid setting BuildingInsideVisualStudio on .NET Core builds

---
 .../Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs       | 6 ++++++
 .../Core/MSBuild/MSBuild/Constants/PropertyNames.cs         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
index dff6fca43ee..ed47b9d6655 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/Build/ProjectBuildManager.cs
@@ -28,7 +28,13 @@ internal class ProjectBuildManager
             { PropertyNames.DesignTimeBuild, bool.TrueString },
 
             // this will force CoreCompile task to execute even if all inputs and outputs are up to date
+#if NETCOREAPP
+            { PropertyNames.NonExistentFile, "__NonExistentSubDir__\\__NonExistentFile__" },
+#else
+            // Setting `BuildingInsideVisualStudio` indirectly sets NonExistentFile:
+            // https://github.com/microsoft/msbuild/blob/ab9b2f36a5ff7a85f842b205d5529e77fdc9d7ab/src/Tasks/Microsoft.Common.CurrentVersion.targets#L3462-L3470
             { PropertyNames.BuildingInsideVisualStudio, bool.TrueString },
+#endif
 
             { PropertyNames.BuildProjectReferences, bool.FalseString },
             { PropertyNames.BuildingProject, bool.FalseString },
diff --git a/src/Workspaces/Core/MSBuild/MSBuild/Constants/PropertyNames.cs b/src/Workspaces/Core/MSBuild/MSBuild/Constants/PropertyNames.cs
index 525efe24d69..cf8e07bae1a 100644
--- a/src/Workspaces/Core/MSBuild/MSBuild/Constants/PropertyNames.cs
+++ b/src/Workspaces/Core/MSBuild/MSBuild/Constants/PropertyNames.cs
@@ -33,6 +33,7 @@ internal static class PropertyNames
         public const string LangVersion = nameof(LangVersion);
         public const string ModuleAssemblyName = nameof(ModuleAssemblyName);
         public const string NoCompilerStandardLib = nameof(NoCompilerStandardLib);
+        public const string NonExistentFile = nameof(NonExistentFile);
         public const string NoWarn = nameof(NoWarn);
         public const string _NoWarnings = nameof(_NoWarnings);
         public const string Optimize = nameof(Optimize);
-- 
GitLab