mirrors/dotnet-installer
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
This repository has been archived on 2025-09-07. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
dotnet-installer/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs

1048 lines
45 KiB
C#
Raw Normal View History

Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using FluentAssertions;
using Microsoft.Build.Construction;
using Microsoft.DotNet.Cli.Sln.Internal;
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
using Microsoft.DotNet.Tools;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
using Microsoft.DotNet.Tools.Test.Utilities;
using System;
using System.IO;
using System.Linq;
Write UTF-8 BOM for solution files. Currently the solution file written out by the `sln` command uses a UTF-8 encoding without a BOM. This causes problems when the solution file contains non-ASCII code points because Visual Studio and MSBuild will not use a UTF-8 encoding when reading the solution file if the BOM is omitted. This commit causes the BOM to always be written when writing the solution files. Fixes #8184.
2017-12-08 13:52:56 -08:00
using System.Text;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
using Xunit;
fix loc text dependent test
2017-01-30 07:39:28 -08:00
using Xunit.Abstractions;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
namespace Microsoft.DotNet.Cli.Sln.Add.Tests
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
{
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
public class GivenDotnetSlnAdd : TestBase
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
{
Adjust help message test expectations to match new parser
2017-06-26 17:17:51 -07:00
private string HelpText = @"Usage: dotnet sln <SLN_FILE> add [options] <args>
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
Arguments:
new parser version, adjust column spacing in tests
2017-03-22 15:26:58 -07:00
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
<args> Add one or more specified projects to the solution.
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
Options:
Fixes a few inconsistencies in the display for the dotnet restore -help command. Fixing tests based on the new strings.
2017-05-09 21:05:09 -07:00
-h, --help Show help information.
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
";
Show help info when no or wrong arguments are given Fixes #5383, fixes #5384
2017-05-04 01:01:35 +02:00
Adjust help message test expectations to match new parser
2017-06-26 17:17:51 -07:00
private const string SlnCommandHelpText = @"Usage: dotnet sln [options] <SLN_FILE> [command]
Show help info when no or wrong arguments are given Fixes #5383, fixes #5384
2017-05-04 01:01:35 +02:00
Arguments:
<SLN_FILE> Solution file to operate on. If not specified, the command will search the current directory for one.
Options:
Fixes a few inconsistencies in the display for the dotnet restore -help command. Fixing tests based on the new strings.
2017-05-09 21:05:09 -07:00
-h, --help Show help information.
Show help info when no or wrong arguments are given Fixes #5383, fixes #5384
2017-05-04 01:01:35 +02:00
Commands:
add <args> .NET Add project(s) to a solution file Command
list .NET List project(s) in a solution file Command
remove <args> .NET Remove project(s) from a solution file Command
";
fix loc text dependent test
2017-01-30 07:39:28 -08:00
private ITestOutputHelper _output;
public GivenDotnetSlnAdd(ITestOutputHelper output)
{
_output = output;
}
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
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
2017-01-03 07:18:45 -10:00
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
Default to C# project type guid
2017-02-14 14:57:04 -08:00
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""Lib"", ""Lib\Lib.csproj"", ""__LIB_PROJECT_GUID__""
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
2017-01-03 07:18:45 -10:00
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
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
__LIB_PROJECT_GUID__.Debug|Any CPU.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|Any CPU.Build.0 = Debug|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Debug|x64.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x64.Build.0 = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.Build.0 = Debug|Any CPU
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
__LIB_PROJECT_GUID__.Release|Any CPU.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|Any CPU.Build.0 = Release|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Release|x64.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x64.Build.0 = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.Build.0 = Release|Any CPU
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
2017-01-03 07:18:45 -10:00
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
Default to C# project type guid
2017-02-14 14:57:04 -08:00
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""Lib"", ""Lib\Lib.csproj"", ""__LIB_PROJECT_GUID__""
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
2017-01-03 07:18:45 -10:00
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
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
__LIB_PROJECT_GUID__.Debug|Any CPU.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|Any CPU.Build.0 = Debug|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Debug|x64.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x64.Build.0 = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.Build.0 = Debug|Any CPU
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
__LIB_PROJECT_GUID__.Release|Any CPU.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|Any CPU.Build.0 = Release|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Release|x64.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x64.Build.0 = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.Build.0 = Release|Any CPU
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
EndGlobalSection
EndGlobal
";
private const string ExpectedSlnFileAfterAddingNestedProj = @"
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.csproj"", ""{7072A694-548F-4CAE-A58F-12D257D5F486}""
EndProject
Project(""{2150E333-8FDC-42A3-9474-1A3956D46DE8}"") = ""src"", ""src"", ""__SRC_FOLDER_GUID__""
EndProject
Default to C# project type guid
2017-02-14 14:57:04 -08:00
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""Lib"", ""src\Lib\Lib.csproj"", ""__LIB_PROJECT_GUID__""
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
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
__LIB_PROJECT_GUID__.Debug|Any CPU.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|Any CPU.Build.0 = Debug|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Debug|x64.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x64.Build.0 = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.ActiveCfg = Debug|Any CPU
__LIB_PROJECT_GUID__.Debug|x86.Build.0 = Debug|Any CPU
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
__LIB_PROJECT_GUID__.Release|Any CPU.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|Any CPU.Build.0 = Release|Any CPU
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
__LIB_PROJECT_GUID__.Release|x64.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x64.Build.0 = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.ActiveCfg = Release|Any CPU
__LIB_PROJECT_GUID__.Release|x86.Build.0 = Release|Any CPU
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
Do not add duplicate solution folders or project directories (#5377) * Do not add duplicate solution folders or project directories * Fix the algorithm for removing empty solution folders * Improving code by adding description methods. To address PR comments.
2017-01-20 16:34:37 -10:00
__LIB_PROJECT_GUID__ = __SRC_FOLDER_GUID__
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
2017-01-03 07:18:45 -10:00
EndGlobalSection
EndGlobal
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
";
private const string ExpectedSlnFileAfterAddingProjectWithoutMatchingConfigs = @"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26006.2
MinimumVisualStudioVersion = 10.0.40219.1
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""ProjectWithoutMatchingConfigs"", ""ProjectWithoutMatchingConfigs\ProjectWithoutMatchingConfigs.csproj"", ""{C49B64DE-4401-4825-8A88-10DCB5950E57}""
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
Foo Bar|Any CPU = Foo Bar|Any CPU
Foo Bar|x64 = Foo Bar|x64
Foo Bar|x86 = Foo Bar|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|x64.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|x64.Build.0 = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|x86.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Debug|x86.Build.0 = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|Any CPU.Build.0 = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|x64.ActiveCfg = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|x64.Build.0 = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|x86.ActiveCfg = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Release|x86.Build.0 = Release|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|Any CPU.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|Any CPU.Build.0 = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|x64.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|x64.Build.0 = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|x86.ActiveCfg = Debug|Any CPU
{C49B64DE-4401-4825-8A88-10DCB5950E57}.Foo Bar|x86.Build.0 = Debug|Any CPU
EndGlobalSection
EndGlobal
";
private const string ExpectedSlnFileAfterAddingProjectWithMatchingConfigs = @"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26006.2
MinimumVisualStudioVersion = 10.0.40219.1
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""ProjectWithMatchingConfigs"", ""ProjectWithMatchingConfigs\ProjectWithMatchingConfigs.csproj"", ""{C9601CA2-DB64-4FB6-B463-368C7764BF0D}""
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
Foo Bar|Any CPU = Foo Bar|Any CPU
Foo Bar|x64 = Foo Bar|x64
Foo Bar|x86 = Foo Bar|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|x64.ActiveCfg = Debug|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|x64.Build.0 = Debug|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|x86.ActiveCfg = Debug|x86
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Debug|x86.Build.0 = Debug|x86
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|Any CPU.Build.0 = Release|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|x64.ActiveCfg = Release|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|x64.Build.0 = Release|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|x86.ActiveCfg = Release|x86
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Release|x86.Build.0 = Release|x86
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|Any CPU.ActiveCfg = FooBar|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|Any CPU.Build.0 = FooBar|Any CPU
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|x64.ActiveCfg = FooBar|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|x64.Build.0 = FooBar|x64
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|x86.ActiveCfg = FooBar|x86
{C9601CA2-DB64-4FB6-B463-368C7764BF0D}.Foo Bar|x86.Build.0 = FooBar|x86
EndGlobalSection
EndGlobal
";
private const string ExpectedSlnFileAfterAddingProjectWithAdditionalConfigs = @"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26006.2
MinimumVisualStudioVersion = 10.0.40219.1
Project(""{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"") = ""ProjectWithAdditionalConfigs"", ""ProjectWithAdditionalConfigs\ProjectWithAdditionalConfigs.csproj"", ""{A302325B-D680-4C0E-8680-7AE283981624}""
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
Foo Bar|Any CPU = Foo Bar|Any CPU
Foo Bar|x64 = Foo Bar|x64
Foo Bar|x86 = Foo Bar|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|x64.ActiveCfg = Debug|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|x64.Build.0 = Debug|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|x86.ActiveCfg = Debug|x86
{A302325B-D680-4C0E-8680-7AE283981624}.Debug|x86.Build.0 = Debug|x86
{A302325B-D680-4C0E-8680-7AE283981624}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Release|Any CPU.Build.0 = Release|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Release|x64.ActiveCfg = Release|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Release|x64.Build.0 = Release|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Release|x86.ActiveCfg = Release|x86
{A302325B-D680-4C0E-8680-7AE283981624}.Release|x86.Build.0 = Release|x86
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|Any CPU.ActiveCfg = FooBar|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|Any CPU.Build.0 = FooBar|Any CPU
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|x64.ActiveCfg = FooBar|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|x64.Build.0 = FooBar|x64
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|x86.ActiveCfg = FooBar|x86
{A302325B-D680-4C0E-8680-7AE283981624}.Foo Bar|x86.Build.0 = FooBar|x86
EndGlobalSection
EndGlobal
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
2017-01-03 07:18:45 -10:00
";
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
[Theory]
[InlineData("--help")]
[InlineData("-h")]
Treat /? the same as --help (#5285) * Fixes issue 4539 * Support -?
2017-01-12 23:24:12 -10:00
[InlineData("-?")]
[InlineData("/?")]
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
public void WhenHelpOptionIsPassedItPrintsUsage(string helpArg)
{
var cmd = new DotnetCommand()
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln add {helpArg}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Pass();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
}
Complete the refactor and test improvements
2016-12-16 10:23:26 -08:00
[Theory]
[InlineData("")]
[InlineData("unknownCommandName")]
public void WhenNoCommandIsPassedItPrintsError(string commandName)
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
{
var cmd = new DotnetCommand()
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln {commandName}");
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(CommonLocalizableStrings.RequiredCommandNotPassed);
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(SlnCommandHelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
Implement dotnet list projects (#5027) * Implement dotnet list projects * Address PR comments * Fix build breaks
2016-12-16 06:41:47 -10:00
[Fact]
public void WhenTooManyArgumentsArePassedItPrintsError()
{
var cmd = new DotnetCommand()
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput("sln one.sln two.sln three.sln add");
Implement dotnet list projects (#5027) * Implement dotnet list projects * Address PR comments * Fix build breaks
2016-12-16 06:41:47 -10:00
cmd.Should().Fail();
Redirect parser to localized validation messages
2017-06-27 13:26:14 -07:00
cmd.StdErr.Should().BeVisuallyEquivalentTo($@"{string.Format(CommandLine.LocalizableStrings.UnrecognizedCommandOrArgument, "two.sln")}
{string.Format(CommandLine.LocalizableStrings.UnrecognizedCommandOrArgument, "three.sln")}
{CommonLocalizableStrings.SpecifyAtLeastOneProjectToAdd}");
Implement dotnet list projects (#5027) * Implement dotnet list projects * Address PR comments * Fix build breaks
2016-12-16 06:41:47 -10:00
}
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
[Theory]
[InlineData("idontexist.sln")]
[InlineData("ihave?invalidcharacters")]
[InlineData("ihaveinv@lidcharacters")]
[InlineData("ihaveinvalid/characters")]
[InlineData("ihaveinvalidchar\\acters")]
public void WhenNonExistingSolutionIsPassedItPrintsErrorAndUsage(string solutionName)
{
var cmd = new DotnetCommand()
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln {solutionName} add p.csproj");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindSolutionOrDirectory, solutionName));
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
[Fact]
public void WhenInvalidSolutionIsPassedItPrintsErrorAndUsage()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("InvalidSolution")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln InvalidSolution.sln add {projectToAdd}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, "InvalidSolution.sln", LocalizableStrings.FileHeaderMissingError));
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
[Fact]
public void WhenInvalidSolutionIsFoundItPrintsErrorAndUsage()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("InvalidSolution")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var solutionPath = Path.Combine(projectDirectory, "InvalidSolution.sln");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln add {projectToAdd}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.InvalidSolutionFormatString, solutionPath, LocalizableStrings.FileHeaderMissingError));
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
[Fact]
public void WhenNoProjectIsPassedItPrintsErrorAndUsage()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput(@"sln App.sln add");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(CommonLocalizableStrings.SpecifyAtLeastOneProjectToAdd);
fix loc text dependent test
2017-01-30 07:39:28 -08:00
_output.WriteLine("[STD OUT]");
_output.WriteLine(cmd.StdOut);
_output.WriteLine("[HelpText]");
_output.WriteLine(HelpText);
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
[Fact]
public void WhenNoSolutionExistsInTheDirectoryItPrintsErrorAndUsage()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var solutionPath = Path.Combine(projectDirectory, "App");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var cmd = new DotnetCommand()
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
.WithWorkingDirectory(solutionPath)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput(@"sln add App.csproj");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.SolutionDoesNotExist, solutionPath + Path.DirectorySeparatorChar));
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
[Fact]
public void WhenMoreThanOneSolutionExistsInTheDirectoryItPrintsErrorAndUsage()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("TestAppWithMultipleSlnFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln add {projectToAdd}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.MoreThanOneSolutionInDirectory, projectDirectory + Path.DirectorySeparatorChar));
cmd.StdOut.Should().BeVisuallyEquivalentToIfNotLocalized(HelpText);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
[Fact]
public void WhenNestedProjectIsAddedSolutionFoldersAreCreated()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojInSubDir")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
cmd.Should().Pass();
var slnPath = Path.Combine(projectDirectory, "App.sln");
var expectedSlnContents = GetExpectedSlnContents(slnPath, ExpectedSlnFileAfterAddingNestedProj);
File.ReadAllText(slnPath)
.Should().BeVisuallyEquivalentTo(expectedSlnContents);
}
Add support for accepting directories to sln add and remove commands. This commit adds support for specifying directories containing a single project to both the `sln add` and `sln remove` commands. Additionally, the output from `sln remove` has been improved to not mention "project references". Fixes issue #7343.
2017-12-07 17:22:29 -08:00
[Fact]
public void WhenDirectoryContainingProjectIsGivenProjectIsAdded()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("sln add Lib");
cmd.Should().Pass();
var slnPath = Path.Combine(projectDirectory, "App.sln");
var expectedSlnContents = GetExpectedSlnContents(slnPath, ExpectedSlnFileAfterAddingLibProj);
File.ReadAllText(slnPath)
.Should().BeVisuallyEquivalentTo(expectedSlnContents);
}
[Fact]
public void WhenDirectoryContainsNoProjectsItCancelsWholeOperation()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(projectDirectory, "App.sln");
var contentBefore = File.ReadAllText(slnFullPath);
var directoryToAdd = "Empty";
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln add {directoryToAdd}");
cmd.Should().Fail();
cmd.StdErr.Should().Be(
string.Format(
CommonLocalizableStrings.CouldNotFindAnyProjectInDirectory,
Path.Combine(projectDirectory, directoryToAdd)));
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(contentBefore);
}
[Fact]
public void WhenDirectoryContainsMultipleProjectsItCancelsWholeOperation()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(projectDirectory, "App.sln");
var contentBefore = File.ReadAllText(slnFullPath);
var directoryToAdd = "Multiple";
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln add {directoryToAdd}");
cmd.Should().Fail();
cmd.StdErr.Should().Be(
string.Format(
CommonLocalizableStrings.MoreThanOneProjectInDirectory,
Path.Combine(projectDirectory, directoryToAdd)));
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(contentBefore);
}
Do not add duplicate solution folders or project directories (#5377) * Do not add duplicate solution folders or project directories * Fix the algorithm for removing empty solution folders * Improving code by adding description methods. To address PR comments.
2017-01-20 16:34:37 -10:00
[Fact]
public void WhenProjectDirectoryIsAddedSolutionFoldersAreNotCreated()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
cmd.Should().Pass();
var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
var solutionFolderProjects = slnFile.Projects.Where(
p => p.TypeGuid == ProjectTypeGuids.SolutionFolderGuid);
solutionFolderProjects.Count().Should().Be(0);
slnFile.Sections.GetSection("NestedProjects").Should().BeNull();
}
[Theory]
[InlineData(".")]
[InlineData("")]
public void WhenSolutionFolderExistsItDoesNotGetAdded(string firstComponent)
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndSolutionFolders")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = Path.Combine($"{firstComponent}", "src", "src", "Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
cmd.Should().Pass();
var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
slnFile.Projects.Count().Should().Be(4);
var solutionFolderProjects = slnFile.Projects.Where(
p => p.TypeGuid == ProjectTypeGuids.SolutionFolderGuid);
solutionFolderProjects.Count().Should().Be(2);
var solutionFolders = slnFile.Sections.GetSection("NestedProjects").Properties;
solutionFolders.Count.Should().Be(3);
solutionFolders["{DDF3765C-59FB-4AA6-BE83-779ED13AA64A}"]
.Should().Be("{72BFCA87-B033-4721-8712-4D12166B4A39}");
var newlyAddedSrcFolder = solutionFolderProjects.Where(
p => p.Id != "{72BFCA87-B033-4721-8712-4D12166B4A39}").Single();
solutionFolders[newlyAddedSrcFolder.Id]
.Should().Be("{72BFCA87-B033-4721-8712-4D12166B4A39}");
var libProject = slnFile.Projects.Where(p => p.Name == "Lib").Single();
solutionFolders[libProject.Id]
.Should().Be(newlyAddedSrcFolder.Id);
}
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
[Theory]
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
2017-01-03 07:18:45 -10:00
[InlineData("TestAppWithSlnAndCsprojFiles", ExpectedSlnFileAfterAddingLibProj, "")]
[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles", ExpectedSlnFileAfterAddingLibProj, "{84A45D44-B677-492D-A6DA-B3A71135AB8E}")]
[InlineData("TestAppWithEmptySln", ExpectedSlnFileAfterAddingLibProjToEmptySln, "")]
public void WhenValidProjectIsPassedBuildConfigsAreAdded(
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
string testAsset,
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
2017-01-03 07:18:45 -10:00
string expectedSlnContentsTemplate,
string expectedProjectGuid)
{
var projectDirectory = TestAssets
.Get(testAsset)
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = "Lib/Lib.csproj";
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
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
2017-01-03 07:18:45 -10:00
cmd.Should().Pass();
var slnPath = Path.Combine(projectDirectory, "App.sln");
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
var expectedSlnContents = GetExpectedSlnContents(
slnPath,
expectedSlnContentsTemplate,
expectedProjectGuid);
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
2017-01-03 07:18:45 -10:00
File.ReadAllText(slnPath)
.Should().BeVisuallyEquivalentTo(expectedSlnContents);
}
[Theory]
[InlineData("TestAppWithSlnAndCsprojFiles")]
[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
[InlineData("TestAppWithEmptySln")]
public void WhenValidProjectIsPassedItGetsAdded(string testAsset)
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get(testAsset)
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var projectToAdd = "Lib/Lib.csproj";
Improve sln migration tests (#5066) * WIP Improve sln migration tests * Simple migration test * Improve the test * WIP update test assets * Update test * Test a bug fix * Add another migrate sln test * Fix FilePath related tests * Finish the migrate sln tests * Fix tests * Fix another path issue
2016-12-20 13:04:01 -10:00
var projectPath = Path.Combine("Lib", "Lib.csproj");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Pass();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectPath));
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.StdErr.Should().BeEmpty();
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
2017-01-03 07:18:45 -10:00
}
Write UTF-8 BOM for solution files. Currently the solution file written out by the `sln` command uses a UTF-8 encoding without a BOM. This causes problems when the solution file contains non-ASCII code points because Visual Studio and MSBuild will not use a UTF-8 encoding when reading the solution file if the BOM is omitted. This commit causes the BOM to always be written when writing the solution files. Fixes #8184.
2017-12-08 13:52:56 -08:00
[Fact]
public void WhenProjectIsAddedSolutionHasUTF8BOM()
{
var projectDirectory = TestAssets
.Get("TestAppWithEmptySln")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = "Lib/Lib.csproj";
var projectPath = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
cmd.Should().Pass();
var preamble = Encoding.UTF8.GetPreamble();
preamble.Length.Should().Be(3);
using (var stream = new FileStream(Path.Combine(projectDirectory, "App.sln"), FileMode.Open))
{
var bytes = new byte[preamble.Length];
stream.Read(bytes, 0, bytes.Length);
bytes.Should().BeEquivalentTo(preamble);
}
}
Re-enable solution building tests
2017-03-08 11:33:27 -08:00
[Theory]
[InlineData("TestAppWithSlnAndCsprojFiles")]
[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
Gracefully report invalid project in sln-add Fixes #5900
2017-05-06 02:08:00 +02:00
[InlineData("TestAppWithEmptySln")]
public void WhenInvalidProjectIsPassedItDoesNotGetAdded(string testAsset)
{
var projectDirectory = TestAssets
.Get(testAsset)
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = "Lib/Library.cs";
var projectPath = Path.Combine("Lib", "Library.cs");
var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
var expectedNumberOfProjects = slnFile.Projects.Count();
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
cmd.Should().Pass();
cmd.StdOut.Should().BeEmpty();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdErr.Should().Match(string.Format(CommonLocalizableStrings.InvalidProjectWithExceptionMessage, '*', '*'));
Gracefully report invalid project in sln-add Fixes #5900
2017-05-06 02:08:00 +02:00
slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
slnFile.Projects.Count().Should().Be(expectedNumberOfProjects);
}
[Theory]
[InlineData("TestAppWithSlnAndCsprojFiles")]
[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
Re-enable solution building tests
2017-03-08 11:33:27 -08:00
[InlineData("TestAppWithEmptySln")]
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
2017-01-03 07:18:45 -10:00
public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset)
{
var projectDirectory = TestAssets
.Get(testAsset)
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
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
2017-01-03 07:18:45 -10:00
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput(@"sln App.sln add App/App.csproj Lib/Lib.csproj");
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
2017-01-03 07:18:45 -10:00
cmd.Should().Pass();
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
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
2017-01-03 07:18:45 -10:00
var slnPath = Path.Combine(projectDirectory, "App.sln");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
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
2017-01-03 07:18:45 -10:00
new DotnetCommand()
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
.WithWorkingDirectory(projectDirectory)
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
2017-01-03 07:18:45 -10:00
.Execute($"restore App.sln")
.Should().Pass();
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
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
2017-01-03 07:18:45 -10:00
new DotnetCommand()
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
.WithWorkingDirectory(projectDirectory)
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
2017-01-03 07:18:45 -10:00
.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}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
Do not add duplicate projects (#5698)
2017-02-14 13:47:06 -10:00
[Theory]
[InlineData("TestAppWithSlnAndExistingCsprojReferences")]
[InlineData("TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep")]
public void WhenSolutionAlreadyContainsProjectItDoesntDuplicate(string testAsset)
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
Do not add duplicate projects (#5698)
2017-02-14 13:47:06 -10:00
.Get(testAsset)
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var solutionPath = Path.Combine(projectDirectory, "App.sln");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Pass();
Make dotnet-sln-add.Tests pass on localized setup
2017-06-13 21:58:03 -07:00
cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.SolutionAlreadyContainsProject, solutionPath, projectToAdd));
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.StdErr.Should().BeEmpty();
}
[Fact]
public void WhenPassedMultipleProjectsAndOneOfthemDoesNotExistItCancelsWholeOperation()
{
WIP Refactor and improve tests
2016-12-16 01:04:09 -08:00
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCsprojFiles")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
var slnFullPath = Path.Combine(projectDirectory, "App.sln");
var contentBefore = File.ReadAllText(slnFullPath);
var projectToAdd = Path.Combine("Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd} idonotexist.csproj");
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
cmd.Should().Fail();
Add support for accepting directories to sln add and remove commands. This commit adds support for specifying directories containing a single project to both the `sln add` and `sln remove` commands. Additionally, the output from `sln remove` has been improved to not mention "project references". Fixes issue #7343.
2017-12-07 17:22:29 -08:00
cmd.StdErr.Should().Be(string.Format(CommonLocalizableStrings.CouldNotFindProjectOrDirectory, "idonotexist.csproj"));
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
File.ReadAllText(slnFullPath)
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
2017-01-03 07:18:45 -10:00
.Should().BeVisuallyEquivalentTo(contentBefore);
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) * dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid * Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
//ISSUE: https://github.com/dotnet/sdk/issues/522
//[Fact]
public void WhenPassedAnUnknownProjectTypeItFails()
{
var projectDirectory = TestAssets
.Get("SlnFileWithNoProjectReferencesAndUnknownProject")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(projectDirectory, "App.sln");
var contentBefore = File.ReadAllText(slnFullPath);
var projectToAdd = Path.Combine("UnknownProject", "UnknownProject.unknownproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) * dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid * Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
cmd.Should().Fail();
cmd.StdErr.Should().BeVisuallyEquivalentTo("Unsupported project type. Please check with your sdk provider.");
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(contentBefore);
}
[Theory]
Fix project type GUIDs when adding projects to solution files. This commit ensures the correct property (`ProjectTypeGuids`) is respected when adding a project to a solution file. Additionally, we now error if a project type GUID cannot be determined rather than incorrectly mapping to the C# project type. Enabled previously disabled tests that were waiting on upstream changes from MSBuild and F#. Fixes #5131. Fixes #7742.
2018-03-14 18:21:50 -07:00
[InlineData("SlnFileWithNoProjectReferencesAndCSharpProject", "CSharpProject", "CSharpProject.csproj", ProjectTypeGuids.CSharpProjectTypeGuid)]
[InlineData("SlnFileWithNoProjectReferencesAndFSharpProject", "FSharpProject", "FSharpProject.fsproj", ProjectTypeGuids.FSharpProjectTypeGuid)]
[InlineData("SlnFileWithNoProjectReferencesAndVBProject", "VBProject", "VBProject.vbproj", ProjectTypeGuids.VBProjectTypeGuid)]
dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) * dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid * Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
[InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithSingleProjectTypeGuid", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
[InlineData("SlnFileWithNoProjectReferencesAndUnknownProjectWithMultipleProjectTypeGuids", "UnknownProject", "UnknownProject.unknownproj", "{130159A9-F047-44B3-88CF-0CF7F02ED50F}")]
public void WhenPassedAProjectItAddsCorrectProjectTypeGuid(
string testAsset,
string projectDir,
string projectName,
string expectedTypeGuid)
{
var projectDirectory = TestAssets
.Get(testAsset)
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = Path.Combine(projectDir, projectName);
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
dotnet sln command (#5233) * Add dotnet sln command * Use new names for localizable strings * Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
.ExecuteWithCapturedOutput($"sln App.sln add {projectToAdd}");
dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) * dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid * Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
cmd.Should().Pass();
cmd.StdErr.Should().BeEmpty();
Fix project type GUIDs when adding projects to solution files. This commit ensures the correct property (`ProjectTypeGuids`) is respected when adding a project to a solution file. Additionally, we now error if a project type GUID cannot be determined rather than incorrectly mapping to the C# project type. Enabled previously disabled tests that were waiting on upstream changes from MSBuild and F#. Fixes #5131. Fixes #7742.
2018-03-14 18:21:50 -07:00
cmd.StdOut.Should().Be(string.Format(CommonLocalizableStrings.ProjectAddedToTheSolution, projectToAdd));
dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218) * dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid * Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
var nonSolutionFolderProjects = slnFile.Projects.Where(
p => p.TypeGuid != ProjectTypeGuids.SolutionFolderGuid);
nonSolutionFolderProjects.Count().Should().Be(1);
nonSolutionFolderProjects.Single().TypeGuid.Should().Be(expectedTypeGuid);
}
Fix project type GUIDs when adding projects to solution files. This commit ensures the correct property (`ProjectTypeGuids`) is respected when adding a project to a solution file. Additionally, we now error if a project type GUID cannot be determined rather than incorrectly mapping to the C# project type. Enabled previously disabled tests that were waiting on upstream changes from MSBuild and F#. Fixes #5131. Fixes #7742.
2018-03-14 18:21:50 -07:00
[Fact]
public void WhenPassedAProjectWithoutATypeGuidItErrors()
{
var solutionDirectory = TestAssets
.Get("SlnFileWithNoProjectReferencesAndUnknownProjectType")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var solutionPath = Path.Combine(solutionDirectory, "App.sln");
var contentBefore = File.ReadAllText(solutionPath);
var projectToAdd = Path.Combine("UnknownProject", "UnknownProject.unknownproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(solutionDirectory)
.ExecuteWithCapturedOutput($"sln add {projectToAdd}");
cmd.Should().Pass();
cmd.StdErr.Should().Be(
string.Format(
CommonLocalizableStrings.UnsupportedProjectType,
Path.Combine(solutionDirectory, projectToAdd)));
cmd.StdOut.Should().BeEmpty();
File.ReadAllText(solutionPath)
.Should()
.BeVisuallyEquivalentTo(contentBefore);
}
Do not add duplicate projects (#5698)
2017-02-14 13:47:06 -10:00
[Fact]
private void WhenSlnContainsSolutionFolderWithDifferentCasingItDoesNotCreateDuplicate()
{
var projectDirectory = TestAssets
.Get("TestAppWithSlnAndCaseSensitiveSolutionFolders")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var projectToAdd = Path.Combine("src", "Lib", "Lib.csproj");
var cmd = new DotnetCommand()
.WithWorkingDirectory(projectDirectory)
.Execute($"sln App.sln add {projectToAdd}");
cmd.Should().Pass();
var slnFile = SlnFile.Read(Path.Combine(projectDirectory, "App.sln"));
var solutionFolderProjects = slnFile.Projects.Where(
p => p.TypeGuid == ProjectTypeGuids.SolutionFolderGuid);
solutionFolderProjects.Count().Should().Be(1);
}
Map solution configurations to existing project configurations on add. This commit implements solution configuration to project configuration mapping. Previously, when a project was added to the solution with the `sln add` command, solution configurations would be mapped to a project configuration and platform of the same name, regardless of whether or not the project had a configuration or platform of that name. This caused the solution to appear dirty when opened in Visual Studio if the configuration or platform did not exist at the project level because Visual Studio would attempt to correct the mapping. The fix is to check what configurations and platforms are supported by the project and only map to what is present. If a solution configuration can't be mapped, the first configuration/platform supported by the project is chosen; this is consistent with how Visual Studio does the fallback mapping. Fixes #6221.
2017-12-15 17:01:37 -08:00
[Fact]
public void WhenProjectWithoutMatchingConfigurationsIsAddedSolutionMapsToFirstAvailable()
{
var slnDirectory = TestAssets
.Get("TestAppWithSlnAndProjectConfigs")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(slnDirectory, "App.sln");
var result = new DotnetCommand()
.WithWorkingDirectory(slnDirectory)
.ExecuteWithCapturedOutput($"sln add ProjectWithoutMatchingConfigs");
result.Should().Pass();
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithoutMatchingConfigs);
}
[Fact]
public void WhenProjectWithMatchingConfigurationsIsAddedSolutionMapsAll()
{
var slnDirectory = TestAssets
.Get("TestAppWithSlnAndProjectConfigs")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(slnDirectory, "App.sln");
var result = new DotnetCommand()
.WithWorkingDirectory(slnDirectory)
.ExecuteWithCapturedOutput($"sln add ProjectWithMatchingConfigs");
result.Should().Pass();
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithMatchingConfigs);
}
[Fact]
public void WhenProjectWithAdditionalConfigurationsIsAddedSolutionDoesNotMapThem()
{
var slnDirectory = TestAssets
.Get("TestAppWithSlnAndProjectConfigs")
.CreateInstance()
.WithSourceFiles()
.Root
.FullName;
var slnFullPath = Path.Combine(slnDirectory, "App.sln");
var result = new DotnetCommand()
.WithWorkingDirectory(slnDirectory)
.ExecuteWithCapturedOutput($"sln add ProjectWithAdditionalConfigs");
result.Should().Pass();
File.ReadAllText(slnFullPath)
.Should().BeVisuallyEquivalentTo(ExpectedSlnFileAfterAddingProjectWithAdditionalConfigs);
}
Add/remove solution items based on directory structure (#5197) * WIP support solution folders for dotnet add and remove * Add/remove solution folders based on directory hierarchy * Fix tests * Disable the solution building tests * Address PR comments * Fix a build break due to a new tool version used in the build * Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
private string GetExpectedSlnContents(
string slnPath,
string slnTemplate,
string expectedLibProjectGuid = null)
{
var slnFile = SlnFile.Read(slnPath);
if (string.IsNullOrEmpty(expectedLibProjectGuid))
{
var matchingProjects = slnFile.Projects
.Where((p) => p.FilePath.EndsWith("Lib.csproj"))
.ToList();
matchingProjects.Count.Should().Be(1);
var slnProject = matchingProjects[0];
expectedLibProjectGuid = slnProject.Id;
}
var slnContents = slnTemplate.Replace("__LIB_PROJECT_GUID__", expectedLibProjectGuid);
var matchingSrcFolder = slnFile.Projects
.Where((p) => p.FilePath == "src")
.ToList();
if (matchingSrcFolder.Count == 1)
{
slnContents = slnContents.Replace("__SRC_FOLDER_GUID__", matchingSrcFolder[0].Id);
}
return slnContents;
}
Implement dotnet add project (#5022) * Implement dotnet add project * Addressed PR comments
2016-12-14 13:53:11 -10:00
}
}
Reference in a new issue Copy permalink