Add/remove projects also updates build configurations (#5134)

* Add/remove projects also updates build configurations

* Fix the algorithm for adding/removing build configurations

* Address PR comments

TestAssets/TestProjects/SlnFileWithNoProjectReferences/SlnFileWithNoProjectReferences.sln

@@ -1,18 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26006.2
-MinimumVisualStudioVersion = 10.0.40219.1
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

TestAssets/TestProjects/TestAppWithEmptySln/App.sln

@@ -0,0 +1,5 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1

TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Lib\Lib.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+  </ItemGroup>
+
+</Project>

TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs

@@ -0,0 +1,10 @@
+using System;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        Console.WriteLine("Hello from the main app");
+        Console.WriteLine(Lib.Library.GetMessage());
+    }
+}

TestAssets/TestProjects/TestAppWithEmptySln/Lib/Lib.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library" Version="1.6" />
+  </ItemGroup>
+
+</Project>

TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+    public class Library
+    {
+        public static string GetMessage()
+        {
+            return "Message from Lib";
+        }
+    }
+}

TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App.sln

@@ -0,0 +1,45 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App\App.csproj", "{7072A694-548F-4CAE-A58F-12D257D5F486}"
+EndProject
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Lib", "Lib\Lib.csproj", "{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x64.ActiveCfg = Debug|x64
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x64.Build.0 = Debug|x64
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x86.ActiveCfg = Debug|x86
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Debug|x86.Build.0 = Debug|x86
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x64.ActiveCfg = Release|x64
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x64.Build.0 = Release|x64
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x86.ActiveCfg = Release|x86
+		{21D9159F-60E6-4F65-BC6B-D01B71B15FFC}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+EndGlobal

TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.1" />
+  </ItemGroup>
+
+</Project>

TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs

@@ -0,0 +1,9 @@
+using System;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        Console.WriteLine("Hello from the main app");
+    }
+}

TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Lib.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NETStandard.Library" Version="1.6" />
+  </ItemGroup>
+
+</Project>

TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Lib
+{
+    public class Library
+    {
+        public static string GetMessage()
+        {
+            return "Message from Lib";
+        }
+    }
+}

src/dotnet/commands/dotnet-add/dotnet-add-proj/Program.cs

@@ -8,6 +8,7 @@ using Microsoft.DotNet.Cli.Sln.Internal;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.Common;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
@@ -103,10 +104,69 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToSolution
                     FilePath = projectPathNormalized
                 };
 
+                AddDefaultBuildConfigurations(slnFile, slnProject);
+
                 slnFile.Projects.Add(slnProject);
+
                 Reporter.Output.WriteLine(
                     string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectPath));
             }
         }
+
+        private void AddDefaultBuildConfigurations(SlnFile slnFile, SlnProject slnProject)
+        {
+            var defaultConfigurations = new List<string>()
+            {
+                "Debug|Any CPU",
+                "Debug|x64",
+                "Debug|x86",
+                "Release|Any CPU",
+                "Release|x64",
+                "Release|x86",
+            };
+
+            // NOTE: The order you create the sections determines the order they are written to the sln
+            // file. In the case of an empty sln file, in order to make sure the solution configurations
+            // section comes first we need to add it first. This doesn't affect correctness but does 
+            // stop VS from re-ordering things later on. Since we are keeping the SlnFile class low-level
+            // it shouldn't care about the VS implementation details. That's why we handle this here.
+            AddDefaultSolutionConfigurations(defaultConfigurations, slnFile.SolutionConfigurationsSection);
+            AddDefaultProjectConfigurations(
+                defaultConfigurations,
+                slnFile.ProjectConfigurationsSection.GetOrCreatePropertySet(slnProject.Id));
+        }
+
+        private void AddDefaultSolutionConfigurations(
+            List<string> defaultConfigurations,
+            SlnPropertySet solutionConfigs)
+        {
+            foreach (var config in defaultConfigurations)
+            {
+                if (!solutionConfigs.ContainsKey(config))
+                {
+                    solutionConfigs[config] = config;
+                }
+            }
+        }
+
+        private void AddDefaultProjectConfigurations(
+            List<string> defaultConfigurations,
+            SlnPropertySet projectConfigs)
+        {
+            foreach (var config in defaultConfigurations)
+            {
+                var activeCfgKey = $"{config}.ActiveCfg";
+                if (!projectConfigs.ContainsKey(activeCfgKey))
+                {
+                    projectConfigs[activeCfgKey] = config;
+                }
+
+                var build0Key = $"{config}.Build.0";
+                if (!projectConfigs.ContainsKey(build0Key))
+                {
+                    projectConfigs[build0Key] = config;
+                }
+            }
+        }
     }
 }

src/dotnet/commands/dotnet-remove/dotnet-remove-proj/Program.cs

@@ -49,6 +49,8 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectFromSolution
                 slnChanged |= RemoveProject(slnFile, path);
             }
 
+            RemoveEmptyConfigurationSections(slnFile);
+
             if (slnChanged)
             {
                 slnFile.Write();
@@ -75,6 +77,11 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectFromSolution
             {
                 foreach (var slnProject in projectsToRemove)
                 {
+                    var buildConfigsToRemove = slnFile.ProjectConfigurationsSection.GetPropertySet(slnProject.Id);
+                    if (buildConfigsToRemove != null)
+                    {
+                        slnFile.ProjectConfigurationsSection.Remove(buildConfigsToRemove);
+                    }
                     slnFile.Projects.Remove(slnProject);
                     Reporter.Output.WriteLine(
                         string.Format(CommonLocalizableStrings.ProjectReferenceRemoved, slnProject.FilePath));
@@ -85,5 +92,23 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectFromSolution
 
             return projectRemoved;
         }
+
+        private void RemoveEmptyConfigurationSections(SlnFile slnFile)
+        {
+            if (slnFile.Projects.Count == 0)
+            {
+                var solutionConfigs = slnFile.Sections.GetSection("SolutionConfigurationPlatforms");
+                if (solutionConfigs != null)
+                {
+                    slnFile.Sections.Remove(solutionConfigs);
+                }
+
+                var projectConfigs = slnFile.Sections.GetSection("ProjectConfigurationPlatforms");
+                if (projectConfigs != null)
+                {
+                    slnFile.Sections.Remove(projectConfigs);
+                }
+            }
+        }
     }
 }

test/dotnet-add-proj.Tests/GivenDotnetAddProj.cs

@@ -28,6 +28,89 @@ Additional Arguments:
  Projects to add to solution
 ";
 
+        private const string ExpectedSlnFileAfterAddingLibProj = @"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project(""{9A19103F-16F7-4668-BE54-9A1E7A4F7556}"") = ""App"", ""App\App.csproj"", ""{7072A694-548F-4CAE-A58F-12D257D5F486}""
+EndProject
+Project(""{13B669BE-BB05-4DDF-9536-439F39A36129}"") = ""Lib"", ""Lib\Lib.csproj"", ""__PROJECTGUID__""
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+		__PROJECTGUID__.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		__PROJECTGUID__.Debug|Any CPU.Build.0 = Debug|Any CPU
+		__PROJECTGUID__.Debug|x64.ActiveCfg = Debug|x64
+		__PROJECTGUID__.Debug|x64.Build.0 = Debug|x64
+		__PROJECTGUID__.Debug|x86.ActiveCfg = Debug|x86
+		__PROJECTGUID__.Debug|x86.Build.0 = Debug|x86
+		__PROJECTGUID__.Release|Any CPU.ActiveCfg = Release|Any CPU
+		__PROJECTGUID__.Release|Any CPU.Build.0 = Release|Any CPU
+		__PROJECTGUID__.Release|x64.ActiveCfg = Release|x64
+		__PROJECTGUID__.Release|x64.Build.0 = Release|x64
+		__PROJECTGUID__.Release|x86.ActiveCfg = Release|x86
+		__PROJECTGUID__.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
+";
+
+        private const string ExpectedSlnFileAfterAddingLibProjToEmptySln = @"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project(""{13B669BE-BB05-4DDF-9536-439F39A36129}"") = ""Lib"", ""Lib\Lib.csproj"", ""__PROJECTGUID__""
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		__PROJECTGUID__.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		__PROJECTGUID__.Debug|Any CPU.Build.0 = Debug|Any CPU
+		__PROJECTGUID__.Debug|x64.ActiveCfg = Debug|x64
+		__PROJECTGUID__.Debug|x64.Build.0 = Debug|x64
+		__PROJECTGUID__.Debug|x86.ActiveCfg = Debug|x86
+		__PROJECTGUID__.Debug|x86.Build.0 = Debug|x86
+		__PROJECTGUID__.Release|Any CPU.ActiveCfg = Release|Any CPU
+		__PROJECTGUID__.Release|Any CPU.Build.0 = Release|Any CPU
+		__PROJECTGUID__.Release|x64.ActiveCfg = Release|x64
+		__PROJECTGUID__.Release|x64.Build.0 = Release|x64
+		__PROJECTGUID__.Release|x86.ActiveCfg = Release|x86
+		__PROJECTGUID__.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+EndGlobal
+";
+
         [Theory]
         [InlineData("--help")]
         [InlineData("-h")]
@@ -171,11 +254,51 @@ Additional Arguments:
         }
 
         [Theory]
-        [InlineData("TestAppWithSlnAndCsprojFiles", "")]
+        [InlineData("TestAppWithSlnAndCsprojFiles", ExpectedSlnFileAfterAddingLibProj, "")]
-        [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles", "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")]
+        [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles", ExpectedSlnFileAfterAddingLibProj, "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")]
-        public void WhenValidProjectIsPassedItGetsNormalizedAndAddedAndSlnBuilds(
+        [InlineData("TestAppWithEmptySln", ExpectedSlnFileAfterAddingLibProjToEmptySln, "")]
+        public void WhenValidProjectIsPassedBuildConfigsAreAdded(
             string testAsset,
-            string projectGuid)
+            string expectedSlnContentsTemplate,
+            string expectedProjectGuid)
+        {
+            var projectDirectory = TestAssets
+                .Get(testAsset)
+                .CreateInstance()
+                .WithSourceFiles()
+                .Root
+                .FullName;
+
+            var projectToAdd = "Lib/Lib.csproj";
+            var cmd = new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .ExecuteWithCapturedOutput($"add App.sln project {projectToAdd}");
+            cmd.Should().Pass();
+
+            var slnPath = Path.Combine(projectDirectory, "App.sln");
+
+            if (string.IsNullOrEmpty(expectedProjectGuid))
+            {
+                var slnFile = SlnFile.Read(slnPath);
+                var matchingProjects = slnFile.Projects
+                    .Where((p) => p.Name == "Lib")
+                    .ToList();
+
+                matchingProjects.Count.Should().Be(1);
+                var slnProject = matchingProjects[0];
+                expectedProjectGuid = slnProject.Id;
+            }
+
+            var expectedSlnContents = expectedSlnContentsTemplate.Replace("__PROJECTGUID__", expectedProjectGuid);
+            File.ReadAllText(slnPath)
+                .Should().BeVisuallyEquivalentTo(expectedSlnContents);
+        }
+
+        [Theory]
+        [InlineData("TestAppWithSlnAndCsprojFiles")]
+        [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
+        [InlineData("TestAppWithEmptySln")]
+        public void WhenValidProjectIsPassedItGetsAdded(string testAsset)
         {
             var projectDirectory = TestAssets
                 .Get(testAsset)
@@ -192,29 +315,55 @@ Additional Arguments:
             cmd.Should().Pass();
             cmd.StdOut.Should().Be($"Project `{projectPath}` added to the solution.");
             cmd.StdErr.Should().BeEmpty();
+        }
 
-            var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
+        [Theory]
-            var matchingProjects = slnFile.Projects
+        [InlineData("TestAppWithSlnAndCsprojFiles")]
-                .Where((p) => p.Name == "Lib")
+        [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
-                .ToList();
+        [InlineData("TestAppWithEmptySln")]
+        public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset)
+        {
+            var projectDirectory = TestAssets
+                .Get(testAsset)
+                .CreateInstance()
+                .WithSourceFiles()
+                .Root
+                .FullName;
 
-            matchingProjects.Count.Should().Be(1);
+            var cmd = new DotnetCommand()
-            var slnProject = matchingProjects[0];
-            slnProject.FilePath.Should().Be(projectPath);
-            slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CPSProjectTypeGuid);
-            if (!string.IsNullOrEmpty(projectGuid))
-            {
-                slnProject.Id.Should().Be(projectGuid);
-            }
-
-            var restoreCmd = new DotnetCommand()
                 .WithWorkingDirectory(projectDirectory)
-                .Execute($"restore {Path.Combine("App", "App.csproj")}");
+                .ExecuteWithCapturedOutput(@"add App.sln project App/App.csproj Lib/Lib.csproj");
+            cmd.Should().Pass();
 
-            var buildCmd = new DotnetCommand()
+            var slnPath = Path.Combine(projectDirectory, "App.sln");
+
+            new DotnetCommand()
                 .WithWorkingDirectory(projectDirectory)
-                .Execute("build App.sln");
+                .Execute($"restore App.sln")
-            buildCmd.Should().Pass();
+                .Should().Pass();
+
+            new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .Execute("build App.sln --configuration Release")
+                .Should().Pass();
+
+            var reasonString = "should be built in release mode, otherwise it means build configurations are missing from the sln file";
+
+            var appReleaseDirectory = Directory.EnumerateDirectories(
+                Path.Combine(projectDirectory, "App", "bin"),
+                "Release",
+                SearchOption.AllDirectories);
+            appReleaseDirectory.Count().Should().Be(1, $"App {reasonString}");
+            Directory.EnumerateFiles(appReleaseDirectory.Single(), "App.dll", SearchOption.AllDirectories)
+                .Count().Should().Be(1, $"App {reasonString}");
+
+            var libReleaseDirectory = Directory.EnumerateDirectories(
+                Path.Combine(projectDirectory, "Lib", "bin"),
+                "Release",
+                SearchOption.AllDirectories);
+            libReleaseDirectory.Count().Should().Be(1, $"Lib {reasonString}");
+            Directory.EnumerateFiles(libReleaseDirectory.Single(), "Lib.dll", SearchOption.AllDirectories)
+                .Count().Should().Be(1, $"Lib {reasonString}");
         }
 
         [Fact]
@@ -258,7 +407,7 @@ Additional Arguments:
             cmd.StdErr.Should().Be("Project `idonotexist.csproj` does not exist.");
 
             File.ReadAllText(slnFullPath)
-                .Should().BeEquivalentTo(contentBefore);
+                .Should().BeVisuallyEquivalentTo(contentBefore);
         }
     }
 }

test/dotnet-list-proj.Tests/GivenDotnetListProj.cs

@@ -147,7 +147,7 @@ Options:
         public void WhenNoProjectReferencesArePresentInTheSolutionItPrintsANoProjectMessage()
         {
             var projectDirectory = TestAssets
-                .Get("SlnFileWithNoProjectReferences")
+                .Get("TestAppWithEmptySln")
                 .CreateInstance()
                 .WithSourceFiles()
                 .Root

test/dotnet-remove-proj.Tests/GivenDotnetRemoveProj.cs

@@ -6,6 +6,7 @@ using Microsoft.DotNet.Cli.Sln.Internal;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using System;
 using System.IO;
+using System.Linq;
 using Xunit;
 
 namespace Microsoft.DotNet.Cli.Remove.Project.Tests
@@ -26,6 +27,48 @@ Additional Arguments:
  Projects to remove from a solution
 ";
 
+        private const string ExpectedSlnContentsAfterRemove = @"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Project(""{9A19103F-16F7-4668-BE54-9A1E7A4F7556}"") = ""App"", ""App\App.csproj"", ""{7072A694-548F-4CAE-A58F-12D257D5F486}""
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.ActiveCfg = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x64.Build.0 = Debug|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.ActiveCfg = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Debug|x86.Build.0 = Debug|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.ActiveCfg = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x64.Build.0 = Release|x64
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.ActiveCfg = Release|x86
+		{7072A694-548F-4CAE-A58F-12D257D5F486}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+EndGlobal
+";
+
+        private const string ExpectedSlnContentsAfterRemoveAllProjects = @"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26006.2
+MinimumVisualStudioVersion = 10.0.40219.1
+Global
+EndGlobal
+";
+
         [Theory]
         [InlineData("--help")]
         [InlineData("-h")]
@@ -186,7 +229,7 @@ Additional Arguments:
             cmd.Should().Pass();
             cmd.StdOut.Should().Be("Project reference `referenceDoesNotExistInSln.csproj` could not be found.");
             File.ReadAllText(solutionPath)
-                .Should().Be(contentBefore);
+                .Should().BeVisuallyEquivalentTo(contentBefore);
         }
 
         [Fact]
@@ -273,5 +316,96 @@ Project reference `idontexisteither.csproj` could not be found.";
             slnFile.Projects.Count.Should().Be(1);
             slnFile.Projects[0].FilePath.Should().Be(Path.Combine("App", "App.csproj"));
         }
+
+        [Fact]
+        public void WhenReferenceIsRemovedBuildConfigsAreAlsoRemoved()
+        {
+            var projectDirectory = TestAssets
+                .Get("TestAppWithSlnAndCsprojToRemove")
+                .CreateInstance()
+                .WithSourceFiles()
+                .Root
+                .FullName;
+
+            var solutionPath = Path.Combine(projectDirectory, "App.sln");
+            SlnFile slnFile = SlnFile.Read(solutionPath);
+            slnFile.Projects.Count.Should().Be(2);
+
+            var projectToRemove = Path.Combine("Lib", "Lib.csproj");
+            var cmd = new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .ExecuteWithCapturedOutput($"remove project {projectToRemove}");
+            cmd.Should().Pass();
+
+            File.ReadAllText(solutionPath)
+                .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemove);
+        }
+
+        [Fact]
+        public void WhenReferenceIsRemovedSlnBuilds()
+        {
+            var projectDirectory = TestAssets
+                .Get("TestAppWithSlnAndCsprojToRemove")
+                .CreateInstance()
+                .WithSourceFiles()
+                .Root
+                .FullName;
+
+            var solutionPath = Path.Combine(projectDirectory, "App.sln");
+            SlnFile slnFile = SlnFile.Read(solutionPath);
+            slnFile.Projects.Count.Should().Be(2);
+
+            var projectToRemove = Path.Combine("Lib", "Lib.csproj");
+            var cmd = new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .ExecuteWithCapturedOutput($"remove project {projectToRemove}");
+            cmd.Should().Pass();
+
+            new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .Execute($"restore App.sln")
+                .Should().Pass();
+
+            new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .Execute("build App.sln --configuration Release")
+                .Should().Pass();
+
+            var reasonString = "should be built in release mode, otherwise it means build configurations are missing from the sln file";
+
+            var releaseDirectory = Directory.EnumerateDirectories(
+                Path.Combine(projectDirectory, "App", "bin"),
+                "Release",
+                SearchOption.AllDirectories);
+            releaseDirectory.Count().Should().Be(1, $"App {reasonString}");
+            Directory.EnumerateFiles(releaseDirectory.Single(), "App.dll", SearchOption.AllDirectories)
+                .Count().Should().Be(1, $"App {reasonString}");
+        }
+
+        [Fact]
+        public void WhenFinalReferenceIsRemovedEmptySectionsAreRemoved()
+        {
+            var projectDirectory = TestAssets
+                .Get("TestAppWithSlnAndCsprojToRemove")
+                .CreateInstance()
+                .WithSourceFiles()
+                .Root
+                .FullName;
+
+            var solutionPath = Path.Combine(projectDirectory, "App.sln");
+            SlnFile slnFile = SlnFile.Read(solutionPath);
+            slnFile.Projects.Count.Should().Be(2);
+
+            var appPath = Path.Combine("App", "App.csproj");
+            var libPath = Path.Combine("Lib", "Lib.csproj");
+            var projectsToRemove = $"{libPath} {appPath}";
+            var cmd = new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .ExecuteWithCapturedOutput($"remove project {projectsToRemove}");
+            cmd.Should().Pass();
+
+            File.ReadAllText(solutionPath)
+                .Should().BeVisuallyEquivalentTo(ExpectedSlnContentsAfterRemoveAllProjects);
+        }
     }
 }